Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   <Ajay.Kathat@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Claudiu.Beznea@microchip.com>, <Sripad.Balwadgi@microchip.com>,
        <Ajay.Kathat@microchip.com>
Subject: [PATCH v2] wifi: wilc1000: change firmware path from 'atmel' to
 'microchip/wilc'
Thread-Topic: [PATCH v2] wifi: wilc1000: change firmware path from 'atmel' to
 'microchip/wilc'
Thread-Index: AQHZsQr8xYfyiYJXlkSvmHc+dTfaZQ==
Date:   Fri, 7 Jul 2023 19:41:13 +0000
Message-ID: <20230707194025.47085-1-ajay.kathat@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?fXY4Gp699MJIgWnRZib79Ce2JZgRDM4GEtFlmPGPpv+sPlqKKfBMVEQ0ep?=
 =?iso-8859-1?Q?0V71uCwKlBdHjsPdHh9FZ3baGtu3eG7d56d+o5Sn7Jq+rIIFgVW/Pi0/d/?=
 =?iso-8859-1?Q?OsG9ZJ+KBa4Rr5gFryNxUQNa3rVZnqkU6zZp8TFqWq2CXob/GaPj2ZLL4I?=
 =?iso-8859-1?Q?BRHugHVnSJs9e0pRaIXJpqXTlfEnHYa1uPrpp09nux4e+V078n2MXr/IT5?=
 =?iso-8859-1?Q?3RJKWiisrK0PTsPp3Ds9IY0ymZhLzNjD3zWpQSj+w2jBXMoiIbh3mh63xS?=
 =?iso-8859-1?Q?XLMPsfH2CwWoEXx7LY2gFPGYV5yBAJI3hdSc2JlyA63VBLFFtgWoHH0fs/?=
 =?iso-8859-1?Q?S1c639KuYTetX+zaViUUfuyxmQf1I7QRwFqqvr30SJ7tXOHwS6/dWu7Eus?=
 =?iso-8859-1?Q?OAKqg5iWCfcngMrIss+YkelxDVBkkpPFGaXlJl3S92fWbugG9j60RHfwPE?=
 =?iso-8859-1?Q?PauwZx4Nwz53ZdnEuhUvjUhMOtdgrvNof6Saiz5wVxl7Tvgi3fv3FuWCcH?=
 =?iso-8859-1?Q?brqYR1MKhl20GTwQiauRryrhqR3VutJU7kh31gy9NGbNvcOKRC7Y1MCsgK?=
 =?iso-8859-1?Q?5V6u1TmAwA3GMYAWlxiRORA3OXwUd6sg3WxTVI5G7trozRMR1aW6Dj3O0T?=
 =?iso-8859-1?Q?/FA8gFcsMKE2+yMMH0W98+NnEBm9+svXIEd5AxDe1w3naiQxnWuhXtpBRN?=
 =?iso-8859-1?Q?wZo8RFUbjEJQngzjnQzMAqevqKKRQAP1QyxsPyXq9vnsPJNu6pBA1VSVyZ?=
 =?iso-8859-1?Q?1lrcBPRRsOr/q8AKw/oQlyTq5vH0I/bnI/zorgUtypKrdCt83K4nBWLKn1?=
 =?iso-8859-1?Q?LzXdFVsdPApjhQghqqZcRj8AZBZxMWaNhoCY6M7tDzMa3oMySy4jAM9WG2?=
 =?iso-8859-1?Q?ZRY1Olw70KN6N/7buYYXkMJML11MRtk4UwQMbp3bsV7ZGafox5ZNUllrKb?=
 =?iso-8859-1?Q?sOAHJiSSgKcbN3ivwT12xieDccrP/mV0V/3vM5O10WjzPXg/h8JAHJLpht?=
 =?iso-8859-1?Q?VMpunBB5d/grTfzTw315PZePF2Gd6jMHw5xz0lEsFuP438a/qhAxl0/lW8?=
 =?iso-8859-1?Q?pn7IgKremse8gRuefAH8ohVdF9FV4aX6ad8pFEk+q9IWjD+/FOAlWNtFvv?=
 =?iso-8859-1?Q?k/hJHR8zGmy8yu/W7MpOBINZcaajoU8gmy6JGWfSu07hoOocgNKPSrFUN3?=
 =?iso-8859-1?Q?obFYotgFmfam84ypLQyS8DDk8o8V1yxJVwDfVOPpmbYF4/+qyNHGjm9izY?=
 =?iso-8859-1?Q?1Ny7CsXBuBZfX4IpBsbFdHLOdZErjahh0R06T4DwlQ8w2QMExkLsuCP3+P?=
 =?iso-8859-1?Q?A55GHHvagLP5vhRIlX+zuhSaiW2Or/MekbvsXO20YMaP8xhJ0ZpdhexeDZ?=
 =?iso-8859-1?Q?2HGhTKZ4iBoUYBRrITnV4sQxKLgWdSdhmV5kL/rZr+U/Qu+14f/0ngadV+?=
 =?iso-8859-1?Q?oFoF4el88luKZON8KR6kTzq2KzFxszDJAu6nU1obxabeBq7DqZ/HAqtc3l?=
 =?iso-8859-1?Q?5OPCm2hwKueO928GazeIpS4THm0OOQc4e6hK/6edNyyx7MRdo45QARuS2f?=
 =?iso-8859-1?Q?n+fWC2EJOabAQnmHVLksvjruOMcW7aXrJlHmmTPlnxt4OEpFULMasN3ea0?=
 =?iso-8859-1?Q?0oWvDeatl3DHMhHrhBE5VJo8MAoEYFWfgw9CB10VI+9g0CLMycf7Qa2A?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB5172.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1e50de95-cf8d-4ea4-3137-08db7f221f81
X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Jul 2023 19:41:13.6823
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: ZIW+P2m0zespi3kLPaQOyvv6MqwIs24QL/puDFY9TNk0iDfM/rnstfXlb60vosrf8Crz90y36A/9Mo4oVmBwWNklUhTcP8w6QBJTusX15hY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6851
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,
        SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Ajay Singh <ajay.kathat@microchip.com>

To inline 'linux-firmware' path with driver, the firmware path is changed
from 'atmel' to 'microchip/wilc'. The path change will be submitted to
'linux-firmware' repo.
For backward compatibility, when the updated kernel and older
linux-firmware that has firmware at 'atmel/' path are used, add a fallback
method to read firmware from 'atmel' path.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
---
 changes since v1:
  - load firmware from older path when firmware is missing at new path for
  backward compatibility.

---
 .../net/wireless/microchip/wilc1000/netdev.c  | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net=
/wireless/microchip/wilc1000/netdev.c
index e9f59de31b0b..c0dd7072decc 100644
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -19,10 +19,13 @@
 /* latest API version supported */
 #define WILC1000_API_VER		1

-#define WILC1000_FW_PREFIX		"atmel/wilc1000_wifi_firmware-"
+#define WILC1000_FW_PREFIX		"wilc1000_wifi_firmware-"
 #define __WILC1000_FW(api)		WILC1000_FW_PREFIX #api ".bin"
 #define WILC1000_FW(api)		__WILC1000_FW(api)

+#define WILC1000_ATMEL_FW(api)          "atmel/" WILC1000_FW(api)
+#define WILC1000_MICROCHIP_FW(api)      "microchip/wilc/" WILC1000_FW(api)
+
 static irqreturn_t isr_uh_routine(int irq, void *user_data)
 {
 	struct wilc *wilc =3D user_data;
@@ -187,14 +190,27 @@ static int wilc_wlan_get_firmware(struct net_device *=
dev)
 	chip_id =3D wilc_get_chipid(wilc, false);

 	netdev_info(dev, "ChipID [%x] loading firmware [%s]\n", chip_id,
-		    WILC1000_FW(WILC1000_API_VER));
+		    WILC1000_MICROCHIP_FW(WILC1000_API_VER));

-	ret =3D request_firmware(&wilc_fw, WILC1000_FW(WILC1000_API_VER),
+	ret =3D request_firmware(&wilc_fw,
+			       WILC1000_MICROCHIP_FW(WILC1000_API_VER),
 			       wilc->dev);
-	if (ret !=3D 0) {
-		netdev_err(dev, "%s - firmware not available\n",
-			   WILC1000_FW(WILC1000_API_VER));
-		return -EINVAL;
+	if (ret =3D=3D -ENOENT) {
+		netdev_info(dev, "firmware not found at[%s], try [%s]\n",
+			    WILC1000_MICROCHIP_FW(WILC1000_API_VER),
+			    WILC1000_ATMEL_FW(WILC1000_API_VER));
+		ret =3D request_firmware(&wilc_fw,
+				       WILC1000_ATMEL_FW(WILC1000_API_VER),
+				       wilc->dev);
+		if (ret) {
+			netdev_err(dev, "[%s] - request firmware failed %d\n",
+				   WILC1000_ATMEL_FW(WILC1000_API_VER), ret);
+			return ret;
+		}
+	} else if (ret) {
+		netdev_err(dev, "[%s] - request firmware failed %d\n",
+			   WILC1000_MICROCHIP_FW(WILC1000_API_VER), ret);
+		return ret;
 	}
 	wilc->firmware =3D wilc_fw;

@@ -1007,4 +1023,5 @@ struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl=
, const char *name,
 }

 MODULE_LICENSE("GPL");
-MODULE_FIRMWARE(WILC1000_FW(WILC1000_API_VER));
+MODULE_FIRMWARE(WILC1000_ATMEL_FW(WILC1000_API_VER));
+MODULE_FIRMWARE(WILC1000_MICROCHIP_FW(WILC1000_API_VER));
--
2.34.1