Received: by 10.223.185.116 with SMTP id b49csp7242893wrg; Thu, 1 Mar 2018 02:13:35 -0800 (PST) X-Google-Smtp-Source: AG47ELuw+tnx/wOrUA4z5/rZeiTWil3aASjTQL2zB9OP7fyJstx/L0vDz4LyI1vfBybKHslHx46+ X-Received: by 2002:a17:902:b605:: with SMTP id b5-v6mr1455914pls.354.1519899215451; Thu, 01 Mar 2018 02:13:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519899215; cv=none; d=google.com; s=arc-20160816; b=XlT3uQb3rRcjWA0XBb6cDSSN2RcxUMwfiuk4VN4k/s29HOfTsmgCJZttOCNwQ/zz+f UF7pMZU6fB4uU65G9djlsAzXyYOgvTHnfCNEexurSx3msobGlKmVJrkP4ls5YtQEDkpo 7TZinV7qu5RAt3JBWiAdobIIWOr6JqvNqKEkwtCksiltEtRN4PhEMqaujFgccEai1Dby LxYUIFTQpUUUXKL8hPkZTHFCGokeD2xHzWO+4zUc1ZMCm62r52r6Iw0eO1zv4cnDgqe+ nWL8C56hH+cZf46Cv6rHnt4XpB0AdxCQZ5gng5e1d6zCrYpiaEWMBk/An98aOj3nRso9 +Mnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:dmarc-filter :dkim-signature:dkim-signature:arc-authentication-results; bh=uDC/YRml3PsUlboRUtcim+etIBh4KhTTJD6DAycUY/w=; b=bh/wkjwNVfRM74kipSOjNDgr1rEhXopCDoPzoIk8XHD+Qo0Sc9tdjq8M8M6VCtkLZ3 ML8dnaeL8CtFEjZgqkiivM5QLFRNZxoeLdffg4BbQcI80kM1/QbTMiVHxXhFCfwK3THK Vsqfa6/iIJpJD2Xc0bFDoxzSe72QC0TEZMbjmzAj5gDv//5ZTgQunrVoKI/hV5jMa5C+ /reEO5MrKJQHysr5dEOiuk3uMSwpRDic7/Vf4ZT0IaFN2OuNjvevq0uD557qxFkrvwyU aZBXiHf0uCcJLhr/kFTOPugOL6BXP5lvHJ0NevwS37S4aTFYzPl5CcbT91tFWKjnzh/J 7Uug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=EIrUZibr; dkim=pass header.i=@codeaurora.org header.s=default header.b=lZj29WMj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e16si2776707pfd.6.2018.03.01.02.13.20; Thu, 01 Mar 2018 02:13:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=EIrUZibr; dkim=pass header.i=@codeaurora.org header.s=default header.b=lZj29WMj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967517AbeCAKLi (ORCPT + 99 others); Thu, 1 Mar 2018 05:11:38 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:37380 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967338AbeCAKLa (ORCPT ); Thu, 1 Mar 2018 05:11:30 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D172160F6B; Thu, 1 Mar 2018 10:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519899089; bh=8w782FYVVOdrCwR3BN79X0s9o9rQ4NFG9mPTvfHiIQk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=EIrUZibrxhkrIIXK9JbDHz/PIq7k6pu28uk9B46D+hv4x7ceL/BsltPhlODNTDfrh VVO4bacRUJjopJaru0a/hUfX+S8FdB82LRz2jvLvzyGCsiqV02vo/AHIB53f0a7+1e hkiF0X2tms+4qzjZp4hqQvB9AX2G9URBQ2Nted+o= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from potku.adurom.net (88-114-240-52.elisa-laajakaista.fi [88.114.240.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kvalo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 3730E607E5; Thu, 1 Mar 2018 10:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519899088; bh=8w782FYVVOdrCwR3BN79X0s9o9rQ4NFG9mPTvfHiIQk=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=lZj29WMjCJCydZBQgIUxEAvOC8m4gW91a66lNkVAlQuQqR4z8moXAjgMrkTnYQDRI 41OokWOYG5OahUQbB+MrK9wv+vAF0QX2g7IWxrwe8GVQR6USiRTHDtpNQ3LFHWhmAe r3o4AG1lzocZr2lIjNvcfcoX4TmjqXW+wODUkVkU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3730E607E5 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kvalo@codeaurora.org From: Kalle Valo To: Thomas Hebb Cc: ath10k@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ath10k: search all IEs for variant before falling back References: Date: Thu, 01 Mar 2018 12:11:24 +0200 In-Reply-To: (Thomas Hebb's message of "Wed, 21 Feb 2018 11:43:39 -0500") Message-ID: <87y3jcp0kz.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thomas Hebb writes: > commit f2593cb1b291 ("ath10k: Search SMBIOS for OEM board file > extension") added a feature to ath10k that allows Board Data File > (BDF) conflicts between multiple devices that use the same device IDs > but have different calibration requirements to be resolved by allowing > a "variant" string to be stored in SMBIOS [and later device tree, added > by commit d06f26c5c8a4 ("ath10k: search DT for qcom,ath10k-calibration- > variant")] that gets appended to the ID stored in board-2.bin. > > This original patch had a regression, however. Namely that devices with > a variant present in SMBIOS that didn't need custom BDFs could no longer > find the default BDF, which has no variant appended. The patch was > reverted and re-applied with a fix for this issue in commit 1657b8f84ed9 > ("search SMBIOS for OEM board file extension"). > > But the fix to fall back to a default BDF introduced another issue: the > driver currently parses IEs in board-2.bin one by one, and for each one > it first checks to see if it matches the ID with the variant appended. > If it doesn't, it checks to see if it matches the "fallback" ID with no > variant. If a matching BDF is found at any point during this search, the > search is terminated and that BDF is used. The issue is that it's very > possible (and is currently the case for board-2.bin files present in the > ath10k-firmware repository) for the default BDF to occur in an earlier > IE than the variant-specific BDF. In this case, the current code will > happily choose the default BDF even though a better-matching BDF is > present later in the file. > > This patch fixes the issue by first searching the entire file for the ID > with variant, and searching for the fallback ID only if that search > fails. It also includes some code cleanup in the area, as > ath10k_core_fetch_board_data_api_n() no longer does its own string > mangling to remove the variant from an ID, instead leaving that job to a > new flag passed to ath10k_core_create_board_name(). > > I've tested this patch on a QCA4019 and verified that the driver behaves > correctly for 1) both fallback and variant BDFs present, 2) only fallback > BDF present, and 3) no matching BDFs present. > > Fixes: 1657b8f84ed9 ("ath10k: search SMBIOS for OEM board file extension") > Signed-off-by: Thomas Hebb BTW, you forgot to CC linux-wireless so I don't see this in patchwork. https://wireless.wiki.kernel.org/en/users/drivers/ath10k/submittingpatches -- Kalle Valo