Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Kalle Valo]

Amitkumar Karwar <akar...@marvell.com> writes:

> Hi Kalle,
>
>> From: Kalle Valo [mailto:kv...@codeaurora.org]
>> Sent: Thursday, January 12, 2017 8:25 PM
>> To: Amitkumar Karwar
>> Cc: linux-wireless@vger.kernel.org; Cathy Luo; Nishant Sarmukadam;
>> raja...@google.com; briannor...@google.com; dmitry.torok...@gmail.com;
>> Xinming Hu
>> Subject: Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
>> 
>> Amitkumar Karwar <akar...@marvell.com> writes:
>> 
>> >> But these didn't. Can you please rebase these and resubmit in one
>> >> patchset? Less conflicts that way.
>> >>
>> >
>> > The problem here is you tried to apply the patches in reverse order.
>> Sorry for the confusion.
>> > Please apply pending patches in below order.
>> >
>> > [v3,1/5] mwifiex: don't wait for main_process in shutdown_drv ---
>> Apply this patch first.
>> > [v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
>> > [v3,3/5] mwifiex: get rid of drv_info* adapter variables [v3,4/5]
>> > mwifiex: wait firmware dump complete during card remove process
>> > [v3,5/5] mwifiex: move pcie_work and related variables inside card
>> >
>> > [1/2] mwifiex: code rearrangement in pcie.c and sdio.c [2/2] mwifiex:
>> > get rid of global user_rmmod flag
>> >
>> > mwifiex: use module_*_driver helper macros
>> >
>> > [1/5] mwifiex: get rid of mwifiex_do_flr wrapper [2/5] mwifiex:
>> > cleanup in PCIe flr code path [3/5] mwifiex: sdio card reset
>> > enhancement [4/5] mwifiex: get rid of __mwifiex_sdio_remove helper
>> > [5/5] mwifiex: get rid of global save_adapter and sdio_work
>> 
>> Thanks, now I was able to apply these but please do double check the
>> result in wireless-drivers-next.
>> 
>> I also noticed a new warning:
>> 
>> drivers/net/wireless/marvell/mwifiex/pcie.c: In function
>> 'mwifiex_pcie_remove':
>> drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status'
>> may be used uninitialized in this function [-Wmaybe-uninitialized]
>>   if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) {
>> 
>> Actually I'm not sure if this warning was caused by these patches as I
>> have recently updated my ancient gcc to a newer one (5.4.0), but please
>> take a look and send a fix if it's a valid warning.
>> 
>
> Below CL fixes this warning.
>
> https://patchwork.kernel.org/patch/9515899/

Good, thanks. I'll apply that shortly.

-- 
Kalle Valo

RE: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Amitkumar Karwar]

Hi Kalle,

> From: Kalle Valo [mailto:kv...@codeaurora.org]
> Sent: Thursday, January 12, 2017 8:25 PM
> To: Amitkumar Karwar
> Cc: linux-wireless@vger.kernel.org; Cathy Luo; Nishant Sarmukadam;
> raja...@google.com; briannor...@google.com; dmitry.torok...@gmail.com;
> Xinming Hu
> Subject: Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
> 
> Amitkumar Karwar <akar...@marvell.com> writes:
> 
> >> But these didn't. Can you please rebase these and resubmit in one
> >> patchset? Less conflicts that way.
> >>
> >
> > The problem here is you tried to apply the patches in reverse order.
> Sorry for the confusion.
> > Please apply pending patches in below order.
> >
> > [v3,1/5] mwifiex: don't wait for main_process in shutdown_drv ---
> Apply this patch first.
> > [v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
> > [v3,3/5] mwifiex: get rid of drv_info* adapter variables [v3,4/5]
> > mwifiex: wait firmware dump complete during card remove process
> > [v3,5/5] mwifiex: move pcie_work and related variables inside card
> >
> > [1/2] mwifiex: code rearrangement in pcie.c and sdio.c [2/2] mwifiex:
> > get rid of global user_rmmod flag
> >
> > mwifiex: use module_*_driver helper macros
> >
> > [1/5] mwifiex: get rid of mwifiex_do_flr wrapper [2/5] mwifiex:
> > cleanup in PCIe flr code path [3/5] mwifiex: sdio card reset
> > enhancement [4/5] mwifiex: get rid of __mwifiex_sdio_remove helper
> > [5/5] mwifiex: get rid of global save_adapter and sdio_work
> 
> Thanks, now I was able to apply these but please do double check the
> result in wireless-drivers-next.
> 
> I also noticed a new warning:
> 
> drivers/net/wireless/marvell/mwifiex/pcie.c: In function
> 'mwifiex_pcie_remove':
> drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status'
> may be used uninitialized in this function [-Wmaybe-uninitialized]
>   if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) {
> 
> Actually I'm not sure if this warning was caused by these patches as I
> have recently updated my ancient gcc to a newer one (5.4.0), but please
> take a look and send a fix if it's a valid warning.
> 

Below CL fixes this warning.

https://patchwork.kernel.org/patch/9515899/

Regards,
Amitkumar

Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Kalle Valo]

Amitkumar Karwar  writes:

>> But these didn't. Can you please rebase these and resubmit in one
>> patchset? Less conflicts that way.
>> 
>
> The problem here is you tried to apply the patches in reverse order. Sorry 
> for the confusion.
> Please apply pending patches in below order.
>
> [v3,1/5] mwifiex: don't wait for main_process in shutdown_drv --- Apply this 
> patch first.
> [v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
> [v3,3/5] mwifiex: get rid of drv_info* adapter variables
> [v3,4/5] mwifiex: wait firmware dump complete during card remove process
> [v3,5/5] mwifiex: move pcie_work and related variables inside card
>
> [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
> [2/2] mwifiex: get rid of global user_rmmod flag
>
> mwifiex: use module_*_driver helper macros
>
> [1/5] mwifiex: get rid of mwifiex_do_flr wrapper
> [2/5] mwifiex: cleanup in PCIe flr code path
> [3/5] mwifiex: sdio card reset enhancement
> [4/5] mwifiex: get rid of __mwifiex_sdio_remove helper 
> [5/5] mwifiex: get rid of global save_adapter and sdio_work

Thanks, now I was able to apply these but please do double check the
result in wireless-drivers-next.

I also noticed a new warning:

drivers/net/wireless/marvell/mwifiex/pcie.c: In function 'mwifiex_pcie_remove':
drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status'
may be used uninitialized in this function [-Wmaybe-uninitialized]
  if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) {

Actually I'm not sure if this warning was caused by these patches as I
have recently updated my ancient gcc to a newer one (5.4.0), but please
take a look and send a fix if it's a valid warning.

-- 
Kalle Valo

Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Kalle Valo]

Amitkumar Karwar  wrote:
> From: Xinming Hu 
> 
> Next patch in this series is going to use mwifiex_read_reg() in remove
> handlers. The changes here are prerequisites to avoid forward
> declarations.
> 
> Signed-off-by: Xinming Hu 
> Signed-off-by: Amitkumar Karwar 

2 patches applied to wireless-drivers-next.git, thanks.

90ff71f95575 mwifiex: code rearrangement in pcie.c and sdio.c
045f0c1b5e26 mwifiex: get rid of global user_rmmod flag

-- 
https://patchwork.kernel.org/patch/9454491/

Documentation about submitting wireless patches and checking status
from patchwork:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Amitkumar Karwar]

Hi Kalle,

> From: Kalle Valo [mailto:kv...@codeaurora.org]
> Sent: Friday, December 30, 2016 4:58 PM
> To: Amitkumar Karwar
> Cc: linux-wireless@vger.kernel.org; Cathy Luo; Nishant Sarmukadam;
> raja...@google.com; briannor...@google.com; dmitry.torok...@gmail.com;
> Xinming Hu
> Subject: [EXT] Re: [1/2] mwifiex: code rearrangement in pcie.c and
> sdio.c
> 
> Amitkumar Karwar <akar...@marvell.com> writes:
> 
> > Hi Kalle,
> >
> >> Failed to apply:
> >>
> >> fatal: sha1 information is lacking or useless
> >> (drivers/net/wireless/marvell/mwifiex/pcie.c).
> >> Applying: mwifiex: get rid of global user_rmmod flag Repository
> lacks
> >> necessary blobs to fall back on 3-way merge.
> >> Cannot fall back to three-way merge.
> >> Patch failed at 0001 mwifiex: get rid of global user_rmmod flag
> >>
> >> 2 patches set to Changes Requested.
> >>
> >> 9454491 [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
> >> 9454493 [2/2] mwifiex: get rid of global user_rmmod flag
> >>
> >> --
> >> https://patchwork.kernel.org/patch/9454491/
> >>
> >> Documentation about submitting wireless patches and checking status
> >> from patchwork:
> >>
> >>
> https://wireless.wiki.kernel.org/en/developers/documentation/submitti
> >> ng
> >> patches
> >
> >
> > These two patches have dependency with other patch series. I want you
> to consider patches in following order(first being recent).
> >
> > mwifiex: sdio: fix use after free issue for save_adapter
> 
> This applied fine.
> 
> > mwifiex: use module_*_driver helper macros
> >
> > [2/2] mwifiex: get rid of global user_rmmod flag [1/2] mwifiex: code
> > rearrangement in pcie.c and sdio.c
> >
> > [v3,5/5] mwifiex: move pcie_work and related variables inside card --
> -- This series can be accepted if there are no further
> concerns/comments from Brian/Dmitry.
> > [v3,4/5] mwifiex: wait firmware dump complete during card remove
> > process [v3,3/5] mwifiex: get rid of drv_info* adapter variables
> > [v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
> > [v3,1/5] mwifiex: don't wait for main_process in shutdown_drv
> 
> But these didn't. Can you please rebase these and resubmit in one
> patchset? Less conflicts that way.
> 

The problem here is you tried to apply the patches in reverse order. Sorry for 
the confusion.
Please apply pending patches in below order.

[v3,1/5] mwifiex: don't wait for main_process in shutdown_drv --- Apply this 
patch first.
[v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
[v3,3/5] mwifiex: get rid of drv_info* adapter variables
[v3,4/5] mwifiex: wait firmware dump complete during card remove process
[v3,5/5] mwifiex: move pcie_work and related variables inside card

[1/2] mwifiex: code rearrangement in pcie.c and sdio.c
[2/2] mwifiex: get rid of global user_rmmod flag

mwifiex: use module_*_driver helper macros

[1/5] mwifiex: get rid of mwifiex_do_flr wrapper
[2/5] mwifiex: cleanup in PCIe flr code path
[3/5] mwifiex: sdio card reset enhancement
[4/5] mwifiex: get rid of __mwifiex_sdio_remove helper 
[5/5] mwifiex: get rid of global save_adapter and sdio_work

Regards,
Amitkumar

Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Kalle Valo]

Amitkumar Karwar  writes:

> Hi Kalle,
>
>> Failed to apply:
>> 
>> fatal: sha1 information is lacking or useless
>> (drivers/net/wireless/marvell/mwifiex/pcie.c).
>> Applying: mwifiex: get rid of global user_rmmod flag Repository lacks
>> necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 mwifiex: get rid of global user_rmmod flag
>> 
>> 2 patches set to Changes Requested.
>> 
>> 9454491 [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
>> 9454493 [2/2] mwifiex: get rid of global user_rmmod flag
>> 
>> --
>> https://patchwork.kernel.org/patch/9454491/
>> 
>> Documentation about submitting wireless patches and checking status
>> from patchwork:
>> 
>> https://wireless.wiki.kernel.org/en/developers/documentation/submitting
>> patches
>
>
> These two patches have dependency with other patch series. I want you to 
> consider patches in following order(first being recent).
>
> mwifiex: sdio: fix use after free issue for save_adapter

This applied fine.

> mwifiex: use module_*_driver helper macros
>
> [2/2] mwifiex: get rid of global user_rmmod flag
> [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
>
> [v3,5/5] mwifiex: move pcie_work and related variables inside card  
> This series can be accepted if there are no further concerns/comments from 
> Brian/Dmitry. 
> [v3,4/5] mwifiex: wait firmware dump complete during card remove process
> [v3,3/5] mwifiex: get rid of drv_info* adapter variables
> [v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
> [v3,1/5] mwifiex: don't wait for main_process in shutdown_drv

But these didn't. Can you please rebase these and resubmit in one
patchset? Less conflicts that way.

-- 
Kalle Valo

Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Kalle Valo]

Amitkumar Karwar  wrote:
> From: Xinming Hu 
> 
> Next patch in this series is going to use mwifiex_read_reg() in remove
> handlers. The changes here are prerequisites to avoid forward
> declarations.
> 
> Signed-off-by: Xinming Hu 
> Signed-off-by: Amitkumar Karwar 

Patch 2 doesn't apply.

fatal: sha1 information is lacking or useless 
(drivers/net/wireless/marvell/mwifiex/pcie.c).
Applying: mwifiex: get rid of global user_rmmod flag
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 mwifiex: get rid of global user_rmmod flag

2 patches set to Changes Requested.

9454491 [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
9454493 [2/2] mwifiex: get rid of global user_rmmod flag

-- 
https://patchwork.kernel.org/patch/9454491/

Documentation about submitting wireless patches and checking status
from patchwork:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

RE: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[Amitkumar Karwar]

Hi Kalle,

> From: linux-wireless-ow...@vger.kernel.org [mailto:linux-wireless-
> ow...@vger.kernel.org] On Behalf Of Kalle Valo
> Sent: Monday, December 05, 2016 4:39 PM
> To: Amitkumar Karwar
> Cc: linux-wireless@vger.kernel.org; Cathy Luo; Nishant Sarmukadam;
> raja...@google.com; briannor...@google.com; dmitry.torok...@gmail.com;
> Xinming Hu; Amitkumar Karwar
> Subject: Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
> 
> Amitkumar Karwar <akar...@marvell.com> wrote:
> > From: Xinming Hu <h...@marvell.com>
> >
> > Next patch in this series is going to use mwifiex_read_reg() in
> remove
> > handlers. The changes here are prerequisites to avoid forward
> > declarations.
> >
> > Signed-off-by: Xinming Hu <h...@marvell.com>
> > Signed-off-by: Amitkumar Karwar <akar...@marvell.com>
> 
> Failed to apply:
> 
> fatal: sha1 information is lacking or useless
> (drivers/net/wireless/marvell/mwifiex/pcie.c).
> Applying: mwifiex: get rid of global user_rmmod flag Repository lacks
> necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 mwifiex: get rid of global user_rmmod flag
> 
> 2 patches set to Changes Requested.
> 
> 9454491 [1/2] mwifiex: code rearrangement in pcie.c and sdio.c
> 9454493 [2/2] mwifiex: get rid of global user_rmmod flag
> 
> --
> https://patchwork.kernel.org/patch/9454491/
> 
> Documentation about submitting wireless patches and checking status
> from patchwork:
> 
> https://wireless.wiki.kernel.org/en/developers/documentation/submitting
> patches


These two patches have dependency with other patch series. I want you to 
consider patches in following order(first being recent).

mwifiex: sdio: fix use after free issue for save_adapter
mwifiex: use module_*_driver helper macros

[2/2] mwifiex: get rid of global user_rmmod flag
[1/2] mwifiex: code rearrangement in pcie.c and sdio.c

[v3,5/5] mwifiex: move pcie_work and related variables inside card  
This series can be accepted if there are no further concerns/comments from 
Brian/Dmitry. 
[v3,4/5] mwifiex: wait firmware dump complete during card remove process
[v3,3/5] mwifiex: get rid of drv_info* adapter variables
[v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv
[v3,1/5] mwifiex: don't wait for main_process in shutdown_drv

Regards,
Amitkumar