Re: [v4] wlcore: add missing nvs file name info for wilink8

[Julian Calaby]

Hi Eyal,

On Mon, Jul 31, 2017 at 6:45 PM, Reizer, Eyal <eyalr@xxxxxx> wrote:
> The following commits:
> c815fde wlcore: spi: Populate config firmware data
> d776fc8 wlcore: sdio: Populate config firmware data
>
> Populated the nvs entry for wilink6 and wilink7 only while it is
> still needed for wilink8 as well.
> This broke user space backward compatibility when upgrading from older
> kernels, as the alternate mac address would not be read from the nvs that
> is present in the file system (lib/firmware/ti-connectivity/wl1271-nvs.bin)
> causing mac address change of the wlan interface.
>
> This patch fix this and update the structure field with the same default
> nvs file name that has been used before.
>
> In addition, some distros hold a default wl1271-nvs.bin in the file
> system with a bogus mac address (deadbeef...) that for a wl18xx device
> also overrides the mac address that is stored inside the device.
> Warn users about this bogus mac address and use a random mac instead
>
> Cc: stable <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Eyal Reizer <eyalr@xxxxxx>
> ---
>
> diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
> index 60aaa85..7ce4221 100644
> --- a/drivers/net/wireless/ti/wlcore/main.c
> +++ b/drivers/net/wireless/ti/wlcore/main.c
> @@ -5961,6 +5961,22 @@ static void wl12xx_derive_mac_addresses(struct wl1271 *wl, u32 oui, u32 nic)
>         if (nic + WLCORE_NUM_MAC_ADDRESSES - wl->num_mac_addr > 0xffffff)
>                 wl1271_warning("NIC part of the MAC address wraps around!");
>
> +       if (oui == 0xdeadbe && nic == 0xef0000) {
> +               wl1271_warning("Detected unconfigured mac address in nvs.\n"
> +                               "Using a random TI mac address instead.\n"
> +                               "in case of using a wl12xx device, your "
> +                               "device performance may not be optimized.\n"
> +                               "Please use the calibrator tool to configure "
> +                               "your device.\n"
> +                               "When using a wl18xx device the nvs file can "
> +                               "be removed as a default mac address is "
> +                               "stored internally.\n");
> +
> +               /* Use TI oui and a random nic */
> +               oui = 0x080028;

Is there (or should there be) a constant for this?

Thanks,

-- 
Julian Calaby

Email: julian.calaby@xxxxxxxxx
Profile: http://www.google.com/profiles/julian.calaby/