From nobody Mon Dec 1 21:33:24 2025 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 BEE6D2F1FD7 for ; Mon, 1 Dec 2025 09:03:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764579824; cv=none; b=iBCQJQQMVJDRxU/3UaXZkQckV1f4vAiiQKq/9kpYq4rq4JZfeZDZaV+xbGM6laUkLyDdeaVjGgST9qf1hu7t4IdLmQ115FhNtIDPUQpG4XlHLHmoBlCjUHs6Q4oAPT+JtA/ulcNc8T+G4sEJ7wdzoIqHB4z2Q4slt5bL4Yt2fAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764579824; c=relaxed/simple; bh=OENUUPVsybzTfsmwczvXbu6dAmQzUDri4hyNFGmPrF4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=OEQmt/+//r8pZyaY1bc5cPuZoxUwQsZT3sh08srjyEsBi17F7tYoh3F2eNPNDoD8KJ5vX3HGQnmpxtfpfavotv3MNjdvBZIih+wmwYL020MV4b9lkKbPuBPqpLqFZUc08PSD9rYrh/0s3yWg51xiF8yH4uQ88I1HmlXLCmga68E= 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=cNSHxVaB; arc=none smtp.client-ip=209.85.221.51 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="cNSHxVaB" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-42e2e77f519so859250f8f.2 for ; Mon, 01 Dec 2025 01:03:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764579821; x=1765184621; 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=N8ah7K9QBZgVHJunjh/RbCQgoXUT9r/YcIZqeujeIYI=; b=cNSHxVaBlQNXG7PlbsWVcCW6swfsGSmRBXsAKzxJAsmzaUfQ8dTn0gdsYzirRGz/Sd l9yjkmLvejsy56FFT7mS4vePx9zRvQ6OmX2mG9v+sw+CoDSU10HFa5o333M8CLWIDWrq x7RZqWTTolBKvsCWdcUyUsA024xoUXaSnefQSP8D3NRQMo861krQmWDmts2u136hqzjq x+jhUG5xChZJbuYEIg5IYrgwCZv9P3XAebvLBrrIgTOeEvqb0HZBqERrKWri3ihVfyeL 1UFDSkca4NFWuki1hI+Leh62n6VAqQAwmHtjVsEpWQs5ERJZhxCG6j/vF28+3k9Y62bZ oWlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764579821; x=1765184621; 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=N8ah7K9QBZgVHJunjh/RbCQgoXUT9r/YcIZqeujeIYI=; b=Z2sQIqFKO0aPVEHrBky2ah9nRVcu3vyW+7c1bdz4sfFBi0A3kUfwjpQZEafZ124txN hYsOIZaFdRlbjEdlRzij6tpJyFBftECdQKrGA9LNb7pqd4dD/iAUQHk66VWzgUiF2V4S lTys/L/sfcoGj8Iy58+RWAa8X2C4E050129sXKpFVQQ6/XvZs0d/ttNcMsrMqv0rMVB2 8KbrnjAJ65FHWj+fLtjNMggITaVB86mck8d0+tKiSaFW+66p1j2Xjtnjhl3lcmeV/yVS 7shsdiBECp6tmo7Vl8rz1YY22dfk17eJRo7G7R9+i2G4+KOZ4hI22ouyEzTL9D5JK2gJ EUCA== X-Forwarded-Encrypted: i=1; AJvYcCWxjq5fq8Gryc4e59LK+HxkjETkXxA7iEU9khXGhMwwVoSoxh2os2YzsAm8tdjJ2PMJhyJa3jSisRl6d0Y=@vger.kernel.org X-Gm-Message-State: AOJu0YwXeiVL6AdOs1KMFAZPqo86CZKgJknpP9gymxsVjxsHs7nX94j7 jGE7+ArF7+f0Fl0ZssZy2nH2VJr0RbujYCw/vDcl/TpJ4Jz6Zi7Twilw X-Gm-Gg: ASbGncuM7rWSzJT5YA+TXlSD6jl7aJzoDMsNF1DehofqPdZ5NP6xv7NjNyC6yqrGyys vQ4T5hE/l1jRfmZxXzcsBn54iMe+Hg5pGEel9haucJJ4PotUFg6f/Du0dAOa7xjbXjP7CQQkbBm 9DQzmUKWElktmBd+PBkTNOSqarkf3WkFV0FrgkKND14EPGU8BzRa/+V22G49gi8bZSuYglsVqhw aUlo2HKW35tfgcKvBKmc462D4v3FN1pIYtW5MJy+S61vkwkf8cJaPWO0UpOOgq0q9Ed0F5nPnPJ HL0x+DOSYiUPDqNMupKvC7heeUQaMPhBIt8ncYXeKRr4JHDwbpi+VckUApTjEcO9vjtVeBAxpxe qDBkO1pE7nP/7Wg+po/o5h4EEWWTgTDaGu9c3zh6T1S1x5APS5eH5Y/cUXeX4jqjF8r18HmCaWv XqjkGhbpT1wswI+y0= X-Google-Smtp-Source: AGHT+IEcydTcIwCjbQRB0nGuzNXPZzp8lCn4+RYJcX/cAtCDjD/66keOoi6DpdWSWTOQpt+wcZtEcg== X-Received: by 2002:a05:6000:186a:b0:429:ee71:2ff0 with SMTP id ffacd0b85a97d-42e0f362435mr27273212f8f.53.1764579820669; Mon, 01 Dec 2025 01:03:40 -0800 (PST) Received: from toolbox.. ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42e1c5d607csm25334499f8f.15.2025.12.01.01.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 01:03:40 -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] wifi: mt7601u: check multiple firmware paths Date: Mon, 1 Dec 2025 09:03:36 +0000 Message-Id: <20251201090336.1157193-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 the root folder to the mediatek sub-folder some time ago, but not all distros create symlinks to the old location the driver checks. Update the driver to check for firmware in both old and new locations. With firmware in /usr/lib/firmware/mediatek/mt7601u.bin): kernel: mt7601u 1-1.3:1.0: ASIC revision: 76010001 MAC revision: 76010500 kernel: mt7601u 1-1.3:1.0: Direct firmware load for mt7601u.bin failed with= error -2 kernel: mt7601u 1-1.3:1.0: probe with driver mt7601u failed with error -2 And with the patch: kernel: mt7601u 1-1.3:1.0: ASIC revision: 76010001 MAC revision: 76010500 kernel: mt7601u 1-1.3:1.0: Firmware Version: 0.1.00 Build: 7640 Build time:= 201302052146 kernel: mt7601u 1-1.3:1.0: EEPROM ver:0c fae:00 Signed-off-by: Christian Hewitt --- The firmware was moved in [0]. Changes were requested to a previous patch [1] but I wasn't able to find a follow-up submission from the original author. So here's my novice attempt at the improvement. [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/ drivers/net/wireless/mediatek/mt7601u/mcu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt7601u/mcu.c b/drivers/net/wire= less/mediatek/mt7601u/mcu.c index 1b5cc271a9e1..c771bbf7952c 100644 --- a/drivers/net/wireless/mediatek/mt7601u/mcu.c +++ b/drivers/net/wireless/mediatek/mt7601u/mcu.c @@ -409,6 +409,11 @@ static int mt7601u_load_firmware(struct mt7601u_dev *d= ev) const struct mt76_fw_header *hdr; int len, ret; u32 val; + const char *fw_paths[] =3D { + "mediatek/" MT7601U_FIRMWARE, + MT7601U_FIRMWARE, + }; + 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 +421,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 < ARRAY_SIZE(fw_paths); i++) { + ret =3D request_firmware(&fw, fw_paths[i], dev->dev); + if (ret =3D=3D 0) + break; + } + if (ret) return ret; =20 --=20 2.34.1