August 2019 - Linux-stable-mirror

[PATCH] x86/mm/pti: in pti_clone_pgtable() don't increase addr by PUD_SIZE

by Song Liu

pti_clone_pgtable() increases addr by PUD_SIZE for pud_none(*pud) case. This is not accurate because addr may not be PUD_SIZE aligned. In our x86_64 kernel, pti_clone_pgtable() fails to clone 7 PMDs because of this issuse, including PMD for the irq entry table. For a memcache like workload, this introduces about 4.5x more iTLB-load and about 2.5x more iTLB-load-misses on a Skylake CPU. This patch fixes this issue by adding PMD_SIZE to addr for pud_none() case. Cc: stable(a)vger.kernel.org # v4.19+ Fixes: 16a3fe634f6a ("x86/mm/pti: Clone kernel-image on PTE level for 32 bit") Signed-off-by: Song Liu <songliubraving(a)fb.com> Cc: Joerg Roedel <jroedel(a)suse.de> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Dave Hansen <dave.hansen(a)linux.intel.com> Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Peter Zijlstra <peterz(a)infradead.org> --- arch/x86/mm/pti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index b196524759ec..5a67c3015f59 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -330,7 +330,7 @@ pti_clone_pgtable(unsigned long start, unsigned long end, pud = pud_offset(p4d, addr); if (pud_none(*pud)) { - addr += PUD_SIZE; + addr += PMD_SIZE; continue; } -- 2.17.1

5 years, 4 months

6
16
0 0

[PATCH 5.2] iwlwifi: Add support for SAR South Korea limitation

by Luca Coelho

From: Haim Dreyfuss <haim.dreyfuss(a)intel.com> commit 0c3d7282233c7b02c74400b49981d6fff1d683a8 upstream. South Korea is adding a more strict SAR limit called "Limb SAR". Currently, WGDS SAR offset group 3 is not used (not mapped to any country). In order to be able to comply with South Korea new restriction: - OEM will use WGDS SAR offset group 3 to South Korea limitation. - OEM will change WGDS revision to 1 (currently latest revision is 0) to notify that Korea Limb SAR applied. - Driver will read the WGDS table and pass the values to FW (as usual) - Driver will pass to FW an indication that Korea Limb SAR is applied in case table revision is 1. Signed-off-by: Haim Dreyfuss <haim.dreyfuss(a)intel.com> Signed-off-by: Luca Coelho <luciano.coelho(a)intel.com> --- This is needed in v5.2, because the FW API has changed and this patch is needed to support this new version. The new version was backported to our FW version 46, which we didn't predict at the time when the patch was committed to the mainline, but it needs to be taken now in order to avoid a regression. drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 28 ++++++---- drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 5 +- .../net/wireless/intel/iwlwifi/fw/api/power.h | 12 ++++ drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 55 ++++++++++++++----- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + 6 files changed, 76 insertions(+), 28 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c index 405038ce98d6..7573af2d88ce 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c @@ -97,7 +97,7 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_object); union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, union acpi_object *data, - int data_size) + int data_size, int *tbl_rev) { int i; union acpi_object *wifi_pkg; @@ -113,16 +113,19 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, /* * We need at least two packages, one for the revision and one * for the data itself. Also check that the revision is valid - * (i.e. it is an integer set to 0). + * (i.e. it is an integer smaller than 2, as we currently support only + * 2 revisions). */ if (data->type != ACPI_TYPE_PACKAGE || data->package.count < 2 || data->package.elements[0].type != ACPI_TYPE_INTEGER || - data->package.elements[0].integer.value != 0) { + data->package.elements[0].integer.value > 1) { IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n"); return ERR_PTR(-EINVAL); } + *tbl_rev = data->package.elements[0].integer.value; + /* loop through all the packages to find the one for WiFi */ for (i = 1; i < data->package.count; i++) { union acpi_object *domain; @@ -151,14 +154,15 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc) { union acpi_object *wifi_pkg, *data; u32 mcc_val; - int ret; + int ret, tbl_rev; data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD); if (IS_ERR(data)) return PTR_ERR(data); - wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE); - if (IS_ERR(wifi_pkg)) { + wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE, + &tbl_rev); + if (IS_ERR(wifi_pkg) || tbl_rev != 0) { ret = PTR_ERR(wifi_pkg); goto out_free; } @@ -185,6 +189,7 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev) { union acpi_object *data, *wifi_pkg; u64 dflt_pwr_limit; + int tbl_rev; data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD); if (IS_ERR(data)) { @@ -193,8 +198,8 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev) } wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, - ACPI_SPLC_WIFI_DATA_SIZE); - if (IS_ERR(wifi_pkg) || + ACPI_SPLC_WIFI_DATA_SIZE, &tbl_rev); + if (IS_ERR(wifi_pkg) || tbl_rev != 0 || wifi_pkg->package.elements[1].integer.value != ACPI_TYPE_INTEGER) { dflt_pwr_limit = 0; goto out_free; @@ -211,14 +216,15 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit); int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk) { union acpi_object *wifi_pkg, *data; - int ret; + int ret, tbl_rev; data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD); if (IS_ERR(data)) return PTR_ERR(data); - wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE); - if (IS_ERR(wifi_pkg)) { + wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE, + &tbl_rev); + if (IS_ERR(wifi_pkg) || tbl_rev != 0) { ret = PTR_ERR(wifi_pkg); goto out_free; } diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h index f5704e16643f..991a23450999 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h @@ -97,7 +97,7 @@ void *iwl_acpi_get_object(struct device *dev, acpi_string method); union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, union acpi_object *data, - int data_size); + int data_size, int *tbl_rev); /** * iwl_acpi_get_mcc - read MCC from ACPI, if available @@ -131,7 +131,8 @@ static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method) static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, union acpi_object *data, - int data_size) + int data_size, + int *tbl_rev) { return ERR_PTR(-ENOENT); } diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h index 01f003c6cff9..f195db398bed 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h @@ -419,14 +419,26 @@ struct iwl_per_chain_offset_group { struct iwl_per_chain_offset hb; } __packed; /* PER_CHAIN_LIMIT_OFFSET_GROUP_S_VER_1 */ +/** + * struct iwl_geo_tx_power_profile_cmd_v1 - struct for GEO_TX_POWER_LIMIT cmd. + * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation + * @table: offset profile per band. + */ +struct iwl_geo_tx_power_profiles_cmd_v1 { + __le32 ops; + struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES]; +} __packed; /* GEO_TX_POWER_LIMIT_VER_1 */ + /** * struct iwl_geo_tx_power_profile_cmd - struct for GEO_TX_POWER_LIMIT cmd. * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation * @table: offset profile per band. + * @table_revision: BIOS table revision. */ struct iwl_geo_tx_power_profiles_cmd { __le32 ops; struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES]; + __le32 table_revision; } __packed; /* GEO_TX_POWER_LIMIT */ /** diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h index de9243d30135..a74f34a8dffb 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/file.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h @@ -286,6 +286,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t; * SCAN_OFFLOAD_PROFILES_QUERY_RSP_S. * @IWL_UCODE_TLV_API_MBSSID_HE: This ucode supports v2 of * STA_CONTEXT_DOT11AX_API_S + * @IWL_UCODE_TLV_CAPA_SAR_TABLE_VER: This ucode supports different sar + * version tables. * * @NUM_IWL_UCODE_TLV_API: number of bits used */ @@ -318,6 +320,7 @@ enum iwl_ucode_tlv_api { IWL_UCODE_TLV_API_MBSSID_HE = (__force iwl_ucode_tlv_api_t)52, IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE = (__force iwl_ucode_tlv_api_t)53, IWL_UCODE_TLV_API_FTM_RTT_ACCURACY = (__force iwl_ucode_tlv_api_t)54, + IWL_UCODE_TLV_API_SAR_TABLE_VER = (__force iwl_ucode_tlv_api_t)55, NUM_IWL_UCODE_TLV_API #ifdef __CHECKER__ diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 5af9959d05e5..8892707050d5 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -682,15 +682,15 @@ static int iwl_mvm_sar_get_wrds_table(struct iwl_mvm *mvm) { union acpi_object *wifi_pkg, *table, *data; bool enabled; - int ret; + int ret, tbl_rev; data = iwl_acpi_get_object(mvm->dev, ACPI_WRDS_METHOD); if (IS_ERR(data)) return PTR_ERR(data); wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data, - ACPI_WRDS_WIFI_DATA_SIZE); - if (IS_ERR(wifi_pkg)) { + ACPI_WRDS_WIFI_DATA_SIZE, &tbl_rev); + if (IS_ERR(wifi_pkg) || tbl_rev != 0) { ret = PTR_ERR(wifi_pkg); goto out_free; } @@ -719,15 +719,15 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm) { union acpi_object *wifi_pkg, *data; bool enabled; - int i, n_profiles, ret; + int i, n_profiles, ret, tbl_rev; data = iwl_acpi_get_object(mvm->dev, ACPI_EWRD_METHOD); if (IS_ERR(data)) return PTR_ERR(data); wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data, - ACPI_EWRD_WIFI_DATA_SIZE); - if (IS_ERR(wifi_pkg)) { + ACPI_EWRD_WIFI_DATA_SIZE, &tbl_rev); + if (IS_ERR(wifi_pkg) || tbl_rev != 0) { ret = PTR_ERR(wifi_pkg); goto out_free; } @@ -778,7 +778,7 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm) static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm) { union acpi_object *wifi_pkg, *data; - int i, j, ret; + int i, j, ret, tbl_rev; int idx = 1; data = iwl_acpi_get_object(mvm->dev, ACPI_WGDS_METHOD); @@ -786,12 +786,13 @@ static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm) return PTR_ERR(data); wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data, - ACPI_WGDS_WIFI_DATA_SIZE); - if (IS_ERR(wifi_pkg)) { + ACPI_WGDS_WIFI_DATA_SIZE, &tbl_rev); + if (IS_ERR(wifi_pkg) || tbl_rev > 1) { ret = PTR_ERR(wifi_pkg); goto out_free; } + mvm->geo_rev = tbl_rev; for (i = 0; i < ACPI_NUM_GEO_PROFILES; i++) { for (j = 0; j < ACPI_GEO_TABLE_SIZE; j++) { union acpi_object *entry; @@ -894,15 +895,29 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm) { struct iwl_geo_tx_power_profiles_resp *resp; int ret; + u16 len; + void *data; + struct iwl_geo_tx_power_profiles_cmd geo_cmd; + struct iwl_geo_tx_power_profiles_cmd_v1 geo_cmd_v1; + struct iwl_host_cmd cmd; + + if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_SAR_TABLE_VER)) { + geo_cmd.ops = + cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE); + len = sizeof(geo_cmd); + data = &geo_cmd; + } else { + geo_cmd_v1.ops = + cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE); + len = sizeof(geo_cmd_v1); + data = &geo_cmd_v1; + } - struct iwl_geo_tx_power_profiles_cmd geo_cmd = { - .ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE), - }; - struct iwl_host_cmd cmd = { + cmd = (struct iwl_host_cmd){ .id = WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT), - .len = { sizeof(geo_cmd), }, + .len = { len, }, .flags = CMD_WANT_SKB, - .data = { &geo_cmd }, + .data = { data }, }; if (!iwl_mvm_sar_geo_support(mvm)) @@ -969,6 +984,16 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm) i, j, value[1], value[2], value[0]); } } + + cmd.table_revision = cpu_to_le32(mvm->geo_rev); + + if (!fw_has_api(&mvm->fw->ucode_capa, + IWL_UCODE_TLV_API_SAR_TABLE_VER)) { + return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0, + sizeof(struct iwl_geo_tx_power_profiles_cmd_v1), + &cmd); + } + return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0, sizeof(cmd), &cmd); } diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index 88af1f0ba3f0..ed8fc9a9204c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h @@ -1184,6 +1184,7 @@ struct iwl_mvm { #ifdef CONFIG_ACPI struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM]; struct iwl_mvm_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES]; + u32 geo_rev; #endif }; -- 2.23.0.rc1

5 years, 4 months

2
1
0 0

[PATCH] powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB

by Alastair D'Silva

From: Alastair D'Silva <alastair(a)d-silva.org> Heads Up: This patch cannot be submitted to Linus's tree, as the affected assembler functions have already been converted to C. When calling flush_(inval_)dcache_range with a size >4GB, we were masking off the upper 32 bits, so we would incorrectly flush a range smaller than intended. This patch replaces the 32 bit shifts with 64 bit ones, so that the full size is accounted for. Signed-off-by: Alastair D'Silva <alastair(a)d-silva.org> --- arch/powerpc/kernel/misc_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index 1ad4089dd110..d4d096f80f4b 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S @@ -130,7 +130,7 @@ _GLOBAL_TOC(flush_dcache_range) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,DCACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of dcache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8 0: dcbst 0,r6 @@ -148,7 +148,7 @@ _GLOBAL(flush_inval_dcache_range) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,DCACHEL1LOGBLOCKSIZE(r10)/* Get log-2 of dcache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ sync isync -- 2.21.0

5 years, 4 months

3
4
0 0

gcc 9.0 support in v4.4.y

by Guenter Roeck

Hi, please consider applying the following two patches from v4.9.y to v4.4.y. fe5844365ec6 ("Backport minimal compiler_attributes.h to support GCC 9") 2c34c215c102 ("include/linux/module.h: copy __init/__exit attrs to init/cleanup_module") (upstream commit a6e60d84989f) ... to enable compiling v4.4.y with gcc 9.x. This already works for the most part, but alpha:allmodconfig and arm:allmodconfig fail to compile. The above two patches fix the problem. Thanks, Guenter

5 years, 4 months

3
2
0 0

FAILED: patch "[PATCH] arm64: ftrace: Ensure module ftrace trampoline is coherent" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b6143d10d23ebb4a77af311e8b8b7f019d0163e6 Mon Sep 17 00:00:00 2001 From: Will Deacon <will(a)kernel.org> Date: Fri, 16 Aug 2019 14:57:43 +0100 Subject: [PATCH] arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side The initial support for dynamic ftrace trampolines in modules made use of an indirect branch which loaded its target from the beginning of a special section (e71a4e1bebaf7 ("arm64: ftrace: add support for far branches to dynamic ftrace")). Since no instructions were being patched, no cache maintenance was needed. However, later in be0f272bfc83 ("arm64: ftrace: emit ftrace-mod.o contents through code") this code was reworked to output the trampoline instructions directly into the PLT entry but, unfortunately, the necessary cache maintenance was overlooked. Add a call to __flush_icache_range() after writing the new trampoline instructions but before patching in the branch to the trampoline. Cc: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: James Morse <james.morse(a)arm.com> Cc: <stable(a)vger.kernel.org> Fixes: be0f272bfc83 ("arm64: ftrace: emit ftrace-mod.o contents through code") Signed-off-by: Will Deacon <will(a)kernel.org> Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com> diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 1285c7b2947f..171773257974 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -73,7 +73,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) if (offset < -SZ_128M || offset >= SZ_128M) { #ifdef CONFIG_ARM64_MODULE_PLTS - struct plt_entry trampoline; + struct plt_entry trampoline, *dst; struct module *mod; /* @@ -106,23 +106,27 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) * to check if the actual opcodes are in fact identical, * regardless of the offset in memory so use memcmp() instead. */ - trampoline = get_plt_entry(addr, mod->arch.ftrace_trampoline); - if (memcmp(mod->arch.ftrace_trampoline, &trampoline, - sizeof(trampoline))) { - if (plt_entry_is_initialized(mod->arch.ftrace_trampoline)) { + dst = mod->arch.ftrace_trampoline; + trampoline = get_plt_entry(addr, dst); + if (memcmp(dst, &trampoline, sizeof(trampoline))) { + if (plt_entry_is_initialized(dst)) { pr_err("ftrace: far branches to multiple entry points unsupported inside a single module\n"); return -EINVAL; } /* point the trampoline to our ftrace entry point */ module_disable_ro(mod); - *mod->arch.ftrace_trampoline = trampoline; + *dst = trampoline; module_enable_ro(mod, true); - /* update trampoline before patching in the branch */ - smp_wmb(); + /* + * Ensure updated trampoline is visible to instruction + * fetch before we patch in the branch. + */ + __flush_icache_range((unsigned long)&dst[0], + (unsigned long)&dst[1]); } - addr = (unsigned long)(void *)mod->arch.ftrace_trampoline; + addr = (unsigned long)dst; #else /* CONFIG_ARM64_MODULE_PLTS */ return -EINVAL; #endif /* CONFIG_ARM64_MODULE_PLTS */

5 years, 4 months

3
2
0 0

FAILED: patch "[PATCH] arm64: compat: Allow single-byte watchpoints on all addresses" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 849adec41203ac5837c40c2d7e08490ffdef3c2c Mon Sep 17 00:00:00 2001 From: Will Deacon <will(a)kernel.org> Date: Mon, 29 Jul 2019 11:06:17 +0100 Subject: [PATCH] arm64: compat: Allow single-byte watchpoints on all addresses Commit d968d2b801d8 ("ARM: 7497/1: hw_breakpoint: allow single-byte watchpoints on all addresses") changed the validation requirements for hardware watchpoints on arch/arm/. Update our compat layer to implement the same relaxation. Cc: <stable(a)vger.kernel.org> Signed-off-by: Will Deacon <will(a)kernel.org> diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index dceb84520948..67b3bae50b92 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -536,13 +536,14 @@ int hw_breakpoint_arch_parse(struct perf_event *bp, /* Aligned */ break; case 1: - /* Allow single byte watchpoint. */ - if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) - break; case 2: /* Allow halfword watchpoints and breakpoints. */ if (hw->ctrl.len == ARM_BREAKPOINT_LEN_2) break; + case 3: + /* Allow single byte watchpoint. */ + if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1) + break; default: return -EINVAL; }

5 years, 4 months

3
2
0 0

Backport request for bcb44433bba5 ("dm: disable DISCARD if the underlying storage no longer supports it")

by Salvatore Bonaccorso

Hi In Debian bug https://bugs.debian.org/934331 ran into issues which match the upstream commit bcb44433bba5 ("dm: disable DISCARD if the underlying storage no longer supports it"). This commit was CC'ed to stable, but only got applied in v5.0.8 (and later on backported by Ben Hutchings to v3.16.72). Mike, I have not checked how easily that would be for older stable versions, but can the backport be considered for versions down to 4.9? Apparently Ben did succeed with some changes needed. To 4.19 it should apply with a small conflict in drivers/md/dm-core.h AFAICS. Regards, Salvatore

5 years, 4 months

2
3
0 0

[PATCH] drm/i915/cfl: Add a new CFL PCI ID.

by wan.fahim.asqalanix.wan.yusof＠intel.com

From: Rodrigo Vivi <rodrigo.vivi(a)intel.com> commit d0e062ebb3a44b56a7e672da568334c76f763552 upstream One more CFL ID added to spec. Cc: stable(a)vger.kernel.org Cc: José Roberto de Souza <jose.souza(a)intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Reviewed-by: José Roberto de Souza <jose.souza(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180803232721.20038-1-rodrig… (cherry picked from commit d0e062ebb3a44b56a7e672da568334c76f763552) Signed-off-by: Wan Yusof, Wan Fahim AsqalaniX <wan.fahim.asqalanix.wan.yusof(a)intel.com> --- include/drm/i915_pciids.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index fbf5cfc9b3..fd965ff 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -386,6 +386,7 @@ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \ INTEL_VGA_DEVICE(0x3E96, info), /* SRV GT2 */ \ + INTEL_VGA_DEVICE(0x3E98, info), /* SRV GT2 */ \ INTEL_VGA_DEVICE(0x3E9A, info) /* SRV GT2 */ /* CFL H */ -- 2.7.4

5 years, 4 months

2
1
0 0

[PATCH] phy: qcom-qmp: Correct ready status, again

by Bjorn Andersson

Despite extensive testing of 885bd765963b ("phy: qcom-qmp: Correct READY_STATUS poll break condition") I failed to conclude that the PHYSTATUS bit of the PCS_STATUS register used in PCIe and USB3 falls as the PHY gets ready. Similar to the prior bug with UFS the code will generally get past the check before the transition and thereby "succeed". Correct the name of the register used PCIe and USB3 PHYs, replace mask_pcs_ready with a constant expression depending on the type of the PHY and check for the appropriate ready state. Cc: stable(a)vger.kernel.org Cc: Vivek Gautam <vivek.gautam(a)codeaurora.org> Cc: Evan Green <evgreen(a)chromium.org> Cc: Niklas Cassel <niklas.cassel(a)linaro.org> Reported-by: Marc Gonzalez <marc.w.gonzalez(a)free.fr> Fixes: 885bd765963b ("phy: qcom-qmp: Correct READY_STATUS poll break condition") Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> --- drivers/phy/qualcomm/phy-qcom-qmp.c | 33 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 34ff6434da8f..6bb49cc25c63 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -35,7 +35,7 @@ #define PLL_READY_GATE_EN BIT(3) /* QPHY_PCS_STATUS bit */ #define PHYSTATUS BIT(6) -/* QPHY_COM_PCS_READY_STATUS bit */ +/* QPHY_PCS_READY_STATUS & QPHY_COM_PCS_READY_STATUS bit */ #define PCS_READY BIT(0) /* QPHY_V3_DP_COM_RESET_OVRD_CTRL register bits */ @@ -115,6 +115,7 @@ enum qphy_reg_layout { QPHY_SW_RESET, QPHY_START_CTRL, QPHY_PCS_READY_STATUS, + QPHY_PCS_STATUS, QPHY_PCS_AUTONOMOUS_MODE_CTRL, QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR, QPHY_PCS_LFPS_RXTERM_IRQ_STATUS, @@ -133,7 +134,7 @@ static const unsigned int pciephy_regs_layout[] = { [QPHY_FLL_MAN_CODE] = 0xd4, [QPHY_SW_RESET] = 0x00, [QPHY_START_CTRL] = 0x08, - [QPHY_PCS_READY_STATUS] = 0x174, + [QPHY_PCS_STATUS] = 0x174, }; static const unsigned int usb3phy_regs_layout[] = { @@ -144,7 +145,7 @@ static const unsigned int usb3phy_regs_layout[] = { [QPHY_FLL_MAN_CODE] = 0xd0, [QPHY_SW_RESET] = 0x00, [QPHY_START_CTRL] = 0x08, - [QPHY_PCS_READY_STATUS] = 0x17c, + [QPHY_PCS_STATUS] = 0x17c, [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = 0x0d4, [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = 0x0d8, [QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x178, @@ -153,7 +154,7 @@ static const unsigned int usb3phy_regs_layout[] = { static const unsigned int qmp_v3_usb3phy_regs_layout[] = { [QPHY_SW_RESET] = 0x00, [QPHY_START_CTRL] = 0x08, - [QPHY_PCS_READY_STATUS] = 0x174, + [QPHY_PCS_STATUS] = 0x174, [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = 0x0d8, [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = 0x0dc, [QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170, @@ -911,7 +912,6 @@ struct qmp_phy_cfg { unsigned int start_ctrl; unsigned int pwrdn_ctrl; - unsigned int mask_pcs_ready; unsigned int mask_com_pcs_ready; /* true, if PHY has a separate PHY_COM control block */ @@ -1074,7 +1074,6 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = { .start_ctrl = PCS_START | PLL_READY_GATE_EN, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, - .mask_pcs_ready = PHYSTATUS, .mask_com_pcs_ready = PCS_READY, .has_phy_com_ctrl = true, @@ -1106,7 +1105,6 @@ static const struct qmp_phy_cfg msm8996_usb3phy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, - .mask_pcs_ready = PHYSTATUS, }; /* list of resets */ @@ -1136,7 +1134,6 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, - .mask_pcs_ready = PHYSTATUS, .has_phy_com_ctrl = false, .has_lane_rst = false, @@ -1167,7 +1164,6 @@ static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, - .mask_pcs_ready = PHYSTATUS, .has_pwrdn_delay = true, .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, @@ -1199,7 +1195,6 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, - .mask_pcs_ready = PHYSTATUS, .has_pwrdn_delay = true, .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, @@ -1226,7 +1221,6 @@ static const struct qmp_phy_cfg sdm845_ufsphy_cfg = { .start_ctrl = SERDES_START, .pwrdn_ctrl = SW_PWRDN, - .mask_pcs_ready = PCS_READY, .is_dual_lane_phy = true, .no_pcs_sw_reset = true, @@ -1254,7 +1248,6 @@ static const struct qmp_phy_cfg msm8998_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, - .mask_pcs_ready = PHYSTATUS, }; static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { @@ -1279,7 +1272,6 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, - .mask_pcs_ready = PHYSTATUS, .is_dual_lane_phy = true, }; @@ -1457,7 +1449,7 @@ static int qcom_qmp_phy_enable(struct phy *phy) void __iomem *pcs = qphy->pcs; void __iomem *dp_com = qmp->dp_com; void __iomem *status; - unsigned int mask, val; + unsigned int mask, val, ready; int ret; dev_vdbg(qmp->dev, "Initializing QMP phy\n"); @@ -1545,10 +1537,17 @@ static int qcom_qmp_phy_enable(struct phy *phy) /* start SerDes and Phy-Coding-Sublayer */ qphy_setbits(pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl); - status = pcs + cfg->regs[QPHY_PCS_READY_STATUS]; - mask = cfg->mask_pcs_ready; + if (cfg->type == PHY_TYPE_UFS) { + status = pcs + cfg->regs[QPHY_PCS_READY_STATUS]; + mask = PCS_READY; + ready = PCS_READY; + } else { + status = pcs + cfg->regs[QPHY_PCS_STATUS]; + mask = PHYSTATUS; + ready = 0; + } - ret = readl_poll_timeout(status, val, val & mask, 10, + ret = readl_poll_timeout(status, val, (val & mask) == ready, 10, PHY_INIT_COMPLETE_TIMEOUT); if (ret) { dev_err(qmp->dev, "phy initialization timed-out\n"); -- 2.18.0

5 years, 4 months

2
1
0 0

stable backports, from contents found in xilinx-4.9

by Arnd Bergmann

I searched through https://github.com/Xilinx/linux-xlnx/tree/xlnx_rebase_v4.9 for commits that got backported from mainline, and categorized them to see if we want them in an LTS kernel. Most of the contents are specific to xilinx hardware, but some changes are for generic drivers. These commits look like we should have them in the LTS kernel, and they apply cleanly: d86c5a676e5b ("usb: dwc3: gadget: always try to prepare on started_list first") 63b7c83ebea0 ("microblaze: Fix return value from xilinx_timer_init") 7181e5590e5b ("microblaze: Add missing syscalls") 8ee80500ad78 ("microblaze: Add missing release version code v9.6 and v10") 3400606d8ffd ("microblaze: Add new fpga families") 26b54be568ad ("PCI: xilinx-nwl: Remove mask for messages not supported by AXI") acf6ef1d6c96 ("i2c: mux: pca954x: Export OF device ID table as module aliases") dbe4d69d252e ("i2c: mux: pca954x: Add missing pca9546 definition to chip_desc") 360a3a90c626 ("[media] uvcvideo: Fix empty packet statistic") a753499d4360 ("microblaze: mm: Flush TLB to ensure correct mapping when higmem ON") faf154cd49ba ("microblaze: Separate GP registers from MSR handling") 14ef905bb2ee ("microblaze: Fix MSR flags when returning from exception") 8064c616984e ("i2c: cadance: fix ctrl/addr reg write order") 48767fd8982d ("spi: cadence: change sequence of calling runtime_enable") 802740890c42 ("spi: cadence: Add support for context loss") e11de4de28c0 ("gpio: zynq: Add support for suspend resume") a5685781dfe9 ("cpufreq: dt: Add zynqmp to the cpufreq dt platdev") 5c8f124893c4 ("mfd: Kconfig: Add missing Kconfig dependency for TPS65086") d15c56cad0e6 ("arm64: dts: xilinx: fix PCI bus dtc warnings") 17e76f95a4be ("arm64: zynqmp: Add dcc console for zynqmp") 8c50b1e435d1 ("arm64: zynqmp: Add CCI-400 node") e199f2cc1e55 ("arm64: zynqmp: Correct IRQ nr for the SMMU") db202f4d5c24 ("watchdog: cadence_wdt: Enable access to module parameters") 3df3e41c3152 ("video: fbdev: Enable Xilinx FB for ZynqMP") 1d67243a8e77 ("tty: xilinx_uartps: move to arch_initcall for earlier console") 3c48d62de237 ("dmaengine: zynqmp_dma: Fix warning variable 'val' set but not used") 8d90035e379c ("dmaengine: zynqmp_dma: Fix issues with overflow interrupt") 23059408b6a3 ("dmaengine: xilinx_dma: Fix race condition in the driver for multiple descriptor scenario") 48c62fb051af ("dmaengine: xilinx_dma: properly configure the SG mode bit in the driver for cdma") 4b597c634a2a ("dmaengine: xilinx_dma: Fix warning variable prev set but not used") 1fd4c45d6cd3 ("usb: gadget: udc-xilinx: remove redundant pointer udc") These look useful, but require a backport to apply: 06aa09081d44 ("gpio: zynq: Provided workaround for GPIO") 6e037fb77086 ("ata: ceva: Correct the AXI bus configuration for SATA ports") f8251f1dfda9 ("i2c: mux: pca954x: Add missing pca9542 definition to chip_desc") 25cd9721c2b1 ("usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held") 51218298a25e ("alarmtimer: Ensure RTC module is not unloaded") These seem harmless but not necessary for stable backports, they could easily get applied if there is a reason for them: 99c494077e2d ("idr: add ida_is_empty") f59d4418c420 ("[media] media: adv7604: fix bindings inconsistency for default-input") 6ab1a322dcaf ("[media] vivid: Enable 4k resolution for webcam capture device") 10eeb5e645b5 ("net: xilinx: constify net_device_ops structure") e0d4fa5f7a50 ("microblaze: Update defconfigs") 17f4977ccd2b ("microblaze: Enabling CONFIGS related to MTD") e16f1ad442e2 ("microblaze: Enabling CONFIG_BRIDGE in mmu_defconfig") 3638bd4a066c ("gpio: zynq: Clarify quirk and provide helper function") 9a181e1093af ("PCI: xilinx-nwl: Modify IRQ chip for legacy interrupts") fdc71ce97c13 ("PCI: xilinx: Make of_device_ids const") 011e29e7d93d ("watchdog: cadence_wdt: make of_device_ids const.") ce0d37614083 ("iio: adc: xadc: Fix coding style violations") ef2b56df5a8a ("char: xilinx_hwicap: Fix kernel doc warnings") 4cb4142ba02c ("pinctrl: zynq: Fix kernel doc warnings") 6c2c9bd27cc5 ("pinctrl: zynq: Fix warnings in the driver") 6ae5104cbaa5 ("gpio: zynq: Fix kernel doc warnings") 2717cfcaf564 ("gpio: zynq: Fix warnings in the driver") b09034892210 ("arm: zynq: Add adv7511 on i2c bus for zc70x") e5e6f6872c7a ("arm: zynq: Add device-type property for zynq ethernet phy nodes") 3c220bf42090 ("arm: zynq: Label whole PL part as fpga_full region") 1188c024f216 ("arm: zynq: Use C pre-processor for includes in dts") 21ad06cc9e63 ("arm: zynq: Remove earlycon from bootargs") 26db4d8bc7cb ("arm64: zynqmp: Remove leading 0s from mtd table for spi flashes") 63301178e9a9 ("arm64: zynqmp: Move nodes which have no reg property out of bus") 400e188fa895 ("arm64: zynqmp: Add references to cpu nodes") 1e4e25c8ae8f ("arm64: zynqmp: Add idle state for ZynqMP") e31b7bb8e21e ("arm64: zynqmp: Add operating points") 4a6514d523b5 ("arm64: zynqmp: Adding prefetchable memory space to pcie node") 7fb7820c579b ("arm64: zynqmp: Add support for RTC") 27af3993f77d ("arm64: zynqmp: Add new uartps compatible string") 2f9ed1999a41 ("arm64: zynqmp: Set status disabled in dtsi") 932bd0d8dbe8 ("arm64: zynqmp: Add fpd/lpd dmas") e881e58709a7 ("arm64: zynqmp: Use C pre-processor for includes") 05e0bd10a9ee ("arm64: zynqmp: Added clocks to DT for ep108") 142574873e2b ("arm64: zynqmp: Enable can1 for ep108") 0286f3ea26a4 ("arm64: zynqmp: Add missing mmc aliases in ep108") b6bc41645547 ("watchdog: of_xilinx_wdt: Add support for reading freq via CCF") 6f671c6b6288 ("watchdog: of_xilinx_wdt: Add suspend/resume support") c7a03599b58f ("dmaengine: xilinx_dma: Differentiate probe based on the ip type") 025ba1841e5d ("ARM: dts: zynq: Add mmc alias for zc702/zc706/zed/zybo") e7abd89466df ("arm64: dts: zynqmp: Add DDRC node") c2df3de0d07e ("gpio: zynq: properly support runtime PM for GPIO used as interrupts") d2920ef5d094 ("dt-bindings: spi: Add device tree binding documentation for Zynq QSPI controller") 67dca5e580f1 ("spi: spi-mem: Add support for Zynq QSPI controller") And finally, these were backported into the xilinx tree, but are clearly not material for an lts kernel. 0f57dc6ae1ff ("remoteproc: Keep local copy of firmware name") 2aefbef04149 ("remoteproc: Add a sysfs interface for firmware and state") 2bfc311a57f5 ("remoteproc: Drop wait in __rproc_boot()") dbf499cf720a ("usb: gadget: f_hid add super speed support") 39a842e22c1b ("of/overlay: add of overlay notifications") 9dce0287a60d ("fpga: add method to get fpga manager from device") 40e83578fd1e ("doc: fpga-mgr: add fpga image info to api") a33ddf80b67a ("fpga: add bindings document for fpga region") 1df2865f8dd9 ("fpga-mgr: add fpga image information struct") 12e2508213ac ("add sysfs document for fpga bridge class") 21aeda950c5f ("fpga: add fpga bridge framework") 0fa20cdfcc1f ("fpga: fpga-region: device tree control for FPGA") 1930c2865108 ("fpga zynq: Add missing \n to messages") 80baf649c277 ("fpga zynq: Remove priv->dev") 340c0c53ea30 ("fpga zynq: Fix incorrect ISR state on bootup") 7fe91fccc49f ("ARM: zynq: Remove skeleton.dtsi") da457d57594b ("ARM: zynq: Fix W=1 dtc 1.4 warnings") 5935a2b3a57c ("serial: xuartps: Enable uart loopback mode") 6f05afcbb031 ("scripts/dtc: Update to upstream version 0931cea3ba20") 608d792192d7 ("remoteproc: Add RPROC_DELETED state") 7a20c64ddb3d ("remoteproc: Reduce asynchronous request_firmware to auto-boot only") f2114795f721 ("i2c: mux: pca954x: Add interrupt controller support") ae3696c167cc ("net: macb: fix phy interrupt parsing") 52276df0b1ce ("[media] uvcvideo: Don't record timespec_sub") 89d123106a97 ("scripts/dtc: Update to upstream version v1.4.4-8-g756ffc4f52f6") d62100f1aac2 ("serial: xilinx_uartps: Add pm runtime support") 81e33b51ed69 ("serial: xuartps: Cleanup the clock enable") ecfc5771ef06 ("serial: xuartps: Enable clocks in the pm disable case also") d653c43aefed ("serial: xilinx_uartps: Fix the error path") 094094a9373f ("serial: uartps: Fix kernel doc warnings") f3a7f6f67fc7 ("watchdog: cadence_wdt: Show information when driver is probed") 00a0af9a6b04 ("video: fbdev: Fix multiple style issues in xilinxfb") 9053f4b9855c ("devicetree: bindings: Add sata port phy config parameters in ahci-ceva") fe8365bbf8ac ("ata: ceva: Move sata port phy oob settings to device-tree") e8fc8b858cd8 ("ata: ceva: Add gen 3 mode support in driver") ff0d63778ca0 ("ata: ceva: Disable Device Sleep capability") 05e890d84386 ("ata: ceva: Make RxWaterMark value as module parameter") 3bc867de85b5 ("ata: ceva: Add CCI support for SATA if CCI is enabled") 26bf3b6658a2 ("ata: ceva: Correct the suspend and resume logic for SATA") f0a559aae57c ("ata: ceva: Add SMMU support for SATA IP") b2b60bcc7d09 ("media: imx274: device tree binding file") 64c6f7da8c2c ("dmaengine: zynqmp_dma: Add runtime pm support") 30df4574e432 ("dmaengine: zynqmp_dma: Fix kernel doc-format") 49a83f002731 ("net: emaclite: Fix block comments style") da7bf20e7758 ("tty: serial: uartlite: Add structure for private data") 14288befeb57 ("tty: serial: uartlite: Add clock adaptation") a3a10614ca0f ("tty: serial: uartlite: Add support for suspend and resume")

5 years, 4 months

3
4
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2019