From: Greg Kroah-Hartman Date: Mon, 27 Nov 2017 13:04:07 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v3.18.85~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b47dd037fd0499ffbfecc0e023d70831d632f89;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: alsa-hda-add-raven-pci-id.patch pci-set-cavium-acs-capability-quirk-flags-to-assert-rr-cr-sv-uf.patch --- diff --git a/queue-4.9/alsa-hda-add-raven-pci-id.patch b/queue-4.9/alsa-hda-add-raven-pci-id.patch new file mode 100644 index 00000000000..fc88057f6a0 --- /dev/null +++ b/queue-4.9/alsa-hda-add-raven-pci-id.patch @@ -0,0 +1,31 @@ +From 9ceace3c9c18c67676e75141032a65a8e01f9a7a Mon Sep 17 00:00:00 2001 +From: Vijendar Mukunda +Date: Thu, 23 Nov 2017 20:07:00 +0530 +Subject: ALSA: hda: Add Raven PCI ID + +From: Vijendar Mukunda + +commit 9ceace3c9c18c67676e75141032a65a8e01f9a7a upstream. + +This commit adds PCI ID for Raven platform + +Signed-off-by: Vijendar Mukunda +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/hda_intel.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2305,6 +2305,9 @@ static const struct pci_device_id azx_id + /* AMD Hudson */ + { PCI_DEVICE(0x1022, 0x780d), + .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB }, ++ /* AMD Raven */ ++ { PCI_DEVICE(0x1022, 0x15e3), ++ .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_SB }, + /* ATI HDMI */ + { PCI_DEVICE(0x1002, 0x0002), + .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS }, diff --git a/queue-4.9/pci-set-cavium-acs-capability-quirk-flags-to-assert-rr-cr-sv-uf.patch b/queue-4.9/pci-set-cavium-acs-capability-quirk-flags-to-assert-rr-cr-sv-uf.patch new file mode 100644 index 00000000000..c8400b7ea66 --- /dev/null +++ b/queue-4.9/pci-set-cavium-acs-capability-quirk-flags-to-assert-rr-cr-sv-uf.patch @@ -0,0 +1,48 @@ +From 7f342678634f16795892677204366e835e450dda Mon Sep 17 00:00:00 2001 +From: Vadim Lomovtsev +Date: Tue, 17 Oct 2017 05:47:38 -0700 +Subject: PCI: Set Cavium ACS capability quirk flags to assert RR/CR/SV/UF + +From: Vadim Lomovtsev + +commit 7f342678634f16795892677204366e835e450dda upstream. + +The Cavium ThunderX (CN8XXX) family of PCIe Root Ports does not advertise +an ACS capability. However, the RTL internally implements similar +protection as if ACS had Request Redirection, Completion Redirection, +Source Validation, and Upstream Forwarding features enabled. + +Change Cavium ACS capabilities quirk flags accordingly. + +Fixes: b404bcfbf035 ("PCI: Add ACS quirk for all Cavium devices") +Signed-off-by: Vadim Lomovtsev +[bhelgaas: tidy changelog, comment, stable tag] +Signed-off-by: Bjorn Helgaas +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pci/quirks.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -4088,12 +4088,14 @@ static int pci_quirk_amd_sb_acs(struct p + static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags) + { + /* +- * Cavium devices matching this quirk do not perform peer-to-peer +- * with other functions, allowing masking out these bits as if they +- * were unimplemented in the ACS capability. ++ * Cavium root ports don't advertise an ACS capability. However, ++ * the RTL internally implements similar protection as if ACS had ++ * Request Redirection, Completion Redirection, Source Validation, ++ * and Upstream Forwarding features enabled. Assert that the ++ * hardware implements and enables equivalent ACS functionality for ++ * these flags. + */ +- acs_flags &= ~(PCI_ACS_SV | PCI_ACS_TB | PCI_ACS_RR | +- PCI_ACS_CR | PCI_ACS_UF | PCI_ACS_DT); ++ acs_flags &= ~(PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_SV | PCI_ACS_UF); + + return acs_flags ? 0 : 1; + } diff --git a/queue-4.9/series b/queue-4.9/series index 6debcbdddb3..4e9ef8e0d09 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -15,3 +15,5 @@ arm-8722-1-mm-make-strict_kernel_rwx-effective-for-lpae.patch arm-8721-1-mm-dump-check-hardware-ro-bit-for-lpae.patch mips-ralink-fix-mt7628-pinmux.patch mips-ralink-fix-typo-in-mt7628-pinmux-function.patch +pci-set-cavium-acs-capability-quirk-flags-to-assert-rr-cr-sv-uf.patch +alsa-hda-add-raven-pci-id.patch