merge origin

3 files changed, 102 insertions, 1 deletions

diff --git a/0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch b/0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch
new file mode 100644
index 000000000..e15ad5d75
--- /dev/null
+++ b/0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch
@@ -0,0 +1,38 @@
+From e68d6696575e1af3f92125e842f2853708f34589 Mon Sep 17 00:00:00 2001
+From: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
+Date: Fri, 20 Dec 2019 11:10:36 -0600
+Subject: [PATCH resend] ASoC: SOF: Intel: hda: Add iDisp4 DAI
+
+TGL supports more than three iDisp DAI's.
+Add support for iDisp4 CPU DAI.
+
+Without this patch, we saw the below error on our TGL DUT:
+   sof_rt5682 tgl_max98357a_rt5682: ASoC: CPU DAI iDisp4 Pin not registered
+
+Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
+Signed-off-by: Jairaj Arava <jairaj.arava@intel.com>
+Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Link: https://lore.kernel.org/r/20191220171037.10689-2-pierre-louis.bossart@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+---
+ sound/soc/sof/intel/hda-dai.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c
+index 2d9ac0035bd2..638812a41328 100644
+--- a/sound/soc/sof/intel/hda-dai.c
++++ b/sound/soc/sof/intel/hda-dai.c
+@@ -440,6 +440,10 @@ struct snd_soc_dai_driver skl_dai[] = {
+ 	.name = "iDisp3 Pin",
+ 	.ops = &hda_link_dai_ops,
+ },
++{
++	.name = "iDisp4 Pin",
++	.ops = &hda_link_dai_ops,
++},
+ {
+ 	.name = "Analog CPU DAI",
+ 	.ops = &hda_link_dai_ops,
+-- 
+2.25.1
+
diff --git a/kernel.spec b/kernel.spec
index a67a65a98..4e499f334 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 250
+%global baserelease 201
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -889,6 +889,12 @@ Patch508: 0001-drm-i915-Serialise-i915_active_acquire-with-__active.patch
 # Backport vboxsf from 5.6, can be dropped when we move to 5.6
 Patch510: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.patch
 
+# rhbz 1800335
+Patch511: v2_20200128_dmoulding_me_com.patch
+
+# Fix 5.5.6 sof_hda regression (rhbz#1772498)
+Patch512: 0001-ASoC-SOF-Intel-hda-Add-iDisp4-DAI.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2921,6 +2927,12 @@ fi
 #
 #
 %changelog
+* Thu Feb 27 2020 Hans de Goede <hdegoede@redhat.com>
+- Fix 5.5.6 sof_hda regression (rhbz 1772498)
+
+* Mon Feb 24 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.6-201
+- Fix for some iwlwifi users (rhbz 1800335)
+
 * Mon Feb 24 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.6-200
 - Linux v5.5.6
 
diff --git a/v2_20200128_dmoulding_me_com.patch b/v2_20200128_dmoulding_me_com.patch
new file mode 100644
index 000000000..2cb28be39
--- /dev/null
+++ b/v2_20200128_dmoulding_me_com.patch
@@ -0,0 +1,51 @@
+From MAILER-DAEMON Mon Feb 24 19:54:49 2020
+From: Dan Moulding <dmoulding@me.com>
+To: linux-wireless@vger.kernel.org
+Cc: johannes.berg@intel.com, emmanuel.grumbach@intel.com, luciano.coelho@intel.com, linuxwifi@intel.com, Dan Moulding <dmoulding@me.com>
+Subject: [PATCH v2 5.5] iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
+Date: Tue, 28 Jan 2020 02:31:07 -0700
+Message-Id: <20200128093107.9740-1-dmoulding@me.com>
+Sender: linux-wireless-owner@vger.kernel.org
+List-ID: <linux-wireless.vger.kernel.org>
+X-Mailing-List: linux-wireless@vger.kernel.org
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+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 <dmoulding@me.com>
+---
+v2: Fixed incorrect commit title in commit references in the commit message
+
+ 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 46128a2a9c6e..e98ce380c7b9 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;
+-- 
+2.24.1
+
+