mbox

[Xenial,PULL] Marvell wireless driver update

Message ID CAH10aOi7OD-A5arg-vcJZG=zVhN-UywreTzj2rjKHrbKYp0Q5w@mail.gmail.com
State New
Headers show

Pull-request

https://git.launchpad.net/~wenchien/+git/xenial

Message

Wen-chien Jesse Sung May 20, 2016, 7:05 a.m. UTC
BugLink: https://launchpad.net/bugs/1528910
BugLink: https://launchpad.net/bugs/1512997
BugLink: https://launchpad.net/bugs/1512999

The first eight patches are Marvell wireless driver update for FCC regulation.
Most of them are in mainline 4.5 except the "add iw vendor command support" one,
which is not accepted by upstream[1]. I'm sending it as an Ubuntu sauce before
we can have a solution.

The last two patches are for WiFi and Bluetooth LEDs on Dell's Edge Gateway.
LEDs are connected to GPIOs on Marvell Wifi/BT module, so the code will
check if it is run on Edge Gateway before it toggles the LEDs, in case these
GPIOs are configured to do something else on other platforms. These two patches
are already in vivid kernel for a while.


[1] https://marc.info/?l=linux-wireless&m=144982455414246&w=2

================================================================

The following changes since commit f18d7a47ebd9086e6aa36b823cdce8665efb0c53:

  UBUNTU: Ubuntu-4.4.0-22.40 (2016-05-12 13:42:19 -0700)

are available in the git repository at:

  https://git.launchpad.net/~wenchien/+git/xenial

for you to fetch changes up to aaa29bfd65a9f95932f69e6246473fe0a3a4f9c9:

  UBUNTU: SAUCE: Bluetooth: Support for LED on Marvell modules
(2016-05-20 11:46:10 +0800)

----------------------------------------------------------------
Amitkumar Karwar (7):
      mwifiex: parse adhoc start/join result
      mwifiex: handle start AP error paths correctly
      mwifiex: set regulatory info from EEPROM
      mwifiex: don't follow AP if country code received from EEPROM
      mwifiex: correction in region code to country mapping
      mwifiex: update region_code_index array
      mwifiex: use world for unidentified region code

Wen-chien Jesse Sung (2):
      UBUNTU: SAUCE: mwifiex: Switch WiFi LED state according to the
device status
      UBUNTU: SAUCE: Bluetooth: Support for LED on Marvell modules

chunfan chen (1):
      UBUNTU: SAUCE: mwifiex: add iw vendor command support

 drivers/bluetooth/btusb.c                  | 92 ++++++++++++++++++++++++++++--
 drivers/net/wireless/mwifiex/Makefile      |  1 +
 drivers/net/wireless/mwifiex/cfg80211.c    | 20 +++++--
 drivers/net/wireless/mwifiex/cfp.c         |  6 +-
 drivers/net/wireless/mwifiex/cmdevt.c      |  4 +-
 drivers/net/wireless/mwifiex/fw.h          | 30 +++++++++-
 drivers/net/wireless/mwifiex/ie.c          |  2 +-
 drivers/net/wireless/mwifiex/join.c        | 20 ++++---
 drivers/net/wireless/mwifiex/main.c        |  5 +-
 drivers/net/wireless/mwifiex/main.h        | 12 +++-
 drivers/net/wireless/mwifiex/pcie.c        |  6 ++
 drivers/net/wireless/mwifiex/sta_cmd.c     | 50 ++++++++++++++--
 drivers/net/wireless/mwifiex/sta_cmdresp.c |  2 +
 drivers/net/wireless/mwifiex/sta_ioctl.c   | 23 +++++++-
 drivers/net/wireless/mwifiex/uap_cmd.c     |  6 +-
 drivers/net/wireless/mwifiex/vendor.c      | 83 +++++++++++++++++++++++++++
 drivers/net/wireless/mwifiex/vendor.h      | 28 +++++++++
 17 files changed, 353 insertions(+), 37 deletions(-)
 create mode 100644 drivers/net/wireless/mwifiex/vendor.c
 create mode 100644 drivers/net/wireless/mwifiex/vendor.h

Comments

Tim Gardner May 20, 2016, 1:16 p.m. UTC | #1
What are your plans for Yakkety ? Will this platform update its kernel
before 18.04 ?

rtg
Kamal Mostafa May 20, 2016, 4:56 p.m. UTC | #2
On Fri, May 20, 2016 at 03:05:14PM +0800, Jesse Sung wrote:
> ================================================================
> 
> The following changes since commit f18d7a47ebd9086e6aa36b823cdce8665efb0c53:
> 
>   UBUNTU: Ubuntu-4.4.0-22.40 (2016-05-12 13:42:19 -0700)
> 
> are available in the git repository at:
> 
>   https://git.launchpad.net/~wenchien/+git/xenial

NAK because:

$ git fetch https://git.launchpad.net/~wenchien/+git/xenial
fatal: Couldn't find remote ref HEAD

Please use the git request-pull "[<end>]" parameter to specify your
target branch name.  (See 'git help reqeust-pull').

 -Kamal


> 
> for you to fetch changes up to aaa29bfd65a9f95932f69e6246473fe0a3a4f9c9:
> 
>   UBUNTU: SAUCE: Bluetooth: Support for LED on Marvell modules
> (2016-05-20 11:46:10 +0800)
> 
> ----------------------------------------------------------------
> Amitkumar Karwar (7):
>       mwifiex: parse adhoc start/join result
>       mwifiex: handle start AP error paths correctly
>       mwifiex: set regulatory info from EEPROM
>       mwifiex: don't follow AP if country code received from EEPROM
>       mwifiex: correction in region code to country mapping
>       mwifiex: update region_code_index array
>       mwifiex: use world for unidentified region code
> 
> Wen-chien Jesse Sung (2):
>       UBUNTU: SAUCE: mwifiex: Switch WiFi LED state according to the
> device status
>       UBUNTU: SAUCE: Bluetooth: Support for LED on Marvell modules
> 
> chunfan chen (1):
>       UBUNTU: SAUCE: mwifiex: add iw vendor command support
> 
>  drivers/bluetooth/btusb.c                  | 92 ++++++++++++++++++++++++++++--
>  drivers/net/wireless/mwifiex/Makefile      |  1 +
>  drivers/net/wireless/mwifiex/cfg80211.c    | 20 +++++--
>  drivers/net/wireless/mwifiex/cfp.c         |  6 +-
>  drivers/net/wireless/mwifiex/cmdevt.c      |  4 +-
>  drivers/net/wireless/mwifiex/fw.h          | 30 +++++++++-
>  drivers/net/wireless/mwifiex/ie.c          |  2 +-
>  drivers/net/wireless/mwifiex/join.c        | 20 ++++---
>  drivers/net/wireless/mwifiex/main.c        |  5 +-
>  drivers/net/wireless/mwifiex/main.h        | 12 +++-
>  drivers/net/wireless/mwifiex/pcie.c        |  6 ++
>  drivers/net/wireless/mwifiex/sta_cmd.c     | 50 ++++++++++++++--
>  drivers/net/wireless/mwifiex/sta_cmdresp.c |  2 +
>  drivers/net/wireless/mwifiex/sta_ioctl.c   | 23 +++++++-
>  drivers/net/wireless/mwifiex/uap_cmd.c     |  6 +-
>  drivers/net/wireless/mwifiex/vendor.c      | 83 +++++++++++++++++++++++++++
>  drivers/net/wireless/mwifiex/vendor.h      | 28 +++++++++
>  17 files changed, 353 insertions(+), 37 deletions(-)
>  create mode 100644 drivers/net/wireless/mwifiex/vendor.c
>  create mode 100644 drivers/net/wireless/mwifiex/vendor.h
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Tim Gardner May 20, 2016, 5:45 p.m. UTC | #3
Kamal - the branch name is marvell
Kamal Mostafa May 20, 2016, 6:54 p.m. UTC | #4
On Fri, May 20, 2016 at 11:45:03AM -0600, Tim Gardner wrote:
> Kamal - the branch name is marvell

Thanks Tim.

But still NAK, because it results in a pile of compiler warnings:

In file included from .../drivers/net/wireless/mwifiex/sta_cmd.c:24:0:
.../drivers/net/wireless/mwifiex/sta_cmd.c: In function 'mwifiex_cmd_cfg_data':
.../drivers/net/wireless/mwifiex/sta_cmd.c:1533:16: warning: passing argument 1 of '_mwifiex_dbg' from incompatible pointer type [-Wincompatible-pointer-types]
    mwifiex_dbg(adapter->dev, INFO,
                ^
.../drivers/net/wireless/mwifiex/main.h:194:15: note: in definition of macro 'mwifiex_dbg'
  _mwifiex_dbg(adapter, MWIFIEX_DBG_##mask, fmt, ##__VA_ARGS__)
               ^
.../drivers/net/wireless/mwifiex/main.h:191:6: note: expected 'const struct mwifiex_adapter *' but argument is of type 'struct device *'
 void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,
      ^
.../drivers/net/wireless/mwifiex/sta_cmd.c:1541:15: warning: passing argument 1 of '_mwifiex_dbg' from incompatible pointer type [-Wincompatible-pointer-types]
   mwifiex_dbg(adapter->dev, INFO, "download cfg_data from iw vendor command\n");
               ^
.../drivers/net/wireless/mwifiex/main.h:194:15: note: in definition of macro 'mwifiex_dbg'
  _mwifiex_dbg(adapter, MWIFIEX_DBG_##mask, fmt, ##__VA_ARGS__)
               ^
.../drivers/net/wireless/mwifiex/main.h:191:6: note: expected 'const struct mwifiex_adapter *' but argument is of type 'struct device *'
 void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,
      ^


Jesse, please take another look at this patch set and re-submit.

 -Kamal
Wen-chien Jesse Sung May 23, 2016, 11:11 a.m. UTC | #5
Hi Tim,

2016-05-20 21:16 GMT+08:00 Tim Gardner <tim.gardner@canonical.com>:
> What are your plans for Yakkety ? Will this platform update its kernel
> before 18.04 ?

For patches that are not in mainline:

* UBUNTU: SAUCE: mwifiex: add iw vendor command support
  Alex is talking to Marvell to see if they can find a solution which
can be accepted
  by upstream. I'll pull the update into Xenial and Yakkety if Marvell
can find one.

* Two patches for WiFI and BT LEDs
  I'd like to keep these two as Ubuntu sauce for now. Will see if it's
possible to upstream.

For kernel update on this platform, it depends on which kernel will be
used for next
Ubuntu Core release, and also if there's a plan to update this platform or not.

Thanks,
Jesse

>
> rtg
> --
> Tim Gardner tim.gardner@canonical.com
Wen-chien Jesse Sung May 23, 2016, 11:18 a.m. UTC | #6
2016-05-21 2:54 GMT+08:00 Kamal Mostafa <kamal@canonical.com>:
> On Fri, May 20, 2016 at 11:45:03AM -0600, Tim Gardner wrote:
>> Kamal - the branch name is marvell
>
> Thanks Tim.
>
> But still NAK, because it results in a pile of compiler warnings:
>
> In file included from .../drivers/net/wireless/mwifiex/sta_cmd.c:24:0:
> .../drivers/net/wireless/mwifiex/sta_cmd.c: In function 'mwifiex_cmd_cfg_data':
> .../drivers/net/wireless/mwifiex/sta_cmd.c:1533:16: warning: passing argument 1 of '_mwifiex_dbg' from incompatible pointer type [-Wincompatible-pointer-types]
>     mwifiex_dbg(adapter->dev, INFO,
>                 ^
> .../drivers/net/wireless/mwifiex/main.h:194:15: note: in definition of macro 'mwifiex_dbg'
>   _mwifiex_dbg(adapter, MWIFIEX_DBG_##mask, fmt, ##__VA_ARGS__)
>                ^
> .../drivers/net/wireless/mwifiex/main.h:191:6: note: expected 'const struct mwifiex_adapter *' but argument is of type 'struct device *'
>  void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,
>       ^
> .../drivers/net/wireless/mwifiex/sta_cmd.c:1541:15: warning: passing argument 1 of '_mwifiex_dbg' from incompatible pointer type [-Wincompatible-pointer-types]
>    mwifiex_dbg(adapter->dev, INFO, "download cfg_data from iw vendor command\n");
>                ^
> .../drivers/net/wireless/mwifiex/main.h:194:15: note: in definition of macro 'mwifiex_dbg'
>   _mwifiex_dbg(adapter, MWIFIEX_DBG_##mask, fmt, ##__VA_ARGS__)
>                ^
> .../drivers/net/wireless/mwifiex/main.h:191:6: note: expected 'const struct mwifiex_adapter *' but argument is of type 'struct device *'
>  void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,
>       ^
>
>
> Jesse, please take another look at this patch set and re-submit.

Sorry, I'll send a v2 pull request later.

Thanks,
Jesse

>
>  -Kamal