From nobody Sun Feb 8 11:06:12 2026 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F2F526B777 for ; Sat, 27 Dec 2025 11:22:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766834547; cv=none; b=YExLBRqh0q4Tylb739/tkNSKhGWoKBOjGns0tvdtup1suuCNFUrHil8nQC/DIPCdjlLZucG8CbNfVDWNHsGle7i+XAyal1q9BTunFBD8cDN2Nc0uSWAgfcsTNeNdz5jnQPB3BUzpCNWbluZ7DFswOYM+q1fqTWAnaoeqz66kLoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766834547; c=relaxed/simple; bh=hJ1/Pt690VOGyijqKMuzTxghALMJw8XB3grVwRALNis=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=fMeSrNkph0ck4Ma7QWsEsR7ycqiA25eBJNKtf7V2Y+Ql6eRlMDjBcM94EgrHqE8sXXbpZoDWyMnqz5qrvwwaWyEE+437rqfGE5Hk1PHbL2R96Y6TjZdDKemyWNMmmbGjkFdvG0tL70E6mqm8PURT28AVNr5Ldsp4EpWoPx18Ufk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nf3hzGa3; arc=none smtp.client-ip=209.85.221.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nf3hzGa3" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-432755545fcso1050218f8f.1 for ; Sat, 27 Dec 2025 03:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766834544; x=1767439344; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n2DCKn6B7Bg+9KQ/LRQRtOwwU8XjtNRI/VbbXHcbXNg=; b=nf3hzGa3nYYzQuX5ztEGK4LYnmn/fH5S+I7ukBX0HjkfxM42E5ITffL8rf+JD0Yr2T Ne8tngt/z62GPF8ElTnXFJVt+55C0G8qRrQqWJHbzFdTGtV0Vaqv9d51/8jpr+roQwSV bGrvZ3CZI86ttJOqdXDpuu8tFIR2G3TP7l8XOuYZ1ZrHBlktkBrH+RlVzN3yYlIPt5DU V90Ms1zdsKkJC6Y6wXWufqvsYEQoT1WIBGgwi6VcycHJJhm8QAzox2/ZZVO/q4ocQLuv aHZpPUmc8M2qDyHa+XlyP8w1+GCnE4Lk0YGUc2Hf2e/HVmN5cntflDSVYUQcdnI5459q zv6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766834544; x=1767439344; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=n2DCKn6B7Bg+9KQ/LRQRtOwwU8XjtNRI/VbbXHcbXNg=; b=NcNM8SsxozAktevny1oZC4LZSIJYL0TXwe7wtx7ye9NO+XYzmU22nDb7V6BO5o2Iqq wK8POO3IQjIn+uKwYmiGWrow+YI+x5Thniv+GJpvEcp3ji0Hr+9HFJGl9FhzVPxlC729 frEtfdXtuXWM+uUwNE7ImUp6GDHKuqAMfYZG/C4TMHObjpwgF+K7CIMXfoyUHfrn8jZT 3XTWqfIB05edSAIM5LTZvzEoKcVhe4Kk29H4Yi6BprcXYnMP4odVZFFCTAZrvzu3vG87 7fg8/o8C62nDaqah6tvoFu9aQLA6S1KoNp68srAHe/zMwY0OExTOu+094PH6bW1W5VAL 80mw== X-Forwarded-Encrypted: i=1; AJvYcCW1FwNDfqNHJMMrpxfonuFmEB1JON29weATDTvYcCttm1LrsBCb8aBb+x34rNvUzXjI02etnxgSOoXvh60=@vger.kernel.org X-Gm-Message-State: AOJu0YwEcRaEh9efbJRW0lPH8SFwiE38I9AQV4pba9tF/lRo8H+Ldden gakytFoht4QDii2h1LhmOZPteCP0QBK2oSJda9WuQVFdCfSiVM4oelwX X-Gm-Gg: AY/fxX4w+R50vuhjIRzNnon7XEAhCX8wk35/xW0cg72ipbRsvzQKS1K3zDEoPv2VGNh rt58kDPM1ulErxKXLzAR7V7gHdVU+vTDgql15SVWMvgOuXK223ewZHTOhed8gT3dZOV1vtNzQNe p53xkTlUMnocJiK+U+M2/kvz2Dyy4/T82b7GCN+ChlP1R3C4cN5O4WdNvBydA9WIro9le8QbKPD Vfs/gdvCx3Ibp69tUQarWKqBGrhTh0bLosCW+xMVIGMbAQV37aYXQfKkuqvzihptH7nq7jqE7wk 1dfJ0CBEe/BQcZzEv2cErW7IV0nksYacyKonq+I9tY4N3HRdoXqGl6YBrZNnDxZ1+4LnG3YD3hZ +MQZhBghAJFJuz8y/MMTw2Ok2jIlzVTrbkEEehbthUcjSAu+n0Ai1iIQIj01WKh9/2/PhT/qBd4 zbaKCUQSZKxEKJTAc= X-Google-Smtp-Source: AGHT+IGoRHV/ozBfOoLVpES4DLCNbHxVqZI4mSyjVxLpUFm4/9hj62ouP1sKgmo+lauX8G4qDDvyKA== X-Received: by 2002:a05:6000:609:b0:431:342:ad41 with SMTP id ffacd0b85a97d-4324e6fa1a7mr32037027f8f.61.1766834543655; Sat, 27 Dec 2025 03:22:23 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324e9ba877sm49898600f8f.0.2025.12.27.03.22.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Dec 2025 03:22:23 -0800 (PST) From: Christian Hewitt To: Jakub Kicinski , Matthias Brugger , AngeloGioacchino Del Regno , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Daniel Golle Subject: [PATCH v2] wifi: mt7601u: check multiple firmware paths Date: Sat, 27 Dec 2025 11:22:19 +0000 Message-Id: <20251227112219.2768439-1-christianshewitt@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The linux-firmware repo moved mt7601u.bin from its root folder to the mediatek sub-folder some time ago, but the driver still tries to load firmware from the old location. Users might have firmware in either location so update the driver to check both. Signed-off-by: Christian Hewitt --- The firmware was moved in [0]. Changes were requested to a previous patch [1] to accomodate backwards compatibility but there was no follow-up from the original author. So here's my novice attempt at the requested improvement. Current kernel with firmware in /usr/lib/firmware/mediatek/mt7601u.bin: Nov 07 12:43:13.398922 LibreELEC kernel: mt7601u 1-1.3:1.0: ASIC revision: = 76010001 MAC revision: 76010500 Nov 07 12:43:13.402276 LibreELEC kernel: mt7601u 1-1.3:1.0: Direct firmware= load for mt7601u.bin failed with error -2 Nov 07 12:43:13.405524 LibreELEC kernel: mt7601u 1-1.3:1.0: probe with driv= er mt7601u failed with error -2 And with the patch: Nov 07 12:43:13.274633 LibreELEC kernel: mt7601u 1-1.3:1.0: ASIC revision: = 76010001 MAC revision: 76010500 Nov 07 12:43:13.311200 LibreELEC kernel: mt7601u 1-1.3:1.0: Firmware Versio= n: 0.1.00 Build: 7640 Build time: 201302052146____ Nov 07 12:43:13.704693 LibreELEC kernel: mt7601u 1-1.3:1.0: EEPROM ver:0c f= ae:00 [0] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware= .git/commit/?id=3D8451c2b1d529dc1a49328ac9235d3cf5bb8a8fcb [1] https://patchwork.kernel.org/project/linux-wireless/patch/fefcbf36f1387= 3ae0d97438a0156b87e7e1ae64e.1684191377.git.daniel@makrotopia.org/ Changes since v1: - Reword patch description and comment to make the problem clearer - Fix checkpatch warning for static const array declaration drivers/net/wireless/mediatek/mt7601u/mcu.c | 15 ++++++++++++++- drivers/net/wireless/mediatek/mt7601u/usb.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt7601u/mcu.c b/drivers/net/wire= less/mediatek/mt7601u/mcu.c index 1b5cc271a9e1..bad6ca821400 100644 --- a/drivers/net/wireless/mediatek/mt7601u/mcu.c +++ b/drivers/net/wireless/mediatek/mt7601u/mcu.c @@ -403,12 +403,18 @@ mt7601u_upload_firmware(struct mt7601u_dev *dev, cons= t struct mt76_fw *fw) return ret; } =20 +static const char * const mt7601u_fw_paths[] =3D { + "mediatek/" MT7601U_FIRMWARE, + MT7601U_FIRMWARE, +}; + static int mt7601u_load_firmware(struct mt7601u_dev *dev) { const struct firmware *fw; const struct mt76_fw_header *hdr; int len, ret; u32 val; + int i; =20 mt7601u_wr(dev, MT_USB_DMA_CFG, (MT_USB_DMA_CFG_RX_BULK_EN | MT_USB_DMA_CFG_TX_BULK_EN)); @@ -416,7 +422,14 @@ static int mt7601u_load_firmware(struct mt7601u_dev *d= ev) if (firmware_running(dev)) return firmware_request_cache(dev->dev, MT7601U_FIRMWARE); =20 - ret =3D request_firmware(&fw, MT7601U_FIRMWARE, dev->dev); + /* Try loading firmware from multiple locations */ + fw =3D NULL; + for (i =3D 0; i < MT7601U_FIRMWARE_PATHS; i++) { + ret =3D request_firmware(&fw, mt7601u_fw_paths[i], dev->dev); + if (ret =3D=3D 0) + break; + } + if (ret) return ret; =20 diff --git a/drivers/net/wireless/mediatek/mt7601u/usb.h b/drivers/net/wire= less/mediatek/mt7601u/usb.h index 9fdf35970339..723025f84483 100644 --- a/drivers/net/wireless/mediatek/mt7601u/usb.h +++ b/drivers/net/wireless/mediatek/mt7601u/usb.h @@ -9,6 +9,7 @@ #include "mt7601u.h" =20 #define MT7601U_FIRMWARE "mt7601u.bin" +#define MT7601U_FIRMWARE_PATHS ARRAY_SIZE(mt7601u_fw_paths) =20 #define MT_VEND_REQ_MAX_RETRY 10 #define MT_VEND_REQ_TOUT_MS 300 --=20 2.34.1