kernel-5.13.3-300

* Mon Jul 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.3-300]
- kernel-5.13.3-0 (Justin M. Forbes)
- Don't tag a release as [redhat] (Justin M. Forbes)
- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

4 files changed, 31 insertions, 14 deletions

diff --git a/Patchlist.changelog b/Patchlist.changelog
index dc33eaf5e..5e75d84ab 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/93766a4c0701e9f633071beb75237e11413dcebd
+ 93766a4c0701e9f633071beb75237e11413dcebd platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd()
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/21449ddd0db578d5dbf6eebe54e61e8f34254852
  21449ddd0db578d5dbf6eebe54e61e8f34254852 platform/x86: amd-pmc: Use return code on suspend
 
diff --git a/kernel.spec b/kernel.spec
index 2d8a3e8f1..bcf597096 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -116,7 +116,7 @@ Summary: The Linux kernel
 # The kernel tarball/base version
 %define kversion 5.13
 
-%define rpmversion 5.13.2
+%define rpmversion 5.13.3
 %define stableversion 5.13
 %define pkgrelease 300
 
@@ -646,7 +646,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13.2.tar.xz
+Source0: linux-5.13.3.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1315,8 +1315,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.13.2 -c
-mv linux-5.13.2 linux-%{KVERREL}
+%setup -q -n kernel-5.13.3 -c
+mv linux-5.13.3 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2886,6 +2886,15 @@ fi
 #
 #
 %changelog
+* Mon Jul 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.3-300]
+- kernel-5.13.3-0 (Justin M. Forbes)
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang)
+
+* Mon Jul 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.3-0]
+- Don't tag a release as [redhat] (Justin M. Forbes)
+- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang)
+
 * Wed Jul 14 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.2-0]
 - platform/x86: amd-pmc: Use return code on suspend (Mario Limonciello)
 - ACPI: PM: Only mark EC GPE for wakeup on Intel systems (Mario Limonciello)
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch
index 689f7d4a3..490090ebd 100644
--- a/patch-5.13-redhat.patch
+++ b/patch-5.13-redhat.patch
@@ -30,7 +30,7 @@
  drivers/nvme/host/pci.c                            |  28 +-
  drivers/pci/controller/pcie-rockchip-host.c        |  12 +-
  drivers/pci/quirks.c                               |  24 +
- drivers/platform/x86/amd-pmc.c                     | 246 +++++++++-
+ drivers/platform/x86/amd-pmc.c                     | 248 +++++++++-
  drivers/scsi/smartpqi/smartpqi_init.c              |  16 +
  drivers/usb/core/hub.c                             |   7 +
  include/linux/acpi.h                               |   5 +
@@ -66,7 +66,7 @@
  tools/testing/selftests/bpf/progs/linked_vars2.c   |  55 ---
  .../selftests/bpf/progs/test_static_linked1.c      |  30 --
  .../selftests/bpf/progs/test_static_linked2.c      |  31 --
- 68 files changed, 914 insertions(+), 2359 deletions(-)
+ 68 files changed, 915 insertions(+), 2360 deletions(-)
 
 diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
 index 75a9dd98e76e..3ff3291551f9 100644
@@ -91,7 +91,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
 
  Boot into System Kernel
 diff --git a/Makefile b/Makefile
-index 31bbcc525535..b69dd0967af7 100644
+index 83f4212e004f..91790cbefd7c 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -503,6 +503,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
@@ -1489,10 +1489,10 @@ index f1d08a1b1591..78d04ac29cd5 100644
  	if (err < 0)
  		goto err_remove_irq_domain;
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 22b2bb1109c9..2131ee5ab7fd 100644
+index 6d74386eadc2..2333c1e4ae05 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -4219,6 +4219,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4230,6 +4230,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
  				quirk_bridge_cavm_thrx2_pcie_root);
 
@@ -1524,7 +1524,7 @@ index 22b2bb1109c9..2131ee5ab7fd 100644
   * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
   * class code.  Fix it.
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index b9da58ee9b1e..680f94c7e075 100644
+index b9da58ee9b1e..663a4ca0580d 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
 @@ -46,34 +46,79 @@
@@ -1731,7 +1731,7 @@ index b9da58ee9b1e..680f94c7e075 100644
  static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
  {
  	u32 value;
-@@ -132,15 +263,15 @@ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
+@@ -132,19 +263,19 @@ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
  	dev_dbg(dev->dev, "AMD_PMC_REGISTER_MESSAGE:%x\n", value);
  }
 
@@ -1750,6 +1750,11 @@ index b9da58ee9b1e..680f94c7e075 100644
  				PMC_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
  	if (rc) {
  		dev_err(dev->dev, "failed to talk to SMU\n");
+-		return rc;
++		goto out_unlock;
+ 	}
+
+ 	/* Write zero to response register */
 @@ -154,34 +285,91 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
  	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_ARGUMENT, set);
 
diff --git a/sources b/sources
index 02cf35842..37d1355e9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13.2.tar.xz) = 48abf1f4a1f92c36931046111deb3689f651c15b59c2b398561b2aa44d61288e70b61173f7e4abf122d6890c631e0d4459a4880e1711c36e39b335d68b1a4cb0
-SHA512 (kernel-abi-whitelists-5.13.2-300.tar.bz2) = f528c4359e7ef27f9f9275a2643c411024e42be6973b3b9a0c2e66e7d08417f50213fcdd65e3f66207792f8d15bfdf5696771980c34f469ce0ee8a6c6ed18228
-SHA512 (kernel-kabi-dw-5.13.2-300.tar.bz2) = 6c065c0a0ab30f76fedeef16f89ee83945f4a9b31767048d4f8f7198466cde96e1a4b524f6105d749f9080821792d4070bec110a00224a10dd2ee96a11f02809
+SHA512 (linux-5.13.3.tar.xz) = 26e00d0689f26db2f8810cccc3d3975975695c7c9adef0dc67bdec1733b52c3f8b32bbccdaf2f0762c7ac072bf8c5272606fc0ce830df014f445ebb20583e95d
+SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
+SHA512 (kernel-kabi-dw-5.13.3-300.tar.bz2) = a5d60a2b2db7f08ab1e476658d1001073a112fbecec6bd1434c059caccd4bfd2a31228644f25928323c91281f69bb483821568dcee9ac45b7366a2bd27dc24c7