[v2,00/10] unify rxwi parsing between mt76x0 and mt76x2 drivers

Message

Lorenzo Bianconi Oct. 4, 2018, 9:53 p.m. UTC

Merge mt76x0_dev and mt76x2_dev in mt76x02_dev and remove duplicated code.
Move mt76x02_mac_process_rx routine in mt76x02-lib module in order to
unify rxwi parsing between mt76x0 and mt76x2 drivers.
Move mt76x02_tx in mt76x02-lib module and remove duplicated code

Changes since v1:
- make mt76x02_rx_get_sta and mt76x02_rx_get_sta_wcid inline

Lorenzo Bianconi (10):
  mt76: move mt76x02_phy_get_min_avg_rssi in mt76x02_phy.c
  mt76: move mt76x02_rx_get_sta and mt76x02_rx_get_sta_wcid in
    mt76x02_util.h
  mt76x0: mac: use sta ewma estimation for rssi tracking
  mt76x0: remove unused variable in mt76x0_dev
  mt76x0: remove hw_atomic_mutex mutex in mt76x0_dev
  mt76x2: move mt76x2_dev in mt76x02_util.h
  mt76x0: merge mt76x0_dev in mt76x02_dev
  mt76: move mt76x02_mac_process_rx in mt76x02-lib module
  mt76: unify rxwi parsing between mt76x2 and mt76x0 drivers
  mt76: move mt76x02_tx in mt76x02-lib module

 .../wireless/mediatek/mt76/mt76x0/Makefile    |   2 +-
 .../wireless/mediatek/mt76/mt76x0/debugfs.c   |   4 +-
 .../wireless/mediatek/mt76/mt76x0/eeprom.c    |  28 ++--
 .../wireless/mediatek/mt76/mt76x0/eeprom.h    |  18 +--
 .../net/wireless/mediatek/mt76/mt76x0/init.c  |  41 ++---
 .../wireless/mediatek/mt76/mt76x0/initvals.h  |   3 +-
 .../net/wireless/mediatek/mt76/mt76x0/mac.c   |  78 +---------
 .../net/wireless/mediatek/mt76/mt76x0/mac.h   |  20 ---
 .../net/wireless/mediatek/mt76/mt76x0/main.c  |  16 +-
 .../net/wireless/mediatek/mt76/mt76x0/mcu.h   |   8 +-
 .../wireless/mediatek/mt76/mt76x0/mt76x0.h    | 127 +++------------
 .../net/wireless/mediatek/mt76/mt76x0/pci.c   |  18 +--
 .../wireless/mediatek/mt76/mt76x0/pci_mcu.c   |   4 +-
 .../net/wireless/mediatek/mt76/mt76x0/phy.c   | 112 +++++---------
 .../net/wireless/mediatek/mt76/mt76x0/trace.h |   1 -
 .../net/wireless/mediatek/mt76/mt76x0/tx.c    |  63 --------
 .../net/wireless/mediatek/mt76/mt76x0/usb.c   |  24 +--
 .../wireless/mediatek/mt76/mt76x0/usb_mcu.c   |   6 +-
 .../net/wireless/mediatek/mt76/mt76x02_dfs.h  | 140 +++++++++++++++++
 .../net/wireless/mediatek/mt76/mt76x02_mac.c  | 104 +++++++++++++
 .../net/wireless/mediatek/mt76/mt76x02_mac.h  |   4 +
 .../net/wireless/mediatek/mt76/mt76x02_phy.c  |  48 ++++++
 .../net/wireless/mediatek/mt76/mt76x02_phy.h  |   1 +
 .../net/wireless/mediatek/mt76/mt76x02_util.c |  53 +++++++
 .../net/wireless/mediatek/mt76/mt76x02_util.h | 119 ++++++++++++++
 .../wireless/mediatek/mt76/mt76x2/Makefile    |   3 +-
 .../wireless/mediatek/mt76/mt76x2/common.c    |  42 -----
 .../wireless/mediatek/mt76/mt76x2/debugfs.c   |  12 +-
 .../net/wireless/mediatek/mt76/mt76x2/dfs.h   | 134 +---------------
 .../wireless/mediatek/mt76/mt76x2/eeprom.c    |  40 ++---
 .../wireless/mediatek/mt76/mt76x2/eeprom.h    |  10 +-
 .../net/wireless/mediatek/mt76/mt76x2/init.c  |  10 +-
 .../net/wireless/mediatek/mt76/mt76x2/mac.c   | 126 +--------------
 .../net/wireless/mediatek/mt76/mt76x2/mac.h   |  21 ++-
 .../net/wireless/mediatek/mt76/mt76x2/mcu.c   |   8 +-
 .../net/wireless/mediatek/mt76/mt76x2/mcu.h   |   4 +-
 .../wireless/mediatek/mt76/mt76x2/mt76x2.h    | 145 +++++-------------
 .../wireless/mediatek/mt76/mt76x2/mt76x2u.h   |  38 ++---
 .../net/wireless/mediatek/mt76/mt76x2/pci.c   |   4 +-
 .../wireless/mediatek/mt76/mt76x2/pci_core.c  |   2 +-
 .../wireless/mediatek/mt76/mt76x2/pci_dfs.c   | 139 ++++++++---------
 .../wireless/mediatek/mt76/mt76x2/pci_dma.c   |   4 +-
 .../wireless/mediatek/mt76/mt76x2/pci_init.c  |  40 ++---
 .../wireless/mediatek/mt76/mt76x2/pci_mac.c   |  27 ++--
 .../wireless/mediatek/mt76/mt76x2/pci_main.c  |  28 ++--
 .../wireless/mediatek/mt76/mt76x2/pci_mcu.c   |   6 +-
 .../wireless/mediatek/mt76/mt76x2/pci_phy.c   |  31 ++--
 .../wireless/mediatek/mt76/mt76x2/pci_tx.c    |  12 +-
 .../net/wireless/mediatek/mt76/mt76x2/phy.c   |  65 ++------
 .../net/wireless/mediatek/mt76/mt76x2/trace.h |  12 +-
 .../net/wireless/mediatek/mt76/mt76x2/tx.c    |  33 +---
 .../net/wireless/mediatek/mt76/mt76x2/usb.c   |   8 +-
 .../wireless/mediatek/mt76/mt76x2/usb_init.c  |  28 ++--
 .../wireless/mediatek/mt76/mt76x2/usb_mac.c   |  12 +-
 .../wireless/mediatek/mt76/mt76x2/usb_main.c  |  18 +--
 .../wireless/mediatek/mt76/mt76x2/usb_mcu.c   |  16 +-
 .../wireless/mediatek/mt76/mt76x2/usb_phy.c   |  13 +-
 57 files changed, 944 insertions(+), 1189 deletions(-)
 delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/mac.h
 delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x0/tx.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h
 delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/common.c

Comments

Felix Fietkau Oct. 5, 2018, 9:56 a.m. UTC | #1

On 2018-10-04 23:53, Lorenzo Bianconi wrote:
> Merge mt76x0_dev and mt76x2_dev in mt76x02_dev and remove duplicated code.
> Move mt76x02_mac_process_rx routine in mt76x02-lib module in order to
> unify rxwi parsing between mt76x0 and mt76x2 drivers.
> Move mt76x02_tx in mt76x02-lib module and remove duplicated code
Merged, thanks.

- Felix