diff mbox series

wifi: mt7601u: update firmware path

Message ID fefcbf36f13873ae0d97438a0156b87e7e1ae64e.1684191377.git.daniel@makrotopia.org
State New
Headers
Series wifi: mt7601u: update firmware path |

Commit Message

Daniel Golle May 15, 2023, 10:56 p.m. UTC 
  mt7601u.bin was moved to mediatek/ folder in linux-wireless via commit
8451c2b1 ("mt76xx: Move the old Mediatek WiFi firmware to mediatek")
and linux-firmware release 20230515.

Update the firmware path requested by the mt7601u driver to follow up
with the move of the file.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 drivers/net/wireless/mediatek/mt7601u/usb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 0d9b41daa5907756a31772d8af8ac5ff25cf17c1

Comments

Kalle Valo May 16, 2023, 5:24 a.m. UTC | #1 
Daniel Golle <daniel@makrotopia.org> writes:

> mt7601u.bin was moved to mediatek/ folder in linux-wireless via commit
> 8451c2b1 ("mt76xx: Move the old Mediatek WiFi firmware to mediatek")
> and linux-firmware release 20230515.

Why was it moved?

> --- a/drivers/net/wireless/mediatek/mt7601u/usb.h
> +++ b/drivers/net/wireless/mediatek/mt7601u/usb.h
> @@ -8,7 +8,7 @@
>  
>  #include "mt7601u.h"
>  
> -#define MT7601U_FIRMWARE	"mt7601u.bin"
> +#define MT7601U_FIRMWARE	"mediatek/mt7601u.bin"

How do we handle backwards compatibility? We have a rule that old
userspace needs to work with new kernel and this change breaks that.
Simon Horman May 16, 2023, 10:25 a.m. UTC | #2 
On Tue, May 16, 2023 at 12:56:53AM +0200, Daniel Golle wrote:
> mt7601u.bin was moved to mediatek/ folder in linux-wireless via commit
> 8451c2b1 ("mt76xx: Move the old Mediatek WiFi firmware to mediatek")
> and linux-firmware release 20230515.
> 
> Update the firmware path requested by the mt7601u driver to follow up
> with the move of the file.
> 
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Reviewed-by: Simon Horman <simon.horman@corigine.com>
Kalle Valo May 24, 2023, 7:47 a.m. UTC | #3 
Kalle Valo <kvalo@kernel.org> writes:

> Daniel Golle <daniel@makrotopia.org> writes:
>
>> mt7601u.bin was moved to mediatek/ folder in linux-wireless via commit
>> 8451c2b1 ("mt76xx: Move the old Mediatek WiFi firmware to mediatek")
>> and linux-firmware release 20230515.
>
> Why was it moved?

Here's the link to the commit in linux-firmware:

https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=8451c2b1d529dc1a49328ac9235d3cf5bb8a8fcb

It would be good to include that in the commit log. Unfortunately the
linux-firmware commit doesn't explain why the change is made, oh well.

>> --- a/drivers/net/wireless/mediatek/mt7601u/usb.h
>> +++ b/drivers/net/wireless/mediatek/mt7601u/usb.h
>> @@ -8,7 +8,7 @@
>>  
>>  #include "mt7601u.h"
>>  
>> -#define MT7601U_FIRMWARE	"mt7601u.bin"
>> +#define MT7601U_FIRMWARE	"mediatek/mt7601u.bin"
>
> How do we handle backwards compatibility? We have a rule that old
> userspace needs to work with new kernel and this change breaks that.

Luckily the linux-firmware commit added symlinks so that won't break the
backward compatibility. But I think in the driver we still need to
support both the old and new location for several years. So the driver
should first try the new location, next the old location and only after
that fail.
diff mbox series

Patch

diff --git a/drivers/net/wireless/mediatek/mt7601u/usb.h b/drivers/net/wireless/mediatek/mt7601u/usb.h
index 9fdf35970339..66481b7e3252 100644
--- a/drivers/net/wireless/mediatek/mt7601u/usb.h
+++ b/drivers/net/wireless/mediatek/mt7601u/usb.h
@@ -8,7 +8,7 @@ 
 
 #include "mt7601u.h"
 
-#define MT7601U_FIRMWARE	"mt7601u.bin"
+#define MT7601U_FIRMWARE	"mediatek/mt7601u.bin"
 
 #define MT_VEND_REQ_MAX_RETRY	10
 #define MT_VEND_REQ_TOUT_MS	300