subject:"\[PATCH 15\/20\] staging\/wilc1000\: pass hif operations through initialization"

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

2015-11-16 Thread Arnd Bergmann

On Monday 16 November 2015 10:36:47 glen lee wrote:
> On 2015년 11월 13일 18:17, Arnd Bergmann wrote:
> > On Friday 13 November 2015 16:49:22 glen lee wrote:
> >> Hi arnd,
> >>
> >> I found this. These should be like this. It works fine.
> >> +   .hif_block_tx_ext = sdio_write,
> >> +   .hif_block_rx_ext = sdio_read,
> >>
> >> also, wilc_hif_spi need to be fixed together like this.
> >> +   .hif_block_tx_ext = _wilc_spi_write,
> >> +   .hif_block_rx_ext = _wilc_spi_read,
> >>
> >> Thank you for all the patches.
> >>
> > Glad you found it. How should we go on to get the right version merged?
> > Do you want to send the working version of my patches to Greg along with
> > whatever you have on your end, or do you prefer me to re-send it?
> 
> In my opinion, why don't you re-send the whole patches again since I'm still 
> working on.
> 

Ok, done.

Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

2015-11-15 Thread glen lee



On 2015년 11월 13일 18:17, Arnd Bergmann wrote:

On Friday 13 November 2015 16:49:22 glen lee wrote:

Hi arnd,

I found this. These should be like this. It works fine.
+   .hif_block_tx_ext = sdio_write,
+   .hif_block_rx_ext = sdio_read,

also, wilc_hif_spi need to be fixed together like this.
+   .hif_block_tx_ext = _wilc_spi_write,
+   .hif_block_rx_ext = _wilc_spi_read,

Thank you for all the patches.


Glad you found it. How should we go on to get the right version merged?
Do you want to send the working version of my patches to Greg along with
whatever you have on your end, or do you prefer me to re-send it?


In my opinion, why don't you re-send the whole patches again since I'm still 
working on.

regards,
glen lee.


Arnd


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

2015-11-13 Thread Arnd Bergmann

On Friday 13 November 2015 16:49:22 glen lee wrote:
> 
> Hi arnd,
> 
> I found this. These should be like this. It works fine.
> +   .hif_block_tx_ext = sdio_write,
> +   .hif_block_rx_ext = sdio_read,
> 
> also, wilc_hif_spi need to be fixed together like this.
> +   .hif_block_tx_ext = _wilc_spi_write,
> +   .hif_block_rx_ext = _wilc_spi_read,
> 
> Thank you for all the patches.
> 

Glad you found it. How should we go on to get the right version merged?
Do you want to send the working version of my patches to Greg along with
whatever you have on your end, or do you prefer me to re-send it?

Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

2015-11-12 Thread glen lee


Hi arnd,

I appreciate the patches.
I did test this patch series on h/w which is arm based MCU.
From this patch wilc is not working properly. After downloading firmware, the 
firmware cannot start and it fails.
I double check this patch and the previous one(14/20) which works fine.
I cannot find the problem in this patch at the moment. I will see if I can find 
something,
and I'd appreciate if you would help with it.

regards,
glen lee


On 2015년 11월 11일 08:42, Arnd Bergmann wrote:

The wilc_hif_spi and wilc_hif_sdio structures are part of
the bus specific code, and the generic code should have no knowledge
of their addresses.

This changes the code to reference them only from the bus
specific initialization code, which we can then use to split
up the driver into separate modules.

Signed-off-by: Arnd Bergmann 
---
  drivers/staging/wilc1000/linux_wlan.c |  4 ++-
  drivers/staging/wilc1000/linux_wlan_sdio.c|  3 ++-
  drivers/staging/wilc1000/linux_wlan_spi.c |  2 +-
  drivers/staging/wilc1000/wilc_sdio.c  | 35 +--
  drivers/staging/wilc1000/wilc_spi.c   | 34 +-
  drivers/staging/wilc1000/wilc_wfi_netdevice.h |  4 ++-
  drivers/staging/wilc1000/wilc_wlan.c  | 15 ++--
  drivers/staging/wilc1000/wilc_wlan.h  |  4 +--
  8 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index e81e90678d0f..2fb1d97bded1 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1408,7 +1408,8 @@ void wilc_netdev_cleanup(struct wilc *wilc)
  #endif
  }
  
-int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, int gpio)

+int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
+int gpio, const struct wilc_hif_func *ops)
  {
int i;
perInterface_wlan_t *nic;
@@ -1423,6 +1424,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device 
*dev, int io_type, int gp
*wilc = wilc_dev;
wilc_dev->io_type = io_type;
wilc_dev->gpio = gpio;
+   wilc_dev->ops = ops;
  
  	register_inetaddr_notifier(_dev_notifier);
  
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c

index 732b0d66366b..f4250fda6cf1 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.c
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
@@ -119,7 +119,8 @@ static int linux_sdio_probe(struct sdio_func *func, const 
struct sdio_device_id
  
  	PRINT_D(INIT_DBG, "Initializing netdev\n");

wilc_sdio_func = func;
-   if (wilc_netdev_init(, >dev, HIF_SDIO, gpio)) {
+   if (wilc_netdev_init(, >dev, HIF_SDIO, gpio,
+_hif_sdio)) {
PRINT_ER("Couldn't initialize netdev\n");
return -1;
}
diff --git a/drivers/staging/wilc1000/linux_wlan_spi.c 
b/drivers/staging/wilc1000/linux_wlan_spi.c
index f4dda4a6fa7b..a7a52593156a 100644
--- a/drivers/staging/wilc1000/linux_wlan_spi.c
+++ b/drivers/staging/wilc1000/linux_wlan_spi.c
@@ -404,7 +404,7 @@ static int __init init_wilc_spi_driver(void)
  
  	wilc_debugfs_init();
  
-	ret = wilc_netdev_init(, NULL, HIF_SPI, GPIO_NUM);

+   ret = wilc_netdev_init(, NULL, HIF_SPI, GPIO_NUM, _hif_spi);
if (ret) {
wilc_debugfs_remove();
return ret;
diff --git a/drivers/staging/wilc1000/wilc_sdio.c 
b/drivers/staging/wilc1000/wilc_sdio.c
index 8441fcc4..0a9b5a71772e 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -912,23 +912,22 @@ static int sdio_sync_ext(int nint /*  how mant interrupts 
to enable. */)
   *
   /
  
-struct wilc_hif_func wilc_hif_sdio = {

-   sdio_init,
-   sdio_deinit,
-   sdio_read_reg,
-   sdio_write_reg,
-   sdio_read,
-   sdio_write,
-   sdio_sync,
-   sdio_clear_int,
-   sdio_read_int,
-   sdio_clear_int_ext,
-   sdio_read_size,
-   sdio_write,
-   sdio_read,
-   sdio_sync_ext,
-
-   sdio_set_max_speed,
-   sdio_set_default_speed,
+const struct wilc_hif_func wilc_hif_sdio = {
+   .hif_init = sdio_init,
+   .hif_deinit = sdio_deinit,
+   .hif_read_reg = sdio_read_reg,
+   .hif_write_reg = sdio_write_reg,
+   .hif_block_rx = sdio_read,
+   .hif_block_tx = sdio_write,
+   .hif_sync = sdio_sync,
+   .hif_clear_int = sdio_clear_int,
+   .hif_read_int = sdio_read_int,
+   .hif_clear_int_ext = sdio_clear_int_ext,
+   .hif_read_size = sdio_read_size,
+   .hif_block_rx_ext = sdio_write,
+   .hif_block_tx_ext = sdio_read,
+   .hif_sync_ext = sdio_sync_ext,
+   .hif_set_max_bus_speed = sdio_set_max_speed,
+   .hif_set_default_bus_speed = sdio_set_default_speed,
  };
  
diff --git

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

2015-11-12 Thread Arnd Bergmann

On Thursday 12 November 2015 19:05:41 glen lee wrote:
> Hi arnd,
> 
> I appreciate the patches.
> I did test this patch series on h/w which is arm based MCU.
>  From this patch wilc is not working properly. After downloading firmware, 
> the firmware cannot start and it fails.
> I double check this patch and the previous one(14/20) which works fine.
> I cannot find the problem in this patch at the moment. I will see if I can 
> find something,
> and I'd appreciate if you would help with it.
> 

I've looked at it some more, but didn't find anything obvious, here are some
possible things I found:


> > -struct wilc_hif_func wilc_hif_sdio = {
> > -   sdio_init,
> > -   sdio_deinit,
> > -   sdio_read_reg,
> > -   sdio_write_reg,
> > -   sdio_read,
> > -   sdio_write,
> > -   sdio_sync,
> > -   sdio_clear_int,
> > -   sdio_read_int,
> > -   sdio_clear_int_ext,
> > -   sdio_read_size,
> > -   sdio_write,
> > -   sdio_read,
> > -   sdio_sync_ext,
> > -
> > -   sdio_set_max_speed,
> > -   sdio_set_default_speed,
> > +const struct wilc_hif_func wilc_hif_sdio = {
> > +   .hif_init = sdio_init,
> > +   .hif_deinit = sdio_deinit,
> > +   .hif_read_reg = sdio_read_reg,
> > +   .hif_write_reg = sdio_write_reg,
> > +   .hif_block_rx = sdio_read,
> > +   .hif_block_tx = sdio_write,
> > +   .hif_sync = sdio_sync,
> > +   .hif_clear_int = sdio_clear_int,
> > +   .hif_read_int = sdio_read_int,
> > +   .hif_clear_int_ext = sdio_clear_int_ext,
> > +   .hif_read_size = sdio_read_size,
> > +   .hif_block_rx_ext = sdio_write,
> > +   .hif_block_tx_ext = sdio_read,
> > +   .hif_sync_ext = sdio_sync_ext,
> > +   .hif_set_max_bus_speed = sdio_set_max_speed,
> > +   .hif_set_default_bus_speed = sdio_set_default_speed,
> >   };

If the callbacks are not in the same order here, something could
in theory go wrong. I've tried to verify them by inspection and
could not find anything here, but you can try reverting this part.

> > memset((void *)_wlan, 0, sizeof(wilc_wlan_dev_t));
> > g_wlan.io_type = wilc->io_type;
> > -
> > -#ifdef WILC_SDIO
> > -   if (!wilc_hif_sdio.hif_init(wilc, wilc_debug)) {
> > -   ret = -EIO;
> > -   goto _fail_;
> > -   }
> > -   memcpy((void *)_wlan.hif_func, _hif_sdio,
> > -  sizeof(struct wilc_hif_func));
> > -#else
> > -   if (!wilc_hif_spi.hif_init(wilc, wilc_debug)) {
> > +   g_wlan.hif_func = *wilc->ops;
> > +   if (!g_wlan.hif_func.hif_init(wilc, wilc_debug)) {
> > ret = -EIO;
> > goto _fail_;
> > }
> > -   memcpy((void *)_wlan.hif_func, _hif_spi,
> > -  sizeof(struct wilc_hif_func));
> > -#endif

This is the most likely part I found:

doing an assigment instead of memcpy should not make a difference,
but my new version also called init after copying over the
operations rather than before. This seemed to be the correct
order when I did it, but it is a change in behavior that might
cause problems if some code relies on the hif_func structure
to be empty at the time that hif_init is called.

Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 15/20] staging/wilc1000: pass hif operations through initialization

2015-11-10 Thread Arnd Bergmann

The wilc_hif_spi and wilc_hif_sdio structures are part of
the bus specific code, and the generic code should have no knowledge
of their addresses.

This changes the code to reference them only from the bus
specific initialization code, which we can then use to split
up the driver into separate modules.

Signed-off-by: Arnd Bergmann 
---
 drivers/staging/wilc1000/linux_wlan.c |  4 ++-
 drivers/staging/wilc1000/linux_wlan_sdio.c|  3 ++-
 drivers/staging/wilc1000/linux_wlan_spi.c |  2 +-
 drivers/staging/wilc1000/wilc_sdio.c  | 35 +--
 drivers/staging/wilc1000/wilc_spi.c   | 34 +-
 drivers/staging/wilc1000/wilc_wfi_netdevice.h |  4 ++-
 drivers/staging/wilc1000/wilc_wlan.c  | 15 ++--
 drivers/staging/wilc1000/wilc_wlan.h  |  4 +--
 8 files changed, 47 insertions(+), 54 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index e81e90678d0f..2fb1d97bded1 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1408,7 +1408,8 @@ void wilc_netdev_cleanup(struct wilc *wilc)
 #endif
 }
 
-int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type, int 
gpio)
+int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
+int gpio, const struct wilc_hif_func *ops)
 {
int i;
perInterface_wlan_t *nic;
@@ -1423,6 +1424,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device 
*dev, int io_type, int gp
*wilc = wilc_dev;
wilc_dev->io_type = io_type;
wilc_dev->gpio = gpio;
+   wilc_dev->ops = ops;
 
register_inetaddr_notifier(_dev_notifier);
 
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c 
b/drivers/staging/wilc1000/linux_wlan_sdio.c
index 732b0d66366b..f4250fda6cf1 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.c
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
@@ -119,7 +119,8 @@ static int linux_sdio_probe(struct sdio_func *func, const 
struct sdio_device_id
 
PRINT_D(INIT_DBG, "Initializing netdev\n");
wilc_sdio_func = func;
-   if (wilc_netdev_init(, >dev, HIF_SDIO, gpio)) {
+   if (wilc_netdev_init(, >dev, HIF_SDIO, gpio,
+_hif_sdio)) {
PRINT_ER("Couldn't initialize netdev\n");
return -1;
}
diff --git a/drivers/staging/wilc1000/linux_wlan_spi.c 
b/drivers/staging/wilc1000/linux_wlan_spi.c
index f4dda4a6fa7b..a7a52593156a 100644
--- a/drivers/staging/wilc1000/linux_wlan_spi.c
+++ b/drivers/staging/wilc1000/linux_wlan_spi.c
@@ -404,7 +404,7 @@ static int __init init_wilc_spi_driver(void)
 
wilc_debugfs_init();
 
-   ret = wilc_netdev_init(, NULL, HIF_SPI, GPIO_NUM);
+   ret = wilc_netdev_init(, NULL, HIF_SPI, GPIO_NUM, _hif_spi);
if (ret) {
wilc_debugfs_remove();
return ret;
diff --git a/drivers/staging/wilc1000/wilc_sdio.c 
b/drivers/staging/wilc1000/wilc_sdio.c
index 8441fcc4..0a9b5a71772e 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -912,23 +912,22 @@ static int sdio_sync_ext(int nint /*  how mant interrupts 
to enable. */)
  *
  /
 
-struct wilc_hif_func wilc_hif_sdio = {
-   sdio_init,
-   sdio_deinit,
-   sdio_read_reg,
-   sdio_write_reg,
-   sdio_read,
-   sdio_write,
-   sdio_sync,
-   sdio_clear_int,
-   sdio_read_int,
-   sdio_clear_int_ext,
-   sdio_read_size,
-   sdio_write,
-   sdio_read,
-   sdio_sync_ext,
-
-   sdio_set_max_speed,
-   sdio_set_default_speed,
+const struct wilc_hif_func wilc_hif_sdio = {
+   .hif_init = sdio_init,
+   .hif_deinit = sdio_deinit,
+   .hif_read_reg = sdio_read_reg,
+   .hif_write_reg = sdio_write_reg,
+   .hif_block_rx = sdio_read,
+   .hif_block_tx = sdio_write,
+   .hif_sync = sdio_sync,
+   .hif_clear_int = sdio_clear_int,
+   .hif_read_int = sdio_read_int,
+   .hif_clear_int_ext = sdio_clear_int_ext,
+   .hif_read_size = sdio_read_size,
+   .hif_block_rx_ext = sdio_write,
+   .hif_block_tx_ext = sdio_read,
+   .hif_sync_ext = sdio_sync_ext,
+   .hif_set_max_bus_speed = sdio_set_max_speed,
+   .hif_set_default_bus_speed = sdio_set_default_speed,
 };
 
diff --git a/drivers/staging/wilc1000/wilc_spi.c 
b/drivers/staging/wilc1000/wilc_spi.c
index dc9cdf5e4065..0433e2b5f80a 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -1021,21 +1021,21 @@ static int wilc_spi_sync_ext(int nint /*  how mant 
interrupts to enable. */)
  *  Global spi HIF function table
  *
  /
-struct wilc_hif_func wilc_hif_spi = {
-   _wilc_spi_init,
-   _wilc_spi_deinit,
-   wilc_spi_read_reg,
-

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

Re: [PATCH 15/20] staging/wilc1000: pass hif operations through initialization

[PATCH 15/20] staging/wilc1000: pass hif operations through initialization

6 matches

Site Navigation

Mail list logo

Footer information