From patchwork Tue Mar 24 23:55:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sultan Alsawaf X-Patchwork-Id: 1261073 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48n7Ry45pnz9sRN; Wed, 25 Mar 2020 10:55:58 +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 1jGtOj-0005vN-Cq; Tue, 24 Mar 2020 23:55:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jGtOf-0005vH-W6 for kernel-team@lists.ubuntu.com; Tue, 24 Mar 2020 23:55:50 +0000 Received: from mail-pj1-f71.google.com ([209.85.216.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jGtOf-0008G0-I2 for kernel-team@lists.ubuntu.com; Tue, 24 Mar 2020 23:55:49 +0000 Received: by mail-pj1-f71.google.com with SMTP id go23so181946pjb.2 for ; Tue, 24 Mar 2020 16:55:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SARQeb/I1YJNg38nQ8IS2v7eVDvW8qlTN0K1rd1YHak=; b=CmqvmQfWbNUwMtRlsxCDowldDXIer/vaTiBvJ1CH7TmeayGjTLauOXRYuTj/lV1bP2 tnfCcWkzIZ9G9mLFnuG6bzOXgdK4u6HdCCqspV3q50l0Elqg6tQMtmNZaCZ6RTyS7BHT iG2ymFqDxGZbNMv5QpPwHluFJ/haV970U18Eu330kqi19GY1u/vGob873mn93UcZ+2X1 QCdsdzc57QPa2Kw2rxiozon1NOLwwicCGewW8K0XH1g0wtR+rikehf1tvP3QeizBobI1 MG17EwlwBCzmG4f02Gq19t+ayygt0p1s2zPV25W9/R0YmG+OusghiOO7AjYXLGS8zXom n7ww== X-Gm-Message-State: ANhLgQ1u6G+ZK8rd+cAkKvMmxhVsD0gtAcdwE7KoiekioL2sracqpa9G 9kUuVkbHX9FltbEQCr4uWAC5p7ysHzEdItryRBFOk7GlV4BEyEGG8D73zCY0z/vcfhavfZIbpPb tLJa9utehzmyhKQKywrdZ39985jvbyATOLzPW6xJXnw== X-Received: by 2002:a63:7c54:: with SMTP id l20mr327846pgn.158.1585094147792; Tue, 24 Mar 2020 16:55:47 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvDpAV+f+2A1l/sj8ipoOsVcSMiS2Zut7jhG2woIbRn8MlzveDtsCQkh0oPf+bNYLNZuOe8fw== X-Received: by 2002:a63:7c54:: with SMTP id l20mr327827pgn.158.1585094147424; Tue, 24 Mar 2020 16:55:47 -0700 (PDT) Received: from sultan-box.conference ([104.200.129.62]) by smtp.gmail.com with ESMTPSA id q19sm6414741pgn.93.2020.03.24.16.55.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 16:55:46 -0700 (PDT) From: Sultan Alsawaf To: kernel-team@lists.ubuntu.com Subject: [PATCH v2] iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices Date: Tue, 24 Mar 2020 16:55:45 -0700 Message-Id: <20200324235545.20233-1-sultan.alsawaf@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200324232206.17531-1-sultan.alsawaf@canonical.com> References: <20200324232206.17531-1-sultan.alsawaf@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" From: Dan Moulding BugLink: https://bugs.launchpad.net/bugs/1868442 The logic for checking required NVM sections was recently fixed in commit b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 devices"). However, with that fixed the else is now taken for 3168 devices and within the else clause there is a mandatory check for the PHY_SKU section. This causes the parsing to fail for 3168 devices. The PHY_SKU section is really only mandatory for the IWL_NVM_EXT layout (the phy_sku parameter of iwl_parse_nvm_data is only used when the NVM type is IWL_NVM_EXT). So this changes the PHY_SKU section check so that it's only mandatory for IWL_NVM_EXT. Fixes: b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 devices") Signed-off-by: Dan Moulding Signed-off-by: Kalle Valo (cherry picked from commit a9149d243f259ad8f02b1e23dfe8ba06128f15e1) Signed-off-by: Sultan Alsawaf Acked-by: Kamal Mostafa Acked-by: Khalid Elmously --- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c index 70b29bf16bb9..60296a754af2 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c @@ -308,7 +308,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) } /* PHY_SKU section is mandatory in B0 */ - if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) { + if (mvm->trans->cfg->nvm_type == IWL_NVM_EXT && + !mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) { IWL_ERR(mvm, "Can't parse phy_sku in B0, empty sections\n"); return NULL;