Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1753622pxb; Fri, 25 Mar 2022 05:07:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZJlBFmNEzTySswY7XlcJ1FPYpIj5fyresmgmGQ22rv7A4mquIamyvT31NCH4sTKspktly X-Received: by 2002:a17:906:5804:b0:6ce:3f17:bf35 with SMTP id m4-20020a170906580400b006ce3f17bf35mr11087145ejq.346.1648210030938; Fri, 25 Mar 2022 05:07:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648210030; cv=none; d=google.com; s=arc-20160816; b=zPLEd/MG5QF3LGD1ecZeRID83yMvLsIVrerHne6SyQa+HM2nEBfwoUysqmdcrIcqKC W2CjE0vYtjsElSeyuLOeoGkyoWwzz5+7vDinH9eZ8BIZuL4vxdrLWf+/Q36z0U7GNkTE L6aG++ccaejL1o3K/6slpPS61kIDcsnCc90wLSBKBmdirKJVM4j0ZUt+SiYHMCuCGozL 7qg6E2IIHerDMqIWVHnwAI9ZRUGOEtsuuMYqmL+SZpe3B7JIcus0+rq5bIickUlwHIxH 9aoJwgEnuNwC+AA8kKLN76z8PKwM4yaMhhSJNfQ+MCun3+6qShywO5Ujk+E7XYfl8lyF 48SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:message-id:user-agent:cc:to:references :in-reply-to:from:subject:content-transfer-encoding:mime-version :dkim-signature; bh=gL7rDNnJPOfhTxth0ZOR0ofRge3IIi1drwL0M805c+c=; b=RXlWrAvQQ29/d1CfxtU4wBa+BHwKzb+/2sRsz0jL8E6Rbm8qpzrpaJqV1g9/X9vILZ 9N1eNgpJOxSj91mIDzXo2KAhLnLUTXSSGJtfioHaayFKZ5P5cv03555VgXldJ/93wCwy KhD4jR4JOETYeFYxm2iF8GJw3w+FrL+Zsokw4gcdY9+eh5KHUsrX5DhAesPIkBaWu06L TkLQq0GhWwmjdLtqqIlitAk6ur2z5KBJ3HlmmUtMxIgyTZl2BNZD4tcuTMPYp5nuXPxq Mel+Hgdh0U2cbNKWS1yr8AM2e5j5arKO2Zrq5PtMx7EUPkxGLOs/Z1F8o2v2U3AW9tjB wk7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VognrTve; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gs44-20020a1709072d2c00b006df76385bb8si2951152ejc.88.2022.03.25.05.06.47; Fri, 25 Mar 2022 05:07:10 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VognrTve; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358855AbiCYKcY (ORCPT + 70 others); Fri, 25 Mar 2022 06:32:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245022AbiCYKcX (ORCPT ); Fri, 25 Mar 2022 06:32:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F85DC55A6 for ; Fri, 25 Mar 2022 03:30:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E8120616B0 for ; Fri, 25 Mar 2022 10:30:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EDF9C340E9; Fri, 25 Mar 2022 10:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648204248; bh=PVgonzo3gljC0pTHEAcgzPWsoX3o+O4plCbGh/vkj9U=; h=Subject:From:In-Reply-To:References:To:Cc:Date:From; b=VognrTvedRAKooQ0EjhCd8WRt8/l9Hqq8uxPAA0h2DPVTP+nu/8tX7Q+yzxvcbAh6 kTj6y08WIhiHOZAFFxAOGoTNa6PwGl+90dzBHIR1U+IC8T2Eraj5g9XqmtWY7Xfe4B 0gVEpDsNRBT2anAREVtQtGblgDVpn7h4cER88vgz+8ridFVwBCemFaDK8XmPQs694T R2TAF8RW4soFqQv7DEwZJ94cv4Emv4xd3NFRdbhdnp0qLHHv52gI8GH+PlYCuYUxEL eKsUzNId6tTM2QBuXt8CtKI15VhO7E5keLfvViz211R1BftZhUVd47qZ8rRX3iTl2E xtyb5jS9iQsiQ== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin From: Kalle Valo In-Reply-To: <20220315104721.26649-2-quic_wgong@quicinc.com> References: <20220315104721.26649-2-quic_wgong@quicinc.com> To: Wen Gong Cc: , , User-Agent: pwcli/0.1.0-git (https://github.com/kvalo/pwcli/) Python/3.7.3 Message-ID: <164820424430.12637.18017387076752850202.kvalo@kernel.org> Date: Fri, 25 Mar 2022 10:30:47 +0000 (UTC) X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: X-Mailing-List: linux-wireless@vger.kernel.org Wen Gong wrote: > Sometimes it has a variant value which read from DT or SMBIOS by > ath11k, and meanwhile it does not have the matched board name in > board-2.bin, then it will failed at boot up phase. > > Add fallback board name which removed variant value and search again > in board-2.bin when failed with variant and try to load the board > data again to increase boot up success rate. > > dmesg log after this patch: > [169547.248472] ath11k_pci 0000:05:00.0: boot using board name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262,variant=test' > [169547.248565] ath11k_pci 0000:05:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 180324 > [169547.248568] ath11k_pci 0000:05:00.0: board name > [169547.248570] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248571] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248572] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248574] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248575] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248576] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo > [169547.248577] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 32 ard-id=262 > [169547.248578] ath11k_pci 0000:05:00.0: board name > [169547.248579] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248581] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248582] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248583] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248584] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248585] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo > [169547.248587] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 36 ard-id=266 > [169547.248588] ath11k_pci 0000:05:00.0: board name > [169547.248589] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248590] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248591] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248592] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248594] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248595] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 31 38 2c 71 6d 69 2d 62 chip-id=18,qmi-b > [169547.248596] ath11k_pci 0000:05:00.0: 00000060: 6f 61 72 64 2d 69 64 3d 32 36 36 oard-id=266 > [169547.248597] ath11k_pci 0000:05:00.0: failed to fetch board data for bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262,variant=test from ath11k/WCN6855/hw2.0/board-2.bin > [169547.248476] ath11k_pci 0000:05:00.0: boot using board name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' > [169547.248634] ath11k_pci 0000:05:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 180324 > [169547.248636] ath11k_pci 0000:05:00.0: board name > [169547.248637] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248638] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248639] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248641] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248642] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248643] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo > [169547.248645] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 32 ard-id=262 > [169547.248646] ath11k_pci 0000:05:00.0: boot found match for name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' > [169547.248647] ath11k_pci 0000:05:00.0: boot found board data for 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' > [169547.248649] ath11k_pci 0000:05:00.0: using board api 2 > > Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 > > Signed-off-by: Wen Gong > Signed-off-by: Kalle Valo 2 patches applied to ath-next branch of ath.git, thanks. 62abdc06c50e ath11k: add fallback board name without variant while searching board-2.bin 9d97114d2220 ath11k: add read variant from SMBIOS for download board data -- https://patchwork.kernel.org/project/linux-wireless/patch/20220315104721.26649-2-quic_wgong@quicinc.com/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches