diff options
-rw-r--r-- | arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch | 30 | ||||
-rw-r--r-- | arm64-qcom-pinctrl-support-for-ACPI.patch | 293 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA1 | 2 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA256 | 2 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch | 53 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 4 | ||||
-rw-r--r-- | kernel-aarch64.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl.config | 4 | ||||
-rw-r--r-- | kernel-i686-debug.config | 4 | ||||
-rw-r--r-- | kernel-i686.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le.config | 4 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 4 | ||||
-rw-r--r-- | kernel-s390x.config | 4 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 4 | ||||
-rw-r--r-- | kernel-x86_64.config | 4 | ||||
-rw-r--r-- | kernel.spec | 15 | ||||
-rwxr-xr-x | scripts/create_headers_tarball.sh | 2 | ||||
-rw-r--r-- | sources | 2 |
23 files changed, 97 insertions, 360 deletions
diff --git a/arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch b/arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch deleted file mode 100644 index 14e0eebf6..000000000 --- a/arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7b87bc98ab598ae40ef1818fb0c420d61dd87ed1 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel <ard.biesheuvel@linaro.org> -Date: Mon, 3 Jun 2019 08:37:11 +0200 -Subject: [PATCH] acpi: make AC and battery drivers available on !X86 - -Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> ---- - drivers/acpi/Kconfig | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig -index e016f7a6ed136..3c8011e7b0d7c 100644 ---- a/drivers/acpi/Kconfig -+++ b/drivers/acpi/Kconfig -@@ -155,7 +155,6 @@ config ACPI_EC_DEBUGFS - - config ACPI_AC - tristate "AC Adapter" -- depends on X86 - select POWER_SUPPLY - default y - help -@@ -168,7 +167,6 @@ config ACPI_AC - - config ACPI_BATTERY - tristate "Battery" -- depends on X86 - select POWER_SUPPLY - default y - help diff --git a/arm64-qcom-pinctrl-support-for-ACPI.patch b/arm64-qcom-pinctrl-support-for-ACPI.patch deleted file mode 100644 index a904b4789..000000000 --- a/arm64-qcom-pinctrl-support-for-ACPI.patch +++ /dev/null @@ -1,293 +0,0 @@ -From 0ab5b9df0c9f07ae747ddc678d4e423c42f69624 Mon Sep 17 00:00:00 2001 -From: Lee Jones <lee.jones@linaro.org> -Date: Mon, 10 Jun 2019 09:42:06 +0100 -Subject: [PATCH 1/8] i2c: i2c-qcom-geni: Provide support for ACPI - -Add a match table to allow automatic probing of ACPI device -QCOM0220. Ignore clock attainment errors. Set default clock -frequency value. - -Signed-off-by: Lee Jones <lee.jones@linaro.org> -Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> ---- - drivers/i2c/busses/i2c-qcom-geni.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c -index db075bc0d952..9e3b8a98688d 100644 ---- a/drivers/i2c/busses/i2c-qcom-geni.c -+++ b/drivers/i2c/busses/i2c-qcom-geni.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0 - // Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. - -+#include <linux/acpi.h> - #include <linux/clk.h> - #include <linux/dma-mapping.h> - #include <linux/err.h> -@@ -483,6 +484,14 @@ static const struct i2c_algorithm geni_i2c_algo = { - .functionality = geni_i2c_func, - }; - -+#ifdef CONFIG_ACPI -+static const struct acpi_device_id geni_i2c_acpi_match[] = { -+ { "QCOM0220"}, -+ { }, -+}; -+MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match); -+#endif -+ - static int geni_i2c_probe(struct platform_device *pdev) - { - struct geni_i2c_dev *gi2c; -@@ -502,7 +511,7 @@ static int geni_i2c_probe(struct platform_device *pdev) - return PTR_ERR(gi2c->se.base); - - gi2c->se.clk = devm_clk_get(&pdev->dev, "se"); -- if (IS_ERR(gi2c->se.clk)) { -+ if (IS_ERR(gi2c->se.clk) && !has_acpi_companion(&pdev->dev)) { - ret = PTR_ERR(gi2c->se.clk); - dev_err(&pdev->dev, "Err getting SE Core clk %d\n", ret); - return ret; -@@ -516,6 +525,9 @@ static int geni_i2c_probe(struct platform_device *pdev) - gi2c->clk_freq_out = KHZ(100); - } - -+ if (has_acpi_companion(&pdev->dev)) -+ ACPI_COMPANION_SET(&gi2c->adap.dev, ACPI_COMPANION(&pdev->dev)); -+ - gi2c->irq = platform_get_irq(pdev, 0); - if (gi2c->irq < 0) { - dev_err(&pdev->dev, "IRQ error for i2c-geni\n"); -@@ -660,6 +672,7 @@ static struct platform_driver geni_i2c_driver = { - .name = "geni_i2c", - .pm = &geni_i2c_pm_ops, - .of_match_table = geni_i2c_dt_match, -+ .acpi_match_table = ACPI_PTR(geni_i2c_acpi_match), - }, - }; - --- -2.21.0 - -From 5a0639fed6e05977d85c4824354e73d0a2fa92ef Mon Sep 17 00:00:00 2001 -From: Lee Jones <lee.jones@linaro.org> -Date: Mon, 10 Jun 2019 09:42:07 +0100 -Subject: [PATCH 2/8] i2c: i2c-qcom-geni: Signify successful driver probe - -The Qualcomm Geni I2C driver currently probes silently which can be -confusing when debugging potential issues. Add a low level (INFO) -print when each I2C controller is successfully initially set-up. - -Signed-off-by: Lee Jones <lee.jones@linaro.org> -Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> ---- - drivers/i2c/busses/i2c-qcom-geni.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c -index 9e3b8a98688d..a89bfce5388e 100644 ---- a/drivers/i2c/busses/i2c-qcom-geni.c -+++ b/drivers/i2c/busses/i2c-qcom-geni.c -@@ -596,6 +596,8 @@ static int geni_i2c_probe(struct platform_device *pdev) - return ret; - } - -+ dev_dbg(&pdev->dev, "Geni-I2C adaptor successfully added\n"); -+ - return 0; - } - --- -2.21.0 - -From 6f202eb6dbccf3172616a620faf934bf6195a0f9 Mon Sep 17 00:00:00 2001 -From: Lee Jones <lee.jones@linaro.org> -Date: Mon, 10 Jun 2019 09:42:08 +0100 -Subject: [PATCH 3/8] pinctrl: msm: Add ability for drivers to supply a - reserved GPIO list - -When booting MSM based platforms with Device Tree or some ACPI -implementations, it is possible to provide a list of reserved pins -via the 'gpio-reserved-ranges' and 'gpios' properties respectively. -However some ACPI tables are not populated with this information, -thus it has to come from a knowledgable device driver instead. - -Here we provide the MSM common driver with additional support to -parse this informtion and correctly populate the widely used -'valid_mask'. - -Signed-off-by: Lee Jones <lee.jones@linaro.org> -Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> ---- - drivers/pinctrl/qcom/pinctrl-msm.c | 18 ++++++++++++++++++ - drivers/pinctrl/qcom/pinctrl-msm.h | 1 + - 2 files changed, 19 insertions(+) - -diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c -index 6e319bcc2326..80682b017a47 100644 ---- a/drivers/pinctrl/qcom/pinctrl-msm.c -+++ b/drivers/pinctrl/qcom/pinctrl-msm.c -@@ -599,8 +599,23 @@ static int msm_gpio_init_valid_mask(struct gpio_chip *chip) - int ret; - unsigned int len, i; - unsigned int max_gpios = pctrl->soc->ngpios; -+ const int *reserved = pctrl->soc->reserved_gpios; - u16 *tmp; - -+ /* Driver provided reserved list overrides DT and ACPI */ -+ if (reserved) { -+ bitmap_fill(chip->valid_mask, max_gpios); -+ for (i = 0; reserved[i] >= 0; i++) { -+ if (i >= max_gpios || reserved[i] >= max_gpios) { -+ dev_err(pctrl->dev, "invalid list of reserved GPIOs\n"); -+ return -EINVAL; -+ } -+ clear_bit(reserved[i], chip->valid_mask); -+ } -+ -+ return 0; -+ } -+ - /* The number of GPIOs in the ACPI tables */ - len = ret = device_property_read_u16_array(pctrl->dev, "gpios", NULL, - 0); -@@ -956,6 +971,9 @@ static void msm_gpio_irq_handler(struct irq_desc *desc) - - static bool msm_gpio_needs_valid_mask(struct msm_pinctrl *pctrl) - { -+ if (pctrl->soc->reserved_gpios) -+ return true; -+ - return device_property_read_u16_array(pctrl->dev, "gpios", NULL, 0) > 0; - } - -diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h -index b724581c605c..48569cda8471 100644 ---- a/drivers/pinctrl/qcom/pinctrl-msm.h -+++ b/drivers/pinctrl/qcom/pinctrl-msm.h -@@ -113,6 +113,7 @@ struct msm_pinctrl_soc_data { - bool pull_no_keeper; - const char *const *tiles; - unsigned int ntiles; -+ const int *reserved_gpios; - }; - - extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops; --- -2.21.0 - -From 568ff4c9723d761164416fdf876232f5b14cf3ad Mon Sep 17 00:00:00 2001 -From: Lee Jones <lee.jones@linaro.org> -Date: Mon, 10 Jun 2019 09:42:09 +0100 -Subject: [PATCH 4/8] pinctrl: qcom: sdm845: Provide ACPI support - -This patch provides basic support for booting with ACPI instead -of the currently supported Device Tree. When doing so there are a -couple of differences which we need to taken into consideration. - -Firstly, the SDM850 ACPI tables omit information pertaining to the -4 reserved GPIOs on the platform. If Linux attempts to touch/ -initialise any of these lines, the firmware will restart the -platform. - -Secondly, when booting with ACPI, it is expected that the firmware -will set-up things like; Regulators, Clocks, Pin Functions, etc in -their ideal configuration. Thus, the possible Pin Functions -available to this platform are not advertised when providing the -higher GPIOD/Pinctrl APIs with pin information. - -Signed-off-by: Lee Jones <lee.jones@linaro.org> -Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> ---- - drivers/pinctrl/qcom/Kconfig | 2 +- - drivers/pinctrl/qcom/pinctrl-sdm845.c | 36 ++++++++++++++++++++++++++- - 2 files changed, 36 insertions(+), 2 deletions(-) - -diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig -index 890d0a3a790b..27ab585a639c 100644 ---- a/drivers/pinctrl/qcom/Kconfig -+++ b/drivers/pinctrl/qcom/Kconfig -@@ -169,7 +169,7 @@ config PINCTRL_SDM660 - - config PINCTRL_SDM845 - tristate "Qualcomm Technologies Inc SDM845 pin controller driver" -- depends on GPIOLIB && OF -+ depends on GPIOLIB && (OF || ACPI) - select PINCTRL_MSM - help - This is the pinctrl, pinmux, pinconf and gpiolib driver for the -diff --git a/drivers/pinctrl/qcom/pinctrl-sdm845.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c -index c97f20fca5fd..98a438dba711 100644 ---- a/drivers/pinctrl/qcom/pinctrl-sdm845.c -+++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c -@@ -3,6 +3,7 @@ - * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. - */ - -+#include <linux/acpi.h> - #include <linux/module.h> - #include <linux/of.h> - #include <linux/platform_device.h> -@@ -1277,6 +1278,10 @@ static const struct msm_pingroup sdm845_groups[] = { - UFS_RESET(ufs_reset, 0x99f000), - }; - -+static const int sdm845_acpi_reserved_gpios[] = { -+ 0, 1, 2, 3, 81, 82, 83, 84, -1 -+}; -+ - static const struct msm_pinctrl_soc_data sdm845_pinctrl = { - .pins = sdm845_pins, - .npins = ARRAY_SIZE(sdm845_pins), -@@ -1287,11 +1292,39 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = { - .ngpios = 150, - }; - -+static const struct msm_pinctrl_soc_data sdm845_acpi_pinctrl = { -+ .pins = sdm845_pins, -+ .npins = ARRAY_SIZE(sdm845_pins), -+ .groups = sdm845_groups, -+ .ngroups = ARRAY_SIZE(sdm845_groups), -+ .reserved_gpios = sdm845_acpi_reserved_gpios, -+ .ngpios = 150, -+}; -+ - static int sdm845_pinctrl_probe(struct platform_device *pdev) - { -- return msm_pinctrl_probe(pdev, &sdm845_pinctrl); -+ int ret; -+ -+ if (pdev->dev.of_node) { -+ ret = msm_pinctrl_probe(pdev, &sdm845_pinctrl); -+ } else if (has_acpi_companion(&pdev->dev)) { -+ ret = msm_pinctrl_probe(pdev, &sdm845_acpi_pinctrl); -+ } else { -+ dev_err(&pdev->dev, "DT and ACPI disabled\n"); -+ return -EINVAL; -+ } -+ -+ return ret; - } - -+#ifdef CONFIG_ACPI -+static const struct acpi_device_id sdm845_pinctrl_acpi_match[] = { -+ { "QCOM0217"}, -+ { }, -+}; -+MODULE_DEVICE_TABLE(acpi, sdm845_pinctrl_acpi_match); -+#endif -+ - static const struct of_device_id sdm845_pinctrl_of_match[] = { - { .compatible = "qcom,sdm845-pinctrl", }, - { }, -@@ -1302,6 +1335,7 @@ static struct platform_driver sdm845_pinctrl_driver = { - .name = "sdm845-pinctrl", - .pm = &msm_pinctrl_dev_pm_ops, - .of_match_table = sdm845_pinctrl_of_match, -+ .acpi_match_table = ACPI_PTR(sdm845_pinctrl_acpi_match), - }, - .probe = sdm845_pinctrl_probe, - .remove = msm_pinctrl_remove, --- -2.21.0 diff --git a/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA1 b/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA1 index f1f433af9..b51889849 100644 --- a/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA1 +++ b/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA1 @@ -1 +1 @@ -CONFIG_IMA_DEFAULT_HASH_SHA1=y +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set diff --git a/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA256 b/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA256 index 29bd8f86d..e627fd9e9 100644 --- a/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA256 +++ b/configs/fedora/generic/CONFIG_IMA_DEFAULT_HASH_SHA256 @@ -1 +1 @@ -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y @@ -1 +1 @@ -9637d517347e80ee2fe1c5d8ce45ba1b88d8b5cd +0a8ad0ffa4d80a544f6cbff703bf6394339afcdf diff --git a/iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch b/iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch new file mode 100644 index 000000000..2539cedfd --- /dev/null +++ b/iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch @@ -0,0 +1,53 @@ +From 3658c2832e3919b68fdba173f3d30079030542c6 Mon Sep 17 00:00:00 2001 +From: Johannes Berg <johannes.berg@intel.com> +Date: Wed, 3 Jul 2019 11:10:49 +0300 +Subject: [PATCH] iwlwifi: mvm: disable TX-AMSDU on older NICs + +On older NICs, we occasionally see issues with A-MSDU support, +where the commands in the FIFO get confused and then we see an +assert EDC because the next command in the FIFO isn't TX. + +We've tried to isolate this issue and understand where it comes +from, but haven't found any errors in building the A-MSDU in +software. + +At least for now, disable A-MSDU support on older hardware so +that users can use it again without fearing the assert. + +This fixes https://bugzilla.kernel.org/show_bug.cgi?id=203315. + +Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Luca Coelho <luciano.coelho@intel.com> +Acked-by: Kalle Valo <kvalo@codeaurora.org> +--- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +index 6a3b11dd2edf..f9df5e3eeee7 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +@@ -467,7 +467,19 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) + ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW); + ieee80211_hw_set(hw, BUFF_MMPDU_TXQ); + ieee80211_hw_set(hw, STA_MMPDU_TXQ); +- ieee80211_hw_set(hw, TX_AMSDU); ++ /* ++ * On older devices, enabling TX A-MSDU occasionally leads to ++ * something getting messed up, the command read from the FIFO ++ * gets out of sync and isn't a TX command, so that we have an ++ * assert EDC. ++ * ++ * It's not clear where the bug is, but since we didn't used to ++ * support A-MSDU until moving the mac80211 iTXQs, just leave it ++ * for older devices. We also don't see this issue on any newer ++ * devices. ++ */ ++ if (mvm->cfg->device_family >= IWL_DEVICE_FAMILY_9000) ++ ieee80211_hw_set(hw, TX_AMSDU); + ieee80211_hw_set(hw, TX_FRAG_LIST); + + if (iwl_mvm_has_tlc_offload(mvm)) { +-- +2.21.0 + diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index f402b89fd..450a01b0e 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2448,8 +2448,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 048499c40..4faef0199 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2432,8 +2432,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index bd543c222..0a5f43c7f 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2482,8 +2482,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 8b31da262..31bee654e 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2400,8 +2400,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 3e3e73c08..71a48f38c 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2385,8 +2385,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 00a1a8ebc..97e266b0a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2467,8 +2467,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index b529cc042..e5fae92b8 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2200,8 +2200,8 @@ CONFIG_IIO_TRIGGER=y CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_ARCH_POLICY is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-i686.config b/kernel-i686.config index 5f81037fb..d4b369150 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2183,8 +2183,8 @@ CONFIG_IIO_TRIGGER=y CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_ARCH_POLICY is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index a119339c7..099f4f1dc 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2006,8 +2006,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA is not set CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 3b32d3d73..dda118f4d 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -1989,8 +1989,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA is not set CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index ed1400a80..f0ad5491f 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -1984,8 +1984,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-s390x.config b/kernel-s390x.config index 5395aff4e..511c3a4ff 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -1967,8 +1967,8 @@ CONFIG_IIO_TRIGGER=y # CONFIG_IKCONFIG is not set CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 5d092904f..b5bb4a598 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2245,8 +2245,8 @@ CONFIG_IIO_TRIGGER=y CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_ARCH_POLICY is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 0aadcd337..44d238b32 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2228,8 +2228,8 @@ CONFIG_IIO_TRIGGER=y CONFIG_IKHEADERS=m # CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_ARCH_POLICY is not set -CONFIG_IMA_DEFAULT_HASH_SHA1=y -# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set +# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set +CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 diff --git a/kernel.spec b/kernel.spec index 05e6c72c4..de7cb6058 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -580,9 +580,6 @@ Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch Patch340: arm64-tegra-jetson-tx1-fixes.patch # QCom ACPI device support pieces -# I think both of these may be merged? -# Patch350: arm64-qcom-pinctrl-support-for-ACPI.patch -# Patch352: arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch # 400 - IBM (ppc/s390x) patches @@ -597,6 +594,10 @@ Patch507: 0001-Drop-that-for-now.patch # Submitted upstream at https://lkml.org/lkml/2019/4/23/89 Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch +# rhbz 1716334 +# https://patchwork.kernel.org/patch/11029027/ +Patch509: iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch + # END OF PATCH DEFINITIONS %endif @@ -1838,6 +1839,12 @@ fi # # %changelog +* Wed Jul 17 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc0.git6.1 +- Linux v5.2-11043-g0a8ad0ffa4d8 + +* Tue Jul 16 2019 Jeremy Cline <jcline@redhat.com> +- Fix a firmware crash in Intel 7000 and 8000 devices (rhbz 1716334) + * Tue Jul 16 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc0.git5.1 - Linux v5.2-10808-g9637d517347e diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh index 5105f790c..1c388381b 100755 --- a/scripts/create_headers_tarball.sh +++ b/scripts/create_headers_tarball.sh @@ -44,7 +44,7 @@ ARCH_LIST="arm arm64 powerpc s390 x86" headers_dir=$(mktemp -d) trap 'rm -rf "$headers_dir"' SIGHUP SIGINT SIGTERM EXIT -make HDR_ARCH_LIST="$ARCH_LIST" INSTALL_HDR_PATH=$headers_dir headers_install_all +make HDR_ARCH_LIST="$ARCH_LIST" INSTALL_HDR_PATH=$headers_dir headers_install find $headers_dir \ \( -name .install -o -name .check -o \ -name ..install.cmd -o -name ..check.cmd \) | xargs rm -f @@ -1,2 +1,2 @@ SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c -SHA512 (patch-5.2-git5.xz) = 804ad3ad5f7add44e1471187bb8de29bc75c77c5e2c4b79348f523cdc82a9a3f086c366e1dc4efee5103adcc7dfde598c07137bbc58a38b22029e1c331a52c48 +SHA512 (patch-5.2-git6.xz) = 91357456330267db87d188ce5cb18bfaa92505e3e62ba88b723600389a6091a0a52840771ed7e6616c4d098e01bc011a4bf786e4ebf0da28a7f6d4309346c553 |