From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1495828-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9F45B15802F
for <garchives@archives.gentoo.org>; Mon, 13 Mar 2023 11:30:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CFCF0E0769;
Mon, 13 Mar 2023 11:30:06 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id F1541E0769
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Mar 2023 11:30:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A6BEF335D55
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Mar 2023 11:30:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E02FD7F9
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Mar 2023 11:30:01 +0000 (UTC)
From: "Alice Ferrazzi" <alicef@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alice Ferrazzi" <alicef@gentoo.org>
Message-ID: <1678704310.3aab80d7924f05c8026412b65c7fe17c5e1117a8.alicef@gentoo>
Subject: [gentoo-commits] proj/linux-patches:6.2 commit in: /
X-VCS-Repository: proj/linux-patches
X-VCS-Files: 0000_README 1005_linux-6.2.6.patch
X-VCS-Directories: /
X-VCS-Committer: alicef
X-VCS-Committer-Name: Alice Ferrazzi
X-VCS-Revision: 3aab80d7924f05c8026412b65c7fe17c5e1117a8
X-VCS-Branch: 6.2
Date: Mon, 13 Mar 2023 11:30:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 440755e9-2393-487c-936e-ba1fce09045a
X-Archives-Hash: b26f5fc27f80256e1235a1c7100897e8
commit: 3aab80d7924f05c8026412b65c7fe17c5e1117a8
Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 10:45:10 2023 +0000
Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 10:45:10 2023 +0000
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=3aab80d7
Linux patch 6.2.6
Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org>
0000_README | 4 +
1005_linux-6.2.6.patch | 262 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 266 insertions(+)
diff --git a/0000_README b/0000_README
index 2cb9b328..d40230d0 100644
--- a/0000_README
+++ b/0000_README
@@ -63,6 +63,10 @@ Patch: 1004_linux-6.2.5.patch
From: https://www.kernel.org
Desc: Linux 6.2.5
+Patch: 1005_linux-6.2.6.patch
+From: https://www.kernel.org
+Desc: Linux 6.2.6
+
Patch: 1500_XATTR_USER_PREFIX.patch
From: https://bugs.gentoo.org/show_bug.cgi?id=470644
Desc: Support for namespace user.pax.* on tmpfs.
diff --git a/1005_linux-6.2.6.patch b/1005_linux-6.2.6.patch
new file mode 100644
index 00000000..38305711
--- /dev/null
+++ b/1005_linux-6.2.6.patch
@@ -0,0 +1,262 @@
+diff --git a/Makefile b/Makefile
+index 1a1d63f2a9edb..70e66e7716086 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ VERSION = 6
+ PATCHLEVEL = 2
+-SUBLEVEL = 5
++SUBLEVEL = 6
+ EXTRAVERSION =
+ NAME = Hurr durr I'ma ninja sloth
+
+diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
+index 741d8f3e8fb3a..c467eeae99733 100644
+--- a/drivers/char/tpm/tpm-chip.c
++++ b/drivers/char/tpm/tpm-chip.c
+@@ -512,6 +512,63 @@ static int tpm_add_legacy_sysfs(struct tpm_chip *chip)
+ return 0;
+ }
+
++/*
++ * Some AMD fTPM versions may cause stutter
++ * https://www.amd.com/en/support/kb/faq/pa-410
++ *
++ * Fixes are available in two series of fTPM firmware:
++ * 6.x.y.z series: 6.0.18.6 +
++ * 3.x.y.z series: 3.57.y.5 +
++ */
++static bool tpm_amd_is_rng_defective(struct tpm_chip *chip)
++{
++ u32 val1, val2;
++ u64 version;
++ int ret;
++
++ if (!(chip->flags & TPM_CHIP_FLAG_TPM2))
++ return false;
++
++ ret = tpm_request_locality(chip);
++ if (ret)
++ return false;
++
++ ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val1, NULL);
++ if (ret)
++ goto release;
++ if (val1 != 0x414D4400U /* AMD */) {
++ ret = -ENODEV;
++ goto release;
++ }
++ ret = tpm2_get_tpm_pt(chip, TPM2_PT_FIRMWARE_VERSION_1, &val1, NULL);
++ if (ret)
++ goto release;
++ ret = tpm2_get_tpm_pt(chip, TPM2_PT_FIRMWARE_VERSION_2, &val2, NULL);
++
++release:
++ tpm_relinquish_locality(chip);
++
++ if (ret)
++ return false;
++
++ version = ((u64)val1 << 32) | val2;
++ if ((version >> 48) == 6) {
++ if (version >= 0x0006000000180006ULL)
++ return false;
++ } else if ((version >> 48) == 3) {
++ if (version >= 0x0003005700000005ULL)
++ return false;
++ } else {
++ return false;
++ }
++
++ dev_warn(&chip->dev,
++ "AMD fTPM version 0x%llx causes system stutter; hwrng disabled\n",
++ version);
++
++ return true;
++}
++
+ static int tpm_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait)
+ {
+ struct tpm_chip *chip = container_of(rng, struct tpm_chip, hwrng);
+@@ -521,7 +578,8 @@ static int tpm_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait)
+
+ static int tpm_add_hwrng(struct tpm_chip *chip)
+ {
+- if (!IS_ENABLED(CONFIG_HW_RANDOM_TPM) || tpm_is_firmware_upgrade(chip))
++ if (!IS_ENABLED(CONFIG_HW_RANDOM_TPM) || tpm_is_firmware_upgrade(chip) ||
++ tpm_amd_is_rng_defective(chip))
+ return 0;
+
+ snprintf(chip->hwrng_name, sizeof(chip->hwrng_name),
+diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
+index 24ee4e1cc452a..830014a266090 100644
+--- a/drivers/char/tpm/tpm.h
++++ b/drivers/char/tpm/tpm.h
+@@ -150,6 +150,79 @@ enum tpm_sub_capabilities {
+ TPM_CAP_PROP_TIS_DURATION = 0x120,
+ };
+
++enum tpm2_pt_props {
++ TPM2_PT_NONE = 0x00000000,
++ TPM2_PT_GROUP = 0x00000100,
++ TPM2_PT_FIXED = TPM2_PT_GROUP * 1,
++ TPM2_PT_FAMILY_INDICATOR = TPM2_PT_FIXED + 0,
++ TPM2_PT_LEVEL = TPM2_PT_FIXED + 1,
++ TPM2_PT_REVISION = TPM2_PT_FIXED + 2,
++ TPM2_PT_DAY_OF_YEAR = TPM2_PT_FIXED + 3,
++ TPM2_PT_YEAR = TPM2_PT_FIXED + 4,
++ TPM2_PT_MANUFACTURER = TPM2_PT_FIXED + 5,
++ TPM2_PT_VENDOR_STRING_1 = TPM2_PT_FIXED + 6,
++ TPM2_PT_VENDOR_STRING_2 = TPM2_PT_FIXED + 7,
++ TPM2_PT_VENDOR_STRING_3 = TPM2_PT_FIXED + 8,
++ TPM2_PT_VENDOR_STRING_4 = TPM2_PT_FIXED + 9,
++ TPM2_PT_VENDOR_TPM_TYPE = TPM2_PT_FIXED + 10,
++ TPM2_PT_FIRMWARE_VERSION_1 = TPM2_PT_FIXED + 11,
++ TPM2_PT_FIRMWARE_VERSION_2 = TPM2_PT_FIXED + 12,
++ TPM2_PT_INPUT_BUFFER = TPM2_PT_FIXED + 13,
++ TPM2_PT_HR_TRANSIENT_MIN = TPM2_PT_FIXED + 14,
++ TPM2_PT_HR_PERSISTENT_MIN = TPM2_PT_FIXED + 15,
++ TPM2_PT_HR_LOADED_MIN = TPM2_PT_FIXED + 16,
++ TPM2_PT_ACTIVE_SESSIONS_MAX = TPM2_PT_FIXED + 17,
++ TPM2_PT_PCR_COUNT = TPM2_PT_FIXED + 18,
++ TPM2_PT_PCR_SELECT_MIN = TPM2_PT_FIXED + 19,
++ TPM2_PT_CONTEXT_GAP_MAX = TPM2_PT_FIXED + 20,
++ TPM2_PT_NV_COUNTERS_MAX = TPM2_PT_FIXED + 22,
++ TPM2_PT_NV_INDEX_MAX = TPM2_PT_FIXED + 23,
++ TPM2_PT_MEMORY = TPM2_PT_FIXED + 24,
++ TPM2_PT_CLOCK_UPDATE = TPM2_PT_FIXED + 25,
++ TPM2_PT_CONTEXT_HASH = TPM2_PT_FIXED + 26,
++ TPM2_PT_CONTEXT_SYM = TPM2_PT_FIXED + 27,
++ TPM2_PT_CONTEXT_SYM_SIZE = TPM2_PT_FIXED + 28,
++ TPM2_PT_ORDERLY_COUNT = TPM2_PT_FIXED + 29,
++ TPM2_PT_MAX_COMMAND_SIZE = TPM2_PT_FIXED + 30,
++ TPM2_PT_MAX_RESPONSE_SIZE = TPM2_PT_FIXED + 31,
++ TPM2_PT_MAX_DIGEST = TPM2_PT_FIXED + 32,
++ TPM2_PT_MAX_OBJECT_CONTEXT = TPM2_PT_FIXED + 33,
++ TPM2_PT_MAX_SESSION_CONTEXT = TPM2_PT_FIXED + 34,
++ TPM2_PT_PS_FAMILY_INDICATOR = TPM2_PT_FIXED + 35,
++ TPM2_PT_PS_LEVEL = TPM2_PT_FIXED + 36,
++ TPM2_PT_PS_REVISION = TPM2_PT_FIXED + 37,
++ TPM2_PT_PS_DAY_OF_YEAR = TPM2_PT_FIXED + 38,
++ TPM2_PT_PS_YEAR = TPM2_PT_FIXED + 39,
++ TPM2_PT_SPLIT_MAX = TPM2_PT_FIXED + 40,
++ TPM2_PT_TOTAL_COMMANDS = TPM2_PT_FIXED + 41,
++ TPM2_PT_LIBRARY_COMMANDS = TPM2_PT_FIXED + 42,
++ TPM2_PT_VENDOR_COMMANDS = TPM2_PT_FIXED + 43,
++ TPM2_PT_NV_BUFFER_MAX = TPM2_PT_FIXED + 44,
++ TPM2_PT_MODES = TPM2_PT_FIXED + 45,
++ TPM2_PT_MAX_CAP_BUFFER = TPM2_PT_FIXED + 46,
++ TPM2_PT_VAR = TPM2_PT_GROUP * 2,
++ TPM2_PT_PERMANENT = TPM2_PT_VAR + 0,
++ TPM2_PT_STARTUP_CLEAR = TPM2_PT_VAR + 1,
++ TPM2_PT_HR_NV_INDEX = TPM2_PT_VAR + 2,
++ TPM2_PT_HR_LOADED = TPM2_PT_VAR + 3,
++ TPM2_PT_HR_LOADED_AVAIL = TPM2_PT_VAR + 4,
++ TPM2_PT_HR_ACTIVE = TPM2_PT_VAR + 5,
++ TPM2_PT_HR_ACTIVE_AVAIL = TPM2_PT_VAR + 6,
++ TPM2_PT_HR_TRANSIENT_AVAIL = TPM2_PT_VAR + 7,
++ TPM2_PT_HR_PERSISTENT = TPM2_PT_VAR + 8,
++ TPM2_PT_HR_PERSISTENT_AVAIL = TPM2_PT_VAR + 9,
++ TPM2_PT_NV_COUNTERS = TPM2_PT_VAR + 10,
++ TPM2_PT_NV_COUNTERS_AVAIL = TPM2_PT_VAR + 11,
++ TPM2_PT_ALGORITHM_SET = TPM2_PT_VAR + 12,
++ TPM2_PT_LOADED_CURVES = TPM2_PT_VAR + 13,
++ TPM2_PT_LOCKOUT_COUNTER = TPM2_PT_VAR + 14,
++ TPM2_PT_MAX_AUTH_FAIL = TPM2_PT_VAR + 15,
++ TPM2_PT_LOCKOUT_INTERVAL = TPM2_PT_VAR + 16,
++ TPM2_PT_LOCKOUT_RECOVERY = TPM2_PT_VAR + 17,
++ TPM2_PT_NV_WRITE_RECOVERY = TPM2_PT_VAR + 18,
++ TPM2_PT_AUDIT_COUNTER_0 = TPM2_PT_VAR + 19,
++ TPM2_PT_AUDIT_COUNTER_1 = TPM2_PT_VAR + 20,
++};
+
+ /* 128 bytes is an arbitrary cap. This could be as large as TPM_BUFSIZE - 18
+ * bytes, but 128 is still a relatively large number of random bytes and
+diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+index a18393c8a8339..4eb66781649ca 100644
+--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
++++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+@@ -185,7 +185,6 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev);
+ static void _rtl92e_dm_deinit_fsync(struct net_device *dev);
+
+ static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev);
+-static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev);
+ static void _rtl92e_dm_check_fsync(struct net_device *dev);
+ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data);
+ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t);
+@@ -238,8 +237,6 @@ void rtl92e_dm_watchdog(struct net_device *dev)
+ if (priv->being_init_adapter)
+ return;
+
+- _rtl92e_dm_check_ac_dc_power(dev);
+-
+ _rtl92e_dm_check_txrateandretrycount(dev);
+ _rtl92e_dm_check_edca_turbo(dev);
+
+@@ -257,26 +254,6 @@ void rtl92e_dm_watchdog(struct net_device *dev)
+ _rtl92e_dm_cts_to_self(dev);
+ }
+
+-static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev)
+-{
+- struct r8192_priv *priv = rtllib_priv(dev);
+- static const char ac_dc_script[] = "/etc/acpi/wireless-rtl-ac-dc-power.sh";
+- char *argv[] = {(char *)ac_dc_script, DRV_NAME, NULL};
+- static char *envp[] = {"HOME=/",
+- "TERM=linux",
+- "PATH=/usr/bin:/bin",
+- NULL};
+-
+- if (priv->rst_progress == RESET_TYPE_SILENT)
+- return;
+- if (priv->rtllib->state != RTLLIB_LINKED)
+- return;
+- call_usermodehelper(ac_dc_script, argv, envp, UMH_WAIT_PROC);
+-
+- return;
+-};
+-
+-
+ void rtl92e_init_adaptive_rate(struct net_device *dev)
+ {
+
+@@ -1662,10 +1639,6 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
+ u8 tmp1byte;
+ enum rt_rf_power_state rf_power_state_to_set;
+ bool bActuallySet = false;
+- char *argv[3];
+- static const char RadioPowerPath[] = "/etc/acpi/events/RadioPower.sh";
+- static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin",
+- NULL};
+
+ bActuallySet = false;
+
+@@ -1695,14 +1668,6 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data)
+ mdelay(1000);
+ priv->hw_rf_off_action = 1;
+ rtl92e_set_rf_state(dev, rf_power_state_to_set, RF_CHANGE_BY_HW);
+- if (priv->hw_radio_off)
+- argv[1] = "RFOFF";
+- else
+- argv[1] = "RFON";
+-
+- argv[0] = (char *)RadioPowerPath;
+- argv[2] = NULL;
+- call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC);
+ }
+ }
+
+diff --git a/net/wireless/sme.c b/net/wireless/sme.c
+index 4f813e346a8bc..ce1ac01705f9b 100644
+--- a/net/wireless/sme.c
++++ b/net/wireless/sme.c
+@@ -1504,8 +1504,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
+ connect->key = NULL;
+ connect->key_len = 0;
+ connect->key_idx = 0;
+- connect->crypto.cipher_group = 0;
+- connect->crypto.n_ciphers_pairwise = 0;
+ }
+
+ wdev->connect_keys = connkeys;