From patchwork Mon Dec 12 13:45:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1715005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=X6hxVLkE; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NW2vC72Dhz23np for ; Tue, 13 Dec 2022 00:45:27 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p4j7O-0004JT-3B; Mon, 12 Dec 2022 13:45:18 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p4j7L-0004JD-Vq for kernel-team@lists.ubuntu.com; Mon, 12 Dec 2022 13:45:15 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 81D31418C5 for ; Mon, 12 Dec 2022 13:45:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670852715; bh=qDaI3ryTjw0k+J/YdA8t634D9yNkhqILNXZiVr2Fs24=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=X6hxVLkEOyXYcbdilLln2ijOb6mAYZ5b7frDJlmthjXFT7BpTcRsio4N6A0DJi9rP GrOVmqdRZhfmfQY1QJRK6SpZ4gXxPKnplX1iXFkt+kNkORV1zHoOC8gMte3JhPvfsc nK68G9Z67q5niAZF7uMYrvjekjCsrNJgcxn7FsrlZPhQAXk2iSgVy/JvjNnXivIYtc CmIR4Hp/JJwPuX817vvvL173vv5r2B236/TYFbVaauB1QR9efCtBiXFoH14k+gCCAU EqE9BC8Hc3GgBHCmcyHzciLHQt3lw4Kqg7zHx+unYtkHXj27kLVH1X5N4tyW5ZVzxO wR2HIV4R75LiQ== Received: by mail-wm1-f69.google.com with SMTP id p14-20020a05600c204e00b003cf4cce4da5so2036084wmg.0 for ; Mon, 12 Dec 2022 05:45:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qDaI3ryTjw0k+J/YdA8t634D9yNkhqILNXZiVr2Fs24=; b=zEtXoJgxm8Yksslm/SAtsUzQJnHcfAGcCwKESSr1nBwN36+UcZf/Zg36A063JAw3q8 j9F7f9uSHW6FogvhciOOHrFulG3CnRQG+mQPTsv4h/A9a39jQ476vOlrz2oneLxsgLKW Rt3AsngxabHpeT+QQvPhy2LPnRns1NcNVJe59jI2vxQ9TuhOnvT0b6gMhHmXZrxCDG2T fmQJ6m6SwJPXok/Gn92RzcEtp+2O9gz7ja/Efk1xdr6/R8dffLSLWR6mzNRx6sCFDeES GqZsPZJhvkZOh1uCBzxCpAeuHgOzXxEgXN4Kfre8cGAJ6U/bNZq6lCsE+vSYcQWT77pH XF2A== X-Gm-Message-State: ANoB5pkIAJmrtgOLk0xn4K3ZWzBxsIWeR3oOxlOJEjMXVqNKIFgCHqKJ 8/ZhMzPgnh8pjvR8qqLaVprw3c2FyHhzZ0GYvE+VxUndNf7q85xz5k38Kr4JnDyt+u8Dre1fuNw yBBSErqscrw84N5Y9E43MbIS5Jb0STsBZBPgAssZJXQ== X-Received: by 2002:adf:ef42:0:b0:242:647d:9c57 with SMTP id c2-20020adfef42000000b00242647d9c57mr10143631wrp.36.1670852714668; Mon, 12 Dec 2022 05:45:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf5sTyotuykvOp24q/EOk7iS39tPTD7eZNMcWYJDrzgiIUgMBozOI4Dj0tTdWj9obtkj3AjkfA== X-Received: by 2002:adf:ef42:0:b0:242:647d:9c57 with SMTP id c2-20020adfef42000000b00242647d9c57mr10143620wrp.36.1670852714377; Mon, 12 Dec 2022 05:45:14 -0800 (PST) Received: from localhost ([2a01:4b00:85fd:d700:6218:95ff:fe01:453b]) by smtp.gmail.com with ESMTPSA id q4-20020a5d61c4000000b00241cbb7f15csm8714237wrv.106.2022.12.12.05.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 05:45:14 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [kernel-snaps-uc22/main][PATCH] trim-firmware: support multi-API versioned iwlwifi ucode Date: Mon, 12 Dec 2022 13:45:09 +0000 Message-Id: <20221212134509.1001528-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: juergh@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1998841 Add support for multi-API versioned iwlwifi ucode files. If a direct file is missing, check if a lower API version is available for use. Currently in jammy this results in three ucodes being picked up of a lower version number: + /root/parts/kernel/src/trim-firmware /root/parts/kernel/install/lib Overriding iwlwifi-so-a0-gf-a0-66.ucode with iwlwifi-so-a0-gf-a0-64.ucode Overriding iwlwifi-so-a0-hr-b0-66.ucode with iwlwifi-so-a0-hr-b0-64.ucode Overriding iwlwifi-so-a0-jf-b0-66.ucode with iwlwifi-so-a0-jf-b0-64.ucode Separately need investigation if v66 ucode should be SRUed into jammy. Signed-off-by: Dimitri John Ledkov --- trim-firmware | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/trim-firmware b/trim-firmware index 6d0b5829b6..c590aa2114 100755 --- a/trim-firmware +++ b/trim-firmware @@ -23,6 +23,25 @@ DESTDIR=${1} # Copy required firmware files to a new directory while IFS= read -r fw_file ; do + + # Most iwlwifi firwmare files are versioned, and lower + # versions are often required, when max version is not shipped + # by linux-firmware package + case $fw_file in iwlwifi-*.ucode) + if ! [ -e "${DESTDIR}"/firmware/${fw_file} ]; then + max_api=$(echo $fw_file | sed -n 's/iwlwifi-.*-\([0-9]*\).ucode/\1/p') + for api in `seq $max_api -1 39`; do + api_fw_file=${fw_file/%$max_api.ucode/$api.ucode} + if [ -e "${DESTDIR}"/firmware/$api_fw_file ]; then + echo Overriding $fw_file with $api_fw_file + fw_file=$api_fw_file + break; + fi + done + fi + ;; + esac + for src_file in "${DESTDIR}"/firmware/${fw_file} ; do if ! [ -e "${src_file}" ] ; then continue # Skip non-existing source files