From patchwork Fri Oct 6 10:19:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Costas Rodriguez X-Patchwork-Id: 1844348 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=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (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 4S24Dv5PWdz1yq9 for ; Fri, 6 Oct 2023 21:20:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qohwD-0004r7-J8; Fri, 06 Oct 2023 10:20:06 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qohw7-0004pz-L8 for kernel-team@lists.ubuntu.com; Fri, 06 Oct 2023 10:19:59 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (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 048CF3F12F for ; Fri, 6 Oct 2023 10:19:58 +0000 (UTC) Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4067f186094so12540465e9.1 for ; Fri, 06 Oct 2023 03:19:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696587597; x=1697192397; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O0dYJrVyJ9VVfEdWCtCyeHgZPSzSkTvHRS6bdPnyjeQ=; b=WlE4fISTcJgVrCZjBSMHN/LP3t6t7XYzKU9mT3zkCdkKRbMXOIH5M3/3WJfYnXZjb/ kuQQk5899yhVubDciAxwqptQx9hOaGOOrTbBECtMuvaoe9fn/IY5ATGDnzajUzZO65aB YkeDqMdBkE5a0gyyCjA3oRmFzOA1vwe4/QHJ8IxeLy/VZu4BQMwHhLUiokL+lJpTq8mP GNDWvP2kCrrH/zInQgV8DPJnDMMKA6KdB3DHqOFNFdWAhdpiggYEYOgT/eSZFbMmp9TN pOFRtiK5/a+e6NO6KP7eny2rLb5NCIC9gER6E5ZELFHtqwNT5oqGyKDkaIfUOQrvZDJO DP2w== X-Gm-Message-State: AOJu0YwbDP1pH9WPlR/Nsj2ClKTWc911m3nXDrl36oO6Z903TgGRJYLY KqBumPnS1vGMK7Im6dhQkx4ecSH9pEvQKNdRjW7n1pmFXBOKaYe/S/ELtl1kbIDVZYV3cob4J/M Xrea2bARbrdTF/m9K7IQuT0GBgbfdLU/Hk7o6zAxLN9pIKO5zZg== X-Received: by 2002:a7b:cd8c:0:b0:401:bcd9:4871 with SMTP id y12-20020a7bcd8c000000b00401bcd94871mr7362856wmj.21.1696587597523; Fri, 06 Oct 2023 03:19:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2pLeP31zbfEzajOXBROpxpwivRqOPvlGUusktQsPiEIIFnVp+osuIGT7px96KT1kLeu6c+A== X-Received: by 2002:a7b:cd8c:0:b0:401:bcd9:4871 with SMTP id y12-20020a7bcd8c000000b00401bcd94871mr7362839wmj.21.1696587597098; Fri, 06 Oct 2023 03:19:57 -0700 (PDT) Received: from localhost (124.128.117.91.dynamic.reverse-mundo-r.com. [91.117.128.124]) by smtp.gmail.com with ESMTPSA id c11-20020a7bc84b000000b0040648217f4fsm5662939wml.39.2023.10.06.03.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 03:19:56 -0700 (PDT) From: Sergio Costas Rodriguez To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] [kernel-snaps-uc22/main] Add missing Atheros firmware files Date: Fri, 6 Oct 2023 12:19:47 +0200 Message-Id: <20231006101947.27018-1-sergio.costas@canonical.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <50941c99-1c70-43c5-a59a-cee3da0b41ce@canonical.com> References: <50941c99-1c70-43c5-a59a-cee3da0b41ce@canonical.com> 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2025054 When using the Ubuntu Core 22 kernel in an Asus Zenbook UX22, this error is shown in journalctl: usb 1-1-1: Direct firmware load for ar3k/AthrBT_0x01020200.dfu failed with error -2 Bluetooth: Patch file not found ar3k/AthrBT_0x01020200.dfu Bluetooth: Loading patch file failed ath3k: probe of 1-1.1:1.0 failed with error -2 and, of course, bluetooth doesn't work. This patch adds the missing files, and makes bluetooth work. Signed-off-by: Sergio Costas Rodriguez Acked-by: Juerg Haefliger Acked-by: Portia Stephens --- trim-firmware | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/trim-firmware b/trim-firmware index 148c964..5e5e865 100755 --- a/trim-firmware +++ b/trim-firmware @@ -68,6 +68,18 @@ if [ -e "${DESTDIR}"/firmware/regulatory.db ] ; then cp "${DESTDIR}"/firmware/regulatory.* "${DESTDIR}"/firmware.new fi +# Copy extra AthrBT files, because they are needed for some devices +# like the original Asus Zenbook; but do it only if the module ath3k.ko +# is compiled. The file ath3k-1.fw is already being copied, so +# it doesn't need to be managed here. +if [ -n "$(find "${DESTDIR}"/modules -name 'ath3k.ko*')" ] ; then + mkdir -p "${DESTDIR}"/firmware.new/ar3k + cp -a "${DESTDIR}"/firmware/ar3k/AthrBT_0x*.dfu "${DESTDIR}"/firmware.new/ar3k/ + # the "ramps_" files are also refered in the source code of the driver, so + # we must add them too. + cp -a "${DESTDIR}"/firmware/ar3k/ramps_0x*.dfu "${DESTDIR}"/firmware.new/ar3k/ +fi + # Move kernel firmware files to the new firmware directory for d in "${DESTDIR}"/modules/* ; do if [ -d "${DESTDIR}"/firmware/"${d##*/}" ] ; then