Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1330826 > unrolled thread

[PATCH] wlcore: Fix regression in wlcore_set_partition()

Back to article view | Back to linux.kernel

Contents

  [PATCH] wlcore: Fix regression in wlcore_set_partition() Emil Goode <emil.fsw@goode.io> - 2016-02-10 02:30 +0100
    Re: [PATCH] wlcore: Fix regression in wlcore_set_partition() Kalle Valo <kvalo@codeaurora.org> - 2016-02-10 18:40 +0100
    Re: wlcore: Fix regression in wlcore_set_partition() Kalle Valo <kvalo@codeaurora.org> - 2016-02-12 10:50 +0100
      Re: wlcore: Fix regression in wlcore_set_partition() Ross Green <rgkernel@gmail.com> - 2016-02-15 05:10 +0100
        Re: wlcore: Fix regression in wlcore_set_partition() Kalle Valo <kvalo@codeaurora.org> - 2016-02-16 16:30 +0100
          Re: wlcore: Fix regression in wlcore_set_partition() Ross Green <rgkernel@gmail.com> - 2016-02-17 06:40 +0100

#1330826 — [PATCH] wlcore: Fix regression in wlcore_set_partition()

The below commit introduced a regression causing the wlcore
to time out and go into recovery.

commit 3719c17e1816695f415dd3b4ddcb679f7dc617c8
("wlcore/wl18xx: fw logger over sdio")

Reverting the changes regarding write of the last partition size
brings the module back to it's functional state.

Reported-by: Ross Green <rgkernel@gmail.com>
Signed-off-by: Emil Goode <emil.fsw@goode.io>
---
 drivers/net/wireless/ti/wlcore/io.c | 8 ++++----
 drivers/net/wireless/ti/wlcore/io.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ti/wlcore/io.c b/drivers/net/wireless/ti/wlcore/io.c
index 9ac118e..564ca75 100644
--- a/drivers/net/wireless/ti/wlcore/io.c
+++ b/drivers/net/wireless/ti/wlcore/io.c
@@ -175,14 +175,14 @@ int wlcore_set_partition(struct wl1271 *wl,
 	if (ret < 0)
 		goto out;
 
+	/* We don't need the size of the last partition, as it is
+	 * automatically calculated based on the total memory size and
+	 * the sizes of the previous partitions.
+	 */
 	ret = wlcore_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);
 	if (ret < 0)
 		goto out;
 
-	ret = wlcore_raw_write32(wl, HW_PART3_SIZE_ADDR, p->mem3.size);
-	if (ret < 0)
-		goto out;
-
 out:
 	return ret;
 }
diff --git a/drivers/net/wireless/ti/wlcore/io.h b/drivers/net/wireless/ti/wlcore/io.h
index 6c257b5..10cf374 100644
--- a/drivers/net/wireless/ti/wlcore/io.h
+++ b/drivers/net/wireless/ti/wlcore/io.h
@@ -36,8 +36,8 @@
 #define HW_PART1_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 12)
 #define HW_PART2_SIZE_ADDR              (HW_PARTITION_REGISTERS_ADDR + 16)
 #define HW_PART2_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 20)
-#define HW_PART3_SIZE_ADDR              (HW_PARTITION_REGISTERS_ADDR + 24)
-#define HW_PART3_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 28)
+#define HW_PART3_START_ADDR             (HW_PARTITION_REGISTERS_ADDR + 24)
+
 #define HW_ACCESS_REGISTER_SIZE         4
 
 #define HW_ACCESS_PRAM_MAX_RANGE	0x3c000
-- 
2.1.4

[toc] | [next] | [standalone]

#1331362

Emil Goode <emil.fsw@goode.io> writes:

> The below commit introduced a regression causing the wlcore
> to time out and go into recovery.
>
> commit 3719c17e1816695f415dd3b4ddcb679f7dc617c8
> ("wlcore/wl18xx: fw logger over sdio")
>
> Reverting the changes regarding write of the last partition size
> brings the module back to it's functional state.
>
> Reported-by: Ross Green <rgkernel@gmail.com>
> Signed-off-by: Emil Goode <emil.fsw@goode.io>

A proper "Fixes:" line is good to have, but I can add it.

I'm planning to queue this to 4.5.

-- 
Kalle Valo

[toc] | [prev] | [next] | [standalone]

#1332641 — Re: wlcore: Fix regression in wlcore_set_partition()

> The commit 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio") introduced a
> regression causing the wlcore to time out and go into recovery. Reverting the
> changes regarding write of the last partition size brings the module back to
> it's functional state.
> 
> Fixes: 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio")
> Reported-by: Ross Green <rgkernel@gmail.com>
> Signed-off-by: Emil Goode <emil.fsw@goode.io>
> [kvalo@codeaurora.org: improved commit log]

Thanks, applied to wireless-drivers.git.

Kalle Valo

[toc] | [prev] | [next] | [standalone]

#1334137 — Re: wlcore: Fix regression in wlcore_set_partition()

[Multipart message — attachments visible in raw view] — view raw

On Fri, Feb 12, 2016 at 8:45 PM, Kalle Valo <kvalo@codeaurora.org> wrote:
>
>> The commit 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio") introduced a
>> regression causing the wlcore to time out and go into recovery. Reverting the
>> changes regarding write of the last partition size brings the module back to
>> it's functional state.
>>
>> Fixes: 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio")
>> Reported-by: Ross Green <rgkernel@gmail.com>
>> Signed-off-by: Emil Goode <emil.fsw@goode.io>
>> [kvalo@codeaurora.org: improved commit log]
>
> Thanks, applied to wireless-drivers.git.
>
> Kalle Valo

I just tested linux-4.5-rc4 it appears the above fix missed the release for rc4!
So the behaviour of firmware reset being called after the access of
the last partition timesout.

Again tested patch with the new release - 4.5-rc4 and found everything
to work as expected again.

So Hopefully for rc5 - Please!

please find attached a copy of the dmesg output for 4.5-rc4

Regards,

Ross Green

[toc] | [prev] | [next] | [standalone]

#1335516 — Re: wlcore: Fix regression in wlcore_set_partition()

Ross Green <rgkernel@gmail.com> writes:

> On Fri, Feb 12, 2016 at 8:45 PM, Kalle Valo <kvalo@codeaurora.org> wrote:
>>
>>> The commit 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio") introduced a
>>> regression causing the wlcore to time out and go into recovery. Reverting the
>>> changes regarding write of the last partition size brings the module back to
>>> it's functional state.
>>>
>>> Fixes: 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio")
>>> Reported-by: Ross Green <rgkernel@gmail.com>
>>> Signed-off-by: Emil Goode <emil.fsw@goode.io>
>>> [kvalo@codeaurora.org: improved commit log]
>>
>> Thanks, applied to wireless-drivers.git.
>>
>> Kalle Valo
>
> I just tested linux-4.5-rc4 it appears the above fix missed the release for rc4!
> So the behaviour of firmware reset being called after the access of
> the last partition timesout.
>
> Again tested patch with the new release - 4.5-rc4 and found everything
> to work as expected again.
>
> So Hopefully for rc5 - Please!

It takes some time to get patches into Linus' tree. And being in a
conference and then getting sick is not really helping. I'm not sure if
this patch makes to rc5 on time, but I'll try.

-- 
Kalle Valo

[toc] | [prev] | [next] | [standalone]

#1336060 — Re: wlcore: Fix regression in wlcore_set_partition()

Appreciate your efforts!

Just trying to make sure it does not get lost.
Introduced in rc1, not fixed by ... rc4.

Anyway, I will continue to test, lots of other things still to chase
even in rc4!

Regards,

Ross Green

On Wed, Feb 17, 2016 at 2:24 AM, Kalle Valo <kvalo@codeaurora.org> wrote:
> Ross Green <rgkernel@gmail.com> writes:
>
>> On Fri, Feb 12, 2016 at 8:45 PM, Kalle Valo <kvalo@codeaurora.org> wrote:
>>>
>>>> The commit 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio") introduced a
>>>> regression causing the wlcore to time out and go into recovery. Reverting the
>>>> changes regarding write of the last partition size brings the module back to
>>>> it's functional state.
>>>>
>>>> Fixes: 3719c17e1816 ("wlcore/wl18xx: fw logger over sdio")
>>>> Reported-by: Ross Green <rgkernel@gmail.com>
>>>> Signed-off-by: Emil Goode <emil.fsw@goode.io>
>>>> [kvalo@codeaurora.org: improved commit log]
>>>
>>> Thanks, applied to wireless-drivers.git.
>>>
>>> Kalle Valo
>>
>> I just tested linux-4.5-rc4 it appears the above fix missed the release for rc4!
>> So the behaviour of firmware reset being called after the access of
>> the last partition timesout.
>>
>> Again tested patch with the new release - 4.5-rc4 and found everything
>> to work as expected again.
>>
>> So Hopefully for rc5 - Please!
>
> It takes some time to get patches into Linus' tree. And being in a
> conference and then getting sick is not really helping. I'm not sure if
> this patch makes to rc5 on time, but I'll try.
>
> --
> Kalle Valo

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web