6.5.11-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 1/88 ASoC: Intel: sof_sdw: add support for SKU 0B14
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit fb0b8d299781be8d46b3612aa96cef28da0d93f4 ]
One more missing SKU in the list.
--- sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/soc/intel/boards/sof_sdw.c +10 -0
@@ -366,6 +366,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {/* No Jack */ .driver_data = (void *)SOF_SDW_TGL_HDMI, }, + { + .callback = sof_sdw_quirk_cb, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc" ), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B14"), + }, +/* No Jack */ + .driver_data = (void *)SOF_SDW_TGL_HDMI, + }, + { .callback = sof_sdw_quirk_cb, .matches = {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 10/88 irqchip/riscv-intc: Mark all INTC nodes as initialized
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anup Patel <[email protected]>
[ Upstream commit e13cd66bd821be417c498a34928652db4ac6b436 ]
The RISC-V INTC local interrupts are per-HART (or per-CPU) so we create INTC IRQ domain only for the INTC node belonging to the boot HART. This means only the boot HART INTC node will be marked as initialized and other INTC nodes won't be marked which results downstream interrupt controllers (such as PLIC, IMSIC and APLIC direct-mode) not being probed due to missing device suppliers.
To address this issue, we mark all INTC node for which we don't create IRQ domain as initialized.
--- drivers/irqchip/irq-riscv-intc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/irqchip/irq-riscv-intc.c +9 -1
@@ -155,8 +155,16 @@ static int __init riscv_intc_init(struct device_node *node,* for each INTC DT node. We only need to do INTC initialization * for the INTC DT node belonging to boot CPU (or boot HART). */ -if (riscv_hartid_to_cpuid (hartid) !=smp_processor_id ()) +if (riscv_hartid_to_cpuid (hartid) !=smp_processor_id ()) { +/* +* The INTC nodes of each CPU are suppliers for downstream +* interrupt controllers (such as PLIC, IMSIC and APLIC +* direct-mode) so we should mark an INTC node as initialized +* if we are not creating IRQ domain for it. +*/ +fwnode_dev_initialized (of_fwnode_handle (node), true);return 0 ; + }return riscv_intc_init_common (of_node_to_fwnode (node)); }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 11/88 irqchip/stm32-exti: add missing DT IRQ flag translation
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Wolsieffer <[email protected]>
[ Upstream commit 8554cba1d6dbd3c74e0549e28ddbaccbb1d6b30a ]
The STM32F4/7 EXTI driver was missing the xlate callback, so IRQ trigger flags specified in the device tree were being ignored. This was preventing the RTC alarm interrupt from working, because it must be set to trigger on the rising edge to function correctly.
--- drivers/irqchip/irq-stm32-exti.c | 1 + 1 file changed, 1 insertion(+)
drivers/irqchip/irq-stm32-exti.c +1 -0
@@ -459,6 +459,7 @@ static const struct irq_domain_ops irq_exti_domain_ops = { .map = irq_map_generic_chip, .alloc = stm32_exti_alloc, .free = stm32_exti_free, + .xlate = irq_domain_xlate_twocell, };static void stm32_irq_ack (struct irq_data *d)
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 12/88 dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Shurong <[email protected]>
[ Upstream commit 0618c077a8c20e8c81e367988f70f7e32bb5a717 ]
The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context.
We fix it by calling pm_runtime_disable when error returns.
--- drivers/dma/ste_dma40.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/ste_dma40.c +1 -0
@@ -3668,6 +3668,7 @@ static int __init d40_probe(struct platform_device *pdev)regulator_disable (base->lcpa_regulator);regulator_put (base->lcpa_regulator); } +pm_runtime_disable (base->dev); report_failure:d40_err (dev,"probe failed\n" );
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 2/88 ASoC: simple-card: fixup asoc_simple_probe() error handling
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit 41bae58df411f9accf01ea660730649b2fab1dab ]
asoc_simple_probe() is used for both "DT probe" (A) and "platform probe" (B). It uses "goto err" when error case, but it is not needed for "platform probe" case (B). Thus it is using "return" directly there.
static int asoc_simple_probe(...)
{ ^ if (...) {
| ...
(A) if (ret < 0)
| goto err;
v } else {
^ ...
| if (ret < 0)
(B) return -Exxx;
v }
...
^ if (ret < 0)
(C) goto err;
v ...
err:
(D) simple_util_clean_reference(card);
return ret; }
Both case are using (C) part, and it calls (D) when err case. But (D) will do nothing for (B) case.
Because of these behavior, current code itself is not wrong, but is confusable, and more, static analyzing tool will warning on
(B) part (should use goto err).
To avoid static analyzing tool warning, this patch uses "goto err" on (B) part.
--- sound/soc/generic/simple-card.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/generic/simple-card.c +4 -2
@@ -701,10 +701,12 @@ static int asoc_simple_probe(struct platform_device *pdev)struct snd_soc_dai_link *dai_link = priv->dai_link;struct simple_dai_props *dai_props = priv->dai_props; + ret = -EINVAL ; + cinfo = dev->platform_data;if (!cinfo) {dev_err (dev,"no info for asoc-simple-card\n" ); -return -EINVAL ; + goto err; } if (!cinfo->name ||
@@ -713,7 +715,7 @@ static int asoc_simple_probe(struct platform_device *pdev) !cinfo->platform || !cinfo->cpu_dai.name) {dev_err (dev,"insufficient asoc_simple_card_info settings\n" ); -return -EINVAL ; + goto err; } cpus = dai_link->cpus;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 3/88 coresight: tmc-etr: Disable warnings for allocation failures
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
[ Upstream commit e5028011885a85032aa3c1b7e3e493bcdacb4a0a ]
Running the following command on Juno triggers the warning:
$ perf record -e cs_etm// -m ,128M ...
------------[ cut here ]------------ WARNING: CPU: 1 PID: 412 at mm/page_alloc.c:4453 __alloc_pages+0x334/0x1420 CPU: 1 PID: 412 Comm: perf Not tainted 6.5.0-rc3+ #181 Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform, BIOS EDK II Feb 1 2019 pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __alloc_pages+0x334/0x1420 lr : dma_common_alloc_pages+0x108/0x138 sp : ffffffc087fb7440 x29: ffffffc087fb7440 x28: 0000000000000000 x27: ffffffc07e48fba0 x26: 0000000000000001 x25: 000000000000000f x24: ffffffc081f24880 x23: 0000000000000cc0 x22: ffffff88012b6f08 x21: 0000000008000000 x20: ffffff8801433000 x19: 0000000000000000 x18: 0000000000000000 x17: ffffffc080316e5c x16: ffffffc07e46406c x15: ffffffc0803af580 x14: ffffffc08036b460 x13: ffffffc080025cbc x12: ffffffb8108c3fc4 x11: 1ffffff8108c3fc3 x10: 1ffffff810ff6eac x9 : 00000000f204f204 x8 : 000000000000f204 x7 : 00000000f2f2f2f2 x6 : 00000000f3f3f3f3 x5 : 0000000000000001 x4 : 0000000000000000 x3 : 0000000000000000 x2 : 0000000000000cc0 x1 : 0000000000000000 x0 : ffffffc085333000 Call trace: __alloc_pages+0x334/0x1420 dma_common_alloc_pages+0x108/0x138 __dma_alloc_pages+0xf4/0x108 dma_alloc_pages+0x18/0x30 tmc_etr_alloc_flat_buf+0xa0/0x190 [coresight_tmc] tmc_alloc_etr_buf.constprop.0+0x124/0x298 [coresight_tmc] alloc_etr_buf.constprop.0.isra.0+0x88/0xc8 [coresight_tmc] tmc_alloc_etr_buffer+0x164/0x2f0 [coresight_tmc] etm_setup_aux+0x32c/0x520 [coresight] rb_alloc_aux+0x29c/0x3f8 perf_mmap+0x59c/0xce0 mmap_region+0x340/0x10e0 do_mmap+0x48c/0x580 vm_mmap_pgoff+0x160/0x248 ksys_mmap_pgoff+0x1e8/0x278 __arm64_sys_mmap+0x8c/0xb8
With the flat mode, we only attempt to allocate large memory if there is an IOMMU connected to the ETR. If the allocation fails, we always have a fallback path and return an error if nothing else worked. So, suppress the warning for flat mode allocations.
--- drivers/hwtracing/coresight/coresight-tmc-etr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-tmc-etr.c +2 -1
@@ -610,7 +610,8 @@ static int tmc_etr_alloc_flat_buf(struct tmc_drvdata *drvdata, flat_buf->vaddr =dma_alloc_noncoherent (real_dev, etr_buf->size, &flat_buf->daddr, -DMA_FROM_DEVICE ,GFP_KERNEL ); +DMA_FROM_DEVICE , +GFP_KERNEL | __GFP_NOWARN);if (!flat_buf->vaddr) {kfree (flat_buf);return -ENOMEM ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 4/88 ASoC: fsl-asoc-card: use integer type for fll_id and pll_id
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit 2b21207afd06714986a3d22442ed4860ba4f9ced ]
As the pll_id and pll_id can be zero (WM8960_SYSCLK_AUTO) with the commit 2bbc2df46e67 ("ASoC: wm8960: Make automatic the default clocking mode")
Then the machine driver will skip to call set_sysclk() and set_pll() for codec, when the sysclk rate is different with what wm8960 read at probe, the output sound frequency is wrong.
So change the fll_id and pll_id initial value, still keep machine driver's behavior same as before.
--- sound/soc/fsl/fsl-asoc-card.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
sound/soc/fsl/fsl-asoc-card.c +8 -4
@@ -52,8 +52,8 @@ struct codec_priv {unsigned long mclk_freq;unsigned long free_freq;u32 mclk_id; -u32 fll_id; -u32 pll_id; +int fll_id; +int pll_id; };/**
@@ -206,7 +206,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, }/* Specific configuration for PLL */ -if (codec_priv->pll_id && codec_priv->fll_id) { +if (codec_priv->pll_id >=0 && codec_priv->fll_id >=0 ) {if (priv->sample_format ==SNDRV_PCM_FORMAT_S24_LE ) pll_out = priv->sample_rate *384 ;else
@@ -248,7 +248,7 @@ static int fsl_asoc_card_hw_free(struct snd_pcm_substream *substream) priv->streams &= ~BIT (substream->stream); -if (!priv->streams && codec_priv->pll_id && codec_priv->fll_id) { +if (!priv->streams && codec_priv->pll_id >=0 && codec_priv->fll_id >=0 ) {/* Force freq to be free_freq to avoid error message in codec */ ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), codec_priv->mclk_id,
@@ -621,6 +621,10 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->card.dapm_routes = audio_map; priv->card.num_dapm_routes =ARRAY_SIZE (audio_map); priv->card.driver_name =DRIVER_NAME ; + + priv->codec_priv.fll_id =-1 ; + priv->codec_priv.pll_id =-1 ; +/* Diversify the card configurations */ if (of_device_is_compatible (np,"fsl,imx-audio-cs42888" )) { codec_dai_name ="cs42888" ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 5/88 ASoC: core: Do not call link_exit() on uninitialized rtd objects
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amadeusz Sławiński <[email protected]>
[ Upstream commit dd9f9cc1e6b9391140afa5cf27bb47c9e2a08d02 ]
On init we have sequence:
for_each_card_prelinks(card, i, dai_link) {
ret = snd_soc_add_pcm_runtime(card, dai_link);
ret = init_some_other_things(...);
if (ret)
goto probe_end:
for_each_card_rtds(card, rtd) {
ret = soc_init_pcm_runtime(card, rtd);probe_end:
while on exit:
for_each_card_rtds(card, rtd) snd_soc_link_exit(rtd);
If init_some_other_things() step fails due to error we end up with not fully setup rtds and try to call snd_soc_link_exit on them, which depending on contents on .link_exit handler, can end up dereferencing NULL pointer.
--- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)
include/sound/soc.h +2 -0
@@ -1125,6 +1125,8 @@ struct snd_soc_pcm_runtime { unsigned int pop_wait:1; unsigned int fe_compr:1; /* for Dynamic PCM */ +bool initialized; +int num_components;struct snd_soc_component *components[];/* CPU/Codec/Platform */ };
sound/soc/soc-core.c +15 -5
@@ -1259,7 +1259,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,snd_soc_runtime_get_dai_fmt (rtd); ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt);if (ret) -return ret; + goto err;/* add DPCM sysfs entries */ soc_dpcm_debugfs_add (rtd);
@@ -1284,17 +1284,26 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,/* create compress_device if possible */ ret =snd_soc_dai_compress_new (cpu_dai, rtd, num);if (ret != -ENOTSUPP ) -return ret; + goto err;/* create the pcm */ ret =soc_new_pcm (rtd, num);if (ret <0 ) {dev_err (card->dev,"ASoC: can't create pcm %s :%d\n" , dai_link->stream_name, ret); -return ret; + goto err; } -return snd_soc_pcm_dai_new (rtd); + ret =snd_soc_pcm_dai_new (rtd); +if (ret <0 ) + goto err; + + rtd->initialized = true; + +return 0 ; +err: +snd_soc_link_exit (rtd); +return ret; } static void soc_set_name_prefix(struct snd_soc_card *card,
@@ -1892,7 +1901,8 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)/* release machine specific resources */ for_each_card_rtds (card, rtd) -snd_soc_link_exit (rtd); +if (rtd->initialized) +snd_soc_link_exit (rtd);/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 6/88 ASoC: tlv320adc3xxx: BUG: Correct micbias setting
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoine Gennart <[email protected]>
[ Upstream commit e930bea4124b8a4a47ba4092d99da30099b9242d ]
The micbias setting for tlv320adc can also have the value '3' which means that the micbias ouput pin is connected to the input pin AVDD.
--- sound/soc/codecs/tlv320adc3xxx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/tlv320adc3xxx.c +2 -2
@@ -293,7 +293,7 @@#define ADC3XXX_BYPASS_RPGA 0x80/* MICBIAS control bits */ -#define ADC3XXX_MICBIAS_MASK 0x2 +#define ADC3XXX_MICBIAS_MASK 0x3#define ADC3XXX_MICBIAS1_SHIFT 5#define ADC3XXX_MICBIAS2_SHIFT 3
@@ -1099,7 +1099,7 @@ static int adc3xxx_parse_dt_micbias(struct adc3xxx *adc3xxx,unsigned int val;if (!of_property_read_u32 (np, propname, &val)) { -if (val >=ADC3XXX_MICBIAS_AVDD ) { +if (val >ADC3XXX_MICBIAS_AVDD ) {dev_err (dev,"Invalid property value for '%s'\n" , propname);return -EINVAL ; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 7/88 net: sched: cls_u32: Fix allocation size in u32_init()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
[ Upstream commit c4d49196ceec80e30e8d981410d73331b49b7850 ]
commit d61491a51f7e ("net/sched: cls_u32: Replace one-element array with flexible-array member") incorrecly replaced an instance of sizeof(*tp_c) with struct_size(tp_c, hlist->ht, 1). This results in a an over-allocation of 8 bytes.
This change is wrong because hlist in struct tc_u_common is a pointer:
net/sched/cls_u32.c:
struct tc_u_common {
struct tc_u_hnode __rcu *hlist;
void *ptr;
int refcnt;
struct idr handle_idr;
struct hlist_node hnode;
long knodes;
};So, the use of struct_size() makes no sense: we don't need to allocate any extra space for a flexible-array member. sizeof(*tp_c) is just fine.
So, struct_size(tp_c, hlist->ht, 1) translates to:
sizeof(*tp_c) + sizeof(tp_c->hlist->ht) == sizeof(struct tc_u_common) + sizeof(struct tc_u_knode *) ==
144 + 8 == 0x98 (byes) ^^^ | unnecessary extra allocation size
$ pahole -C tc_u_common net/sched/cls_u32.o
struct tc_u_common {
struct tc_u_hnode * hlist; /* 0 8 */
void * ptr; /* 8 8 */
int refcnt; /* 16 4 *//* XXX 4 bytes hole, try to pack */ struct idr handle_idr; /* 24 96 */ /* --- cacheline 1 boundary (64 bytes) was 56 bytes ago --- */ struct hlist_node hnode; /* 120 16 */ /* --- cacheline 2 boundary (128 bytes) was 8 bytes ago --- */ long int knodes; /* 136 8 */ /* size: 144, cachelines: 3, members: 6 */ /* sum members: 140, holes: 1, sum holes: 4 */ /* last cacheline: 16 bytes */ };
And with sizeof(*tp_c), we have:
sizeof(*tp_c) == sizeof(struct tc_u_common) == 144 == 0x90 (bytes)
which is the correct and original allocation size.
Fix this issue by replacing struct_size(tp_c, hlist->ht, 1) with sizeof(*tp_c), and avoid allocating 8 too many bytes.
The following difference in binary output is expected and reflects the desired change:
| net/sched/cls_u32.o | @@ -6148,7 +6148,7 @@ | include/linux/slab.h:599 | 2cf5: mov 0x0(%rip),%rdi # 2cfc <u32_init+0xfc> | 2cf8: R_X86_64_PC32 kmalloc_caches+0xc |- 2cfc: mov $0x98,%edx |+ 2cfc: mov $0x90,%edx
--- net/sched/cls_u32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/cls_u32.c +1 -1
@@ -366,7 +366,7 @@ static int u32_init(struct tcf_proto *tp)idr_init (&root_ht->handle_idr);if (tp_c ==NULL ) { - tp_c =kzalloc (struct_size (tp_c, hlist->ht,1 ),GFP_KERNEL ); + tp_c =kzalloc (sizeof (*tp_c),GFP_KERNEL );if (tp_c ==NULL ) {kfree (root_ht);return -ENOBUFS ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 8/88 arm64: dts: imx93: add the Flex-CAN stop mode by GPR
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haibo Chen <[email protected]>
[ Upstream commit 23ed2be5404da7cee6a519fa69bf22d0f69da4e4 ]
imx93 A0 chip use the internal q-channel handshake signal in LPCG and CCM to automatically handle the Flex-CAN stop mode. But this method meet issue when do the system PM stress test. IC can't fix it easily. So in the new imx93 A1 chip, IC drop this method, and involve back the old way,use the GPR method to trigger the Flex-CAN stop mode signal. Now NXP claim to drop imx93 A0, and only support imx93 A1. So here add the stop mode through GPR.
This patch also fix a typo for aonmix_ns_gpr.
--- arch/arm64/boot/dts/freescale/imx93.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/freescale/imx93.dtsi +3 -1
@@ -146,7 +146,7 @@ #size-cells = <1>; ranges; - anomix_ns_gpr: syscon@44210000 { + aonmix_ns_gpr: syscon@44210000 { compatible = "fsl,imx93-aonmix-ns-syscfg", "syscon"; reg = <0x44210000 0x1000>; };
@@ -280,6 +280,7 @@ assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; assigned-clock-rates = <40000000>; fsl,clk-source = /bits/ 8 <0>; + fsl,stop-mode = <&aonmix_ns_gpr 0x14 0>; status = "disabled"; };
@@ -532,6 +533,7 @@ assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; assigned-clock-rates = <40000000>; fsl,clk-source = /bits/ 8 <0>; + fsl,stop-mode = <&wakeupmix_gpr 0x0c 2>; status = "disabled"; };
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 9/88 can: flexcan: remove the auto stop mode for IMX93
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haibo Chen <[email protected]>
[ Upstream commit 63ead535570f13d0e06fda3f2d020c8f5394e998 ]
IMX93 A0 chip involve the internal q-channel handshake in LPCG and CCM to automatically handle the Flex-CAN IPG STOP signal. Only after FLEX-CAN enter stop mode then can support the self-wakeup feature. But meet issue when do the continue system PM stress test. When config the CAN as wakeup source, the first time after system suspend, any data on CAN bus can wakeup the system, this is as expect. But the second time when system suspend, data on CAN bus can't wakeup the system. If continue this test, we find in odd time system enter suspend, CAN can wakeup the system, but in even number system enter suspend, CAN can't wakeup the system. IC find a bug in the auto stop mode logic, and can't fix it easily. So for the new imx93 A1, IC drop the auto stop mode and involve the GPR to support stop mode (used before). IC define a bit in GPR which can trigger the IPG STOP signal to Flex-CAN, let it go into stop mode. And NXP claim to drop IMX93 A0, and only support IMX93 A1. So this patch remove the auto stop mode, and add flag FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR to imx93.
--- drivers/net/can/flexcan/flexcan-core.c | 46 ++++++++------------------ drivers/net/can/flexcan/flexcan.h | 2 -- 2 files changed, 13 insertions(+), 35 deletions(-)
drivers/net/can/flexcan/flexcan-core.c +13 -33
@@ -348,7 +348,7 @@ static struct flexcan_devtype_data fsl_imx8mp_devtype_data = {static struct flexcan_devtype_data fsl_imx93_devtype_data = { .quirks =FLEXCAN_QUIRK_DISABLE_RXFG |FLEXCAN_QUIRK_ENABLE_EACEN_RRS |FLEXCAN_QUIRK_DISABLE_MECR |FLEXCAN_QUIRK_USE_RX_MAILBOX | -FLEXCAN_QUIRK_BROKEN_PERR_STATE |FLEXCAN_QUIRK_AUTO_STOP_MODE | +FLEXCAN_QUIRK_BROKEN_PERR_STATE |FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR |FLEXCAN_QUIRK_SUPPORT_FD |FLEXCAN_QUIRK_SUPPORT_ECC |FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR ,
@@ -544,11 +544,6 @@ static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv) }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR ) {regmap_update_bits (priv->stm.gpr, priv->stm.req_gpr,1 << priv->stm.req_bit,1 << priv->stm.req_bit); - }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) { -/* For the auto stop mode, software do nothing, hardware will cover -* all the operation automatically after system go into low power mode. -*/ -return 0 ; }return flexcan_low_power_enter_ack (priv);
@@ -574,12 +569,6 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) reg_mcr &= ~FLEXCAN_MCR_SLF_WAK ; priv->write (reg_mcr, ®s->mcr); -/* For the auto stop mode, hardware will exist stop mode -* automatically after system go out of low power mode. -*/ -if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) -return 0 ; -return flexcan_low_power_exit_ack (priv); }
@@ -1994,13 +1983,18 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev) ret =flexcan_setup_stop_mode_scfw (pdev); else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) ret =flexcan_setup_stop_mode_gpr (pdev); - else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_AUTO_STOP_MODE) - ret =0 ; else/* return 0 directly if doesn't support stop mode feature */ return 0; -if (ret) +/* If ret is -EINVAL, this means SoC claim to support stop mode, but +* dts file lack the stop mode property definition. For this case, +* directly return 0, this will skip the wakeup capable setting and +* will not block the driver probe. +*/ +if (ret == -EINVAL ) +return 0 ; +else if (ret)return ret;device_set_wakeup_capable (&pdev->dev, true);
@@ -2320,16 +2314,8 @@ static int __maybe_unused flexcan_noirq_suspend(struct device *device)if (netif_running (dev)) {int err; -if (device_may_wakeup (device)) { +if (device_may_wakeup (device))flexcan_enable_wakeup_irq (priv, true); -/* For auto stop mode, need to keep the clock on before -* system go into low power mode. After system go into -* low power mode, hardware will config the flexcan into -* stop mode, and gate off the clock automatically. -*/ -if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) -return 0 ; - } err =pm_runtime_force_suspend (device);if (err)
@@ -2347,15 +2333,9 @@ static int __maybe_unused flexcan_noirq_resume(struct device *device)if (netif_running (dev)) {int err; -/* For the wakeup in auto stop mode, no need to gate on the -* clock here, hardware will do this automatically. -*/ -if (!(device_may_wakeup (device) && - priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE )) { - err =pm_runtime_force_resume (device); -if (err) -return err; - } + err =pm_runtime_force_resume (device); +if (err) +return err;if (device_may_wakeup (device))flexcan_enable_wakeup_irq (priv, false);
drivers/net/can/flexcan/flexcan.h +0 -2
@@ -68,8 +68,6 @@#define FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR BIT(15)/* Device supports RX via FIFO */ #define FLEXCAN_QUIRK_SUPPORT_RX_FIFO BIT(16) -/* auto enter stop mode to support wakeup */ -#define FLEXCAN_QUIRK_AUTO_STOP_MODE BIT(17)struct flexcan_devtype_data {u32 quirks;/* quirks needed for different IP cores */
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainercover 6.5.11-rc1 review
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.5.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.5.11-rc1
Mark Hasemeyer <[email protected]>
ASoC: SOF: sof-pci-dev: Fix community key quirk detection
Mark Hasemeyer <[email protected]>
ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection
Tony Lindgren <[email protected]>
serial: core: Fix runtime PM handling for pending tx
Siddharth Vadapalli <[email protected]>
misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP device support
Francesco Dolcini <[email protected]>
dt-bindings: serial: rs485: Add rs485-rts-active-high
Cameron Williams <[email protected]>
tty: 8250: Add Brainboxes Oxford Semiconductor-based quirks
Cameron Williams <[email protected]>
tty: 8250: Add support for Intashield IX cards
Cameron Williams <[email protected]>
tty: 8250: Add support for additional Brainboxes PX cards
Cameron Williams <[email protected]>
tty: 8250: Fix up PX-803/PX-857
Cameron Williams <[email protected]>
tty: 8250: Fix port count of PX-257
Cameron Williams <[email protected]>
tty: 8250: Add support for Intashield IS-100
Cameron Williams <[email protected]>
tty: 8250: Add support for Brainboxes UP cards
Cameron Williams <[email protected]>
tty: 8250: Add support for additional Brainboxes UC cards
Cameron Williams <[email protected]>
tty: 8250: Remove UC-257 and UC-431
Daniel Starke <[email protected]>
tty: n_gsm: fix race condition in status line change on dead connections
Janne Grunau <[email protected]>
Bluetooth: hci_bcm4377: Mark bcm4378/bcm4387 as BROKEN_LE_CODED
Andrey Konovalov <[email protected]>
usb: raw-gadget: properly handle interrupted requests
Jimmy Hu <[email protected]>
usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
Badhri Jagan Sridharan <[email protected]>
usb: typec: tcpm: Add additional checks for contaminant
LihaSika <[email protected]>
usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility
Vicki Pfau <[email protected]>
PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device
Max McCarthy <[email protected]>
ALSA: usb-audio: add quirk flag to enable native DSD for McIntosh devices
Liam R. Howlett <[email protected]>
mmap: fix error paths with dup_anon_vma()
Liam R. Howlett <[email protected]>
mmap: fix vma_iterator in error path of vma_merge()
Ian Rogers <[email protected]>
perf evlist: Avoid frequency mode for the dummy event
Kai-Heng Feng <[email protected]>
power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint
Benno Lossin <[email protected]>
rust: types: make Opaque be !Unpin
Alice Ryhl <[email protected]>
rust: make UnsafeCell the outer type in Opaque
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Don't use fsleep for PSR exit waits
Al Viro <[email protected]>
ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock
Al Viro <[email protected]>
io_uring: kiocb_done() should *not* trust ->ki_pos if ->{read,write}_iter() failedMichael Ellerman <[email protected]>
powerpc/mm: Fix boot crash with FLATMEM
Douglas Anderson <[email protected]>
r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en()
Douglas Anderson <[email protected]>
r8152: Check for unplug in rtl_phy_patch_request()
Su Hui <[email protected]>
net: chelsio: cxgb4: add an error code check in t4_load_phy_fw
Jisheng Zhang <[email protected]>
riscv: dts: thead: set dma-noncoherent to soc bus
Felix Kuehling <[email protected]>
drm/amdgpu: Reserve fences for VM update
Liming Sun <[email protected]>
platform/mellanox: mlxbf-tmfifo: Fix a warning message
Phil Sutter <[email protected]>
netfilter: nf_tables: audit log object reset once per table
Icenowy Zheng <[email protected]>
LoongArch: Disable WUC for pgprot_writecombine() like ioremap_wc()
Huacai Chen <[email protected]>
LoongArch: Replace kmap_atomic() with kmap_local_page() in copy_user_highpage()
Huacai Chen <[email protected]>
LoongArch: Export symbol invalid_pud_table for modules building
Tiezhu Yang <[email protected]>
LoongArch: Use SYM_CODE_* to annotate exception handlers
Luben Tuikov <[email protected]>
gpu/drm: Eliminate DRM_SCHED_PRIORITY_UNSET
Luben Tuikov <[email protected]>
drm/amdgpu: Unset context priority is now invalid
David Rau <[email protected]>
ASoC: da7219: Correct the process of setting up Gnd switch in AAD
Tomas Henzl <[email protected]>
scsi: mpt3sas: Fix in error path
Jorge Maidana <[email protected]>
fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit()
Dan Carpenter <[email protected]>
fbdev: omapfb: fix some error codes
Karolina Stolarek <[email protected]>
drm/ttm: Reorder sys manager cleanup step
Vasily Gorbik <[email protected]>
s390/kasan: handle DCSS mapping in memory holes
Roy Chateau <[email protected]>
ASoC: codecs: tas2780: Fix log of failed reset via I2C.
Shuming Fan <[email protected]>
ASoC: rt5650: fix the wrong result of key button
Kuan-Wei Chiu <[email protected]>
efi: fix memory leak in krealloc failure handling
Nikolay Borisov <[email protected]>
x86/efistub: Don't try to print after ExitBootService()
Vlad Buslov <[email protected]>
net/mlx5: Bridge, fix peer entry ageing in LAG mode
Florian Westphal <[email protected]>
netfilter: nfnetlink_log: silence bogus compiler warning
Krzysztof Kozlowski <[email protected]>
ASoC: soc-dapm: Add helper for comparing widget name
William A. Kennington III <[email protected]>
spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0
Su Hui <[email protected]>
fs/ntfs3: Avoid possible memory leak
Gabriel Marcano <[email protected]>
fs/ntfs3: Fix directory element type detection
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix NULL pointer dereference on error in attr_allocate_frame()
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr()
Konstantin Komarov <[email protected]>
fs/ntfs3: Do not allow to change label if volume is read-only
Konstantin Komarov <[email protected]>
fs/ntfs3: Add more info into /proc/fs/ntfs3/<dev>/volinfo
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix alternative boot searching
Konstantin Komarov <[email protected]>
fs/ntfs3: Add more attributes checks in mi_enum_attr()
Konstantin Komarov <[email protected]>
fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN)
Konstantin Komarov <[email protected]>
fs/ntfs3: Write immediately updated ntfs state
Konstantin Komarov <[email protected]>
fs/ntfs3: Add ckeck in ni_update_parent()
Arnd Bergmann <[email protected]>
fbdev: atyfb: only use ioremap_uc() on i386 and ia64
Dmitry Torokhov <[email protected]>
Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport
Ondrej Jirman <[email protected]>
media: i2c: ov8858: Don't set fwnode in the driver
Christophe Leroy <[email protected]>
powerpc/85xx: Fix math emulation exception
Ondrej Zary <[email protected]>
ata: pata_parport: fit3: implement IDE command set registers
Ondrej Zary <[email protected]>
ata: pata_parport: add custom version of wait_after_reset
Zhang Shurong <[email protected]>
dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe
Ben Wolsieffer <[email protected]>
irqchip/stm32-exti: add missing DT IRQ flag translation
Anup Patel <[email protected]>
irqchip/riscv-intc: Mark all INTC nodes as initialized
Haibo Chen <[email protected]>
can: flexcan: remove the auto stop mode for IMX93
Haibo Chen <[email protected]>
arm64: dts: imx93: add the Flex-CAN stop mode by GPR
Gustavo A. R. Silva <[email protected]>
net: sched: cls_u32: Fix allocation size in u32_init()
Antoine Gennart <[email protected]>
ASoC: tlv320adc3xxx: BUG: Correct micbias setting
Amadeusz Sławiński <[email protected]>
ASoC: core: Do not call link_exit() on uninitialized rtd objects
Shengjiu Wang <[email protected]>
ASoC: fsl-asoc-card: use integer type for fll_id and pll_id
Suzuki K Poulose <[email protected]>
coresight: tmc-etr: Disable warnings for allocation failures
Kuninori Morimoto <[email protected]>
ASoC: simple-card: fixup asoc_simple_probe() error handling
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: sof_sdw: add support for SKU 0B14
-------------
Diffstat:
.../devicetree/bindings/serial/rs485.yaml | 4 + Makefile | 4 +- arch/arm64/boot/dts/freescale/imx93.dtsi | 4 +- arch/loongarch/include/asm/io.h | 5 +- arch/loongarch/include/asm/linkage.h | 8 + arch/loongarch/include/asm/pgtable-bits.h | 4 +- arch/loongarch/kernel/entry.S | 4 +- arch/loongarch/kernel/genex.S | 16 +- arch/loongarch/kernel/setup.c | 10 +- arch/loongarch/mm/init.c | 9 +- arch/loongarch/mm/tlbex.S | 36 +-- arch/powerpc/kernel/head_85xx.S | 2 +- arch/powerpc/kernel/setup-common.c | 2 + arch/powerpc/mm/mem.c | 1 - arch/riscv/boot/dts/thead/th1520.dtsi | 1 + arch/s390/boot/vmem.c | 7 +- drivers/ata/pata_parport/fit3.c | 14 +- drivers/ata/pata_parport/pata_parport.c | 68 ++++- drivers/bluetooth/hci_bcm4377.c | 5 + drivers/dma/ste_dma40.c | 1 + drivers/firmware/efi/efi.c | 8 +- drivers/firmware/efi/libstub/x86-stub.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 +- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 +- drivers/gpu/drm/ttm/ttm_device.c | 8 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 3 +- drivers/input/mouse/synaptics.c | 1 + drivers/input/rmi4/rmi_smbus.c | 50 ++-- drivers/irqchip/irq-riscv-intc.c | 10 +- drivers/irqchip/irq-stm32-exti.c | 1 + drivers/media/i2c/ov8858.c | 10 +- drivers/misc/pci_endpoint_test.c | 4 + drivers/net/can/flexcan/flexcan-core.c | 46 +-- drivers/net/can/flexcan/flexcan.h | 2 - drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 11 + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 25 +- .../net/ethernet/mellanox/mlx5/core/esw/bridge.h | 3 + .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 1 + drivers/net/usb/r8152.c | 7 + drivers/pci/quirks.c | 8 +- drivers/platform/mellanox/mlxbf-tmfifo.c | 21 +- drivers/power/supply/power_supply_core.c | 8 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +- drivers/spi/spi-npcm-fiu.c | 5 +- drivers/tty/n_gsm.c | 2 + drivers/tty/serial/8250/8250_pci.c | 327 ++++++++++++++++++++- drivers/tty/serial/serial_core.c | 2 +- drivers/usb/gadget/legacy/raw_gadget.c | 26 +- drivers/usb/storage/unusual_cypress.h | 2 +- drivers/usb/typec/tcpm/tcpm.c | 5 + drivers/video/fbdev/aty/atyfb_base.c | 4 + drivers/video/fbdev/omap/omapfb_main.c | 4 +- drivers/video/fbdev/uvesafb.c | 2 +- fs/ceph/mds_client.c | 2 +- fs/ntfs3/attrib.c | 6 +- fs/ntfs3/attrlist.c | 15 +- fs/ntfs3/bitmap.c | 3 +- fs/ntfs3/dir.c | 6 +- fs/ntfs3/frecord.c | 8 +- fs/ntfs3/fslog.c | 6 +- fs/ntfs3/fsntfs.c | 13 +- fs/ntfs3/record.c | 68 ++++- fs/ntfs3/super.c | 33 ++- include/drm/gpu_scheduler.h | 3 +- include/linux/pci_ids.h | 1 + include/linux/power_supply.h | 2 +- include/sound/soc-dapm.h | 1 + include/sound/soc.h | 2 + io_uring/rw.c | 2 +- mm/mmap.c | 40 ++- net/netfilter/nf_tables_api.c | 50 ++-- net/netfilter/nfnetlink_log.c | 2 +- net/sched/cls_u32.c | 2 +- rust/kernel/types.rs | 21 +- sound/hda/intel-dsp-config.c | 6 + sound/soc/codecs/da7219-aad.c | 11 +- sound/soc/codecs/rt5645.c | 2 + sound/soc/codecs/tas2780.c | 2 +- sound/soc/codecs/tlv320adc3xxx.c | 4 +- sound/soc/fsl/fsl-asoc-card.c | 12 +- sound/soc/generic/simple-card.c | 6 +- sound/soc/intel/boards/sof_sdw.c | 10 + sound/soc/soc-component.c | 1 + sound/soc/soc-core.c | 20 +- sound/soc/soc-dapm.c | 12 + sound/soc/sof/sof-pci-dev.c | 7 + sound/usb/quirks.c | 2 + tools/perf/util/evlist.c | 5 +- tools/testing/selftests/netfilter/nft_audit.sh | 46 +++ 92 files changed, 973 insertions(+), 297 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 14/88 ata: pata_parport: fit3: implement IDE command set registers
6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Zary <[email protected]>
[ Upstream commit 0c1e81d0b5ebd5813536dd5fcf5966ad043f37dc ]
fit3 protocol driver does not support accessing IDE control registers (device control/altstatus). The DOS driver does not use these registers either (as observed from DOSEMU trace). But the HW seems to be capable of accessing these registers - I simply tried bit 3 and it works!
The control register is required to properly reset ATAPI devices or they will be detected only once (after a power cycle).
Tested with EXP Computer CD-865 with MC-1285B EPP cable and TransDisk 3000.
--- drivers/ata/pata_parport/fit3.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/ata/pata_parport/fit3.c +2 -12
@@ -9,11 +9,6 @@* * The TD-2000 and certain older devices use a different protocol. * Try the fit2 protocol module with them. -* -* NB: The FIT adapters do not appear to support the control -* registers. So, we map ALT_STATUS to STATUS and NO-OP writes -* to the device control register - this means that IDE reset -* will not work on these devices. */ #include <linux/module.h>
@@ -37,8 +32,7 @@static void fit3_write_regr (struct pi_adapter *pi,int cont,int regr,int val) { -if (cont ==1 ) -return ; + regr += cont <<3 ;switch (pi->mode) {case 0 :
@@ -59,11 +53,7 @@ static int fit3_read_regr(struct pi_adapter *pi, int cont, int regr) {int a, b; -if (cont) { -if (regr !=6 ) -return 0xff ; - regr =7 ; - } + regr += cont <<3 ;switch (pi->mode) {case 0 :
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 23/88 fs/ntfs3: Fix alternative boot searching
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit dcc852e509a4cba0ac6ac734077cef260e4e0fe6 ]
--- fs/ntfs3/super.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/ntfs3/super.c +7 -3
@@ -838,7 +838,7 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,struct ntfs_sb_info *sbi = sb->s_fs_info;int err;u32 mb, gb, boot_sector_size, sct_per_clst, record_size; -u64 sectors, clusters, mlcn, mlcn2; +u64 sectors, clusters, mlcn, mlcn2, dev_size0;struct NTFS_BOOT *boot;struct buffer_head *bh;struct MFT_REC *rec;
@@ -847,6 +847,9 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,u32 boot_off =0 ;const char *hint ="Primary boot" ; +/* Save original dev_size. Used with alternative boot. */ + dev_size0 = dev_size; + sbi->volume.blocks = dev_size >>PAGE_SHIFT ; bh =ntfs_bread (sb,0 );
@@ -1084,9 +1087,9 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size, } out: -if (err == -EINVAL && !bh->b_blocknr && dev_size >PAGE_SHIFT ) { +if (err == -EINVAL && !bh->b_blocknr && dev_size0 >PAGE_SHIFT ) {u32 block_size =min_t (u32, sector_size,PAGE_SIZE ); -u64 lbo = dev_size -sizeof (*boot); +u64 lbo = dev_size0 -sizeof (*boot);/* * Try alternative boot (last sector)
@@ -1100,6 +1103,7 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size, boot_off = lbo & (block_size -1 ); hint ="Alternative boot" ; + dev_size = dev_size0;/* restore original size. */ goto check_boot; }brelse (bh);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 24/88 fs/ntfs3: Add more info into /proc/fs/ntfs3/<dev>/volinfo
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit d27e202b9ac416e52093edf8789614d93dbd6231 ]
--- fs/ntfs3/super.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
fs/ntfs3/super.c +11 -3
@@ -453,15 +453,23 @@ static struct proc_dir_entry *proc_info_root;* ntfs3.1 * cluster size * number of clusters +* total number of mft records +* number of used mft records ~= number of files + folders +* real state of ntfs "dirty"/"clean" +* current state of ntfs "dirty"/"clean" */ static int ntfs3_volinfo (struct seq_file *m,void *o) {struct super_block *sb = m->private;struct ntfs_sb_info *sbi = sb->s_fs_info; -seq_printf (m,"ntfs%d.%d\n%u\n%zu\n" , sbi->volume.major_ver, - sbi->volume.minor_ver, sbi->cluster_size, - sbi->used.bitmap.nbits); +seq_printf (m,"ntfs%d.%d\n%u\n%zu\n\%zu\n%zu\n%s\n%s\n" , + sbi->volume.major_ver, sbi->volume.minor_ver, + sbi->cluster_size, sbi->used.bitmap.nbits, + sbi->mft.bitmap.nbits, + sbi->mft.bitmap.nbits -wnd_zeroes (&sbi->mft.bitmap), + sbi->volume.real_dirty ?"dirty" :"clean" , + (sbi->volume.flags &VOLUME_FLAG_DIRTY ) ?"dirty" :"clean" );return 0 ; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 25/88 fs/ntfs3: Do not allow to change label if volume is read-only
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit e52dce610a2d53bf2b5e94a8843c71cb73a91ea5 ]
--- fs/ntfs3/super.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/ntfs3/super.c +6 -1
@@ -498,7 +498,12 @@ static ssize_t ntfs3_label_write(struct file *file, const char __user *buffer,struct super_block *sb =pde_data (file_inode (file));struct ntfs_sb_info *sbi = sb->s_fs_info;ssize_t ret = count; -u8 *label =kmalloc (count,GFP_NOFS ); +u8 *label; + +if (sb_rdonly (sb)) +return -EROFS ; + + label =kmalloc (count,GFP_NOFS );if (!label)return -ENOMEM ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 26/88 fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit 32e9212256b88f35466642f9c939bb40cfb2c2de ]
--- fs/ntfs3/frecord.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ntfs3/frecord.c +1 -1
@@ -2148,7 +2148,7 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)for (i =0 ; i < pages_per_frame; i++) { pg = pages[i]; -if (i == idx) +if (i == idx || !pg)continue ;unlock_page (pg);put_page (pg);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 27/88 fs/ntfs3: Fix NULL pointer dereference on error in attr_allocate_frame()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit 9c689c8dc86f8ca99bf91c05f24c8bab38fe7d5f ]
--- fs/ntfs3/attrib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/ntfs3/attrib.c +2 -4
@@ -1736,10 +1736,8 @@ int attr_allocate_frame(struct ntfs_inode *ni, CLST frame, size_t compr_size, le_b =NULL ; attr_b =ni_find_attr (ni,NULL , &le_b,ATTR_DATA ,NULL ,0 ,NULL , &mi_b); -if (!attr_b) { - err = -ENOENT ; - goto out; - } +if (!attr_b) +return -ENOENT ; attr = attr_b; le = le_b;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 28/88 fs/ntfs3: Fix directory element type detection
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Marcano <[email protected]>
[ Upstream commit 85a4780dc96ed9dd643bbadf236552b3320fae26 ]
Calling stat() from userspace correctly identified junctions in an NTFS partition as symlinks, but using readdir() and iterating through the directory containing the same junction did not identify the junction as a symlink.
When emitting directory contents, check FILE_ATTRIBUTE_REPARSE_POINT attribute to detect junctions and report them as links.
--- fs/ntfs3/dir.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/ntfs3/dir.c +5 -1
@@ -309,7 +309,11 @@ static inline int ntfs_filldir(struct ntfs_sb_info *sbi, struct ntfs_inode *ni,return 0 ; } - dt_type = (fname->dup.fa &FILE_ATTRIBUTE_DIRECTORY ) ?DT_DIR :DT_REG ; +/* NTFS: symlinks are "dir + reparse" or "file + reparse" */ +if (fname->dup.fa &FILE_ATTRIBUTE_REPARSE_POINT ) + dt_type =DT_LNK ; +else + dt_type = (fname->dup.fa &FILE_ATTRIBUTE_DIRECTORY ) ?DT_DIR :DT_REG ;return !dir_emit (ctx, (s8 *)name, name_len, ino, dt_type); }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 29/88 fs/ntfs3: Avoid possible memory leak
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit e4494770a5cad3c9d1d2a65ed15d07656c0d9b82 ]
smatch warn:fs/ntfs3/fslog.c:2172 last_log_lsn() warn: possible memory leak of 'page_bufs' Jump to label 'out' to free 'page_bufs' and is more consistent with other code.
--- fs/ntfs3/fslog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/ntfs3/fslog.c +4 -2
@@ -2168,8 +2168,10 @@ static int last_log_lsn(struct ntfs_log *log)if (!page) { page =kmalloc (log->page_size,GFP_NOFS ); -if (!page) -return -ENOMEM ; +if (!page) { + err = -ENOMEM ; + goto out; + } }/*
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 30/88 spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: William A. Kennington III <[email protected]>
[ Upstream commit 2ec8b010979036c2fe79a64adb6ecc0bd11e91d1 ]
We don't want to use the value of ilog2(0) as dummy.buswidth is 0 when dummy.nbytes is 0. Since we have no dummy bytes, we don't need to configure the dummy byte bits per clock register value anyway.
--- drivers/spi/spi-npcm-fiu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi-npcm-fiu.c +3 -2
@@ -353,8 +353,9 @@ static int npcm_fiu_uma_read(struct spi_mem *mem, uma_cfg |=ilog2 (op->cmd.buswidth); uma_cfg |=ilog2 (op->addr.buswidth) <<NPCM_FIU_UMA_CFG_ADBPCK_SHIFT ; - uma_cfg |=ilog2 (op->dummy.buswidth) - <<NPCM_FIU_UMA_CFG_DBPCK_SHIFT ; +if (op->dummy.nbytes) + uma_cfg |=ilog2 (op->dummy.buswidth) + <<NPCM_FIU_UMA_CFG_DBPCK_SHIFT ; uma_cfg |=ilog2 (op->data.buswidth) <<NPCM_FIU_UMA_CFG_RDBPCK_SHIFT ; uma_cfg |= op->dummy.nbytes <<NPCM_FIU_UMA_CFG_DBSIZ_SHIFT ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 31/88 ASoC: soc-dapm: Add helper for comparing widget name
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 76aca10ccb7c23a7b7a0d56e0bfde2c8cdddfe24 ]
Some drivers use one event callback for multiple widgets but still need to perform a bit different actions based on actual widget. This is done by comparing widget name, however drivers tend to miss possible name prefix. Add a helper to solve common mistakes.
--- include/sound/soc-dapm.h | 1 + sound/soc/soc-component.c | 1 + sound/soc/soc-dapm.c | 12 ++++++++++++ 3 files changed, 14 insertions(+)
include/sound/soc-dapm.h +1 -0
@@ -423,6 +423,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);int snd_soc_dapm_update_dai (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai); +int snd_soc_dapm_widget_name_cmp (struct snd_soc_dapm_widget *widget,const char *s);/* dapm path setup */ int snd_soc_dapm_new_widgets (struct snd_soc_card *card);
sound/soc/soc-component.c +1 -0
@@ -242,6 +242,7 @@ int snd_soc_component_notify_control(struct snd_soc_component *component,char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ];struct snd_kcontrol *kctl; +/* When updating, change also snd_soc_dapm_widget_name_cmp() */ if (component->name_prefix)snprintf (name,ARRAY_SIZE (name),"%s %s" , component->name_prefix, ctl);else
sound/soc/soc-dapm.c +12 -0
@@ -2726,6 +2726,18 @@ int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream, }EXPORT_SYMBOL_GPL (snd_soc_dapm_update_dai); +int snd_soc_dapm_widget_name_cmp (struct snd_soc_dapm_widget *widget,const char *s) +{ +struct snd_soc_component *component =snd_soc_dapm_to_component (widget->dapm); +const char *wname = widget->name; + +if (component->name_prefix) + wname +=strlen (component->name_prefix) +1 ;/* plus space */ + +return strcmp (wname, s); +} +EXPORT_SYMBOL_GPL (snd_soc_dapm_widget_name_cmp); +/* * dapm_update_widget_flags() - Re-compute widget sink and source flags * @w: The widget for which to update the flags
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 32/88 netfilter: nfnetlink_log: silence bogus compiler warning
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 2e1d175410972285333193837a4250a74cd472e6 ]
net/netfilter/nfnetlink_log.c:800:18: warning: variable 'ctinfo' is uninitialized
The warning is bogus, the variable is only used if ct is non-NULL and always initialised in that case. Init to 0 too to silence this.
--- net/netfilter/nfnetlink_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nfnetlink_log.c +1 -1
@@ -700,8 +700,8 @@ nfulnl_log_packet(struct net *net,unsigned int plen =0 ;struct nfnl_log_net *log =nfnl_log_pernet (net);const struct nfnl_ct_hook *nfnl_ct =NULL ; +enum ip_conntrack_info ctinfo =0 ;struct nf_conn *ct =NULL ; -enum ip_conntrack_info ctinfo;if (li_user && li_user->type ==NF_LOG_TYPE_ULOG ) li = li_user;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 15/88 powerpc/85xx: Fix math emulation exception
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 8e8a12ecbc86700b5e1a3596ce2b3c43dafad336 ]
Booting mpc85xx_defconfig kernel on QEMU leads to:
Bad trap at PC: fe9bab0, SR: 2d000, vector=800
awk[82]: unhandled trap (5) at 0 nip fe9bab0 lr fe9e01c code 5 in libc-2.27.so[fe5a000+17a000] awk[82]: code: 3aa00000 3a800010 4bffe03c 9421fff0 7ca62b78 38a00000 93c10008 83c10008 awk[82]: code: 38210010 4bffdec8 9421ffc0 7c0802a6 <fc00048e> d8010008 4815190d 93810030 Trace/breakpoint trap
WARNING: no useful console
This is because allthough CONFIG_MATH_EMULATION is selected, Exception 800 calls unknown_exception().
Call emulation_assist_interrupt() instead.
--- arch/powerpc/kernel/head_85xx.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/head_85xx.S +1 -1
@@ -396,7 +396,7 @@ interrupt_base: #ifdef CONFIG_PPC_FPU FP_UNAVAILABLE_EXCEPTION #else - EXCEPTION(0x0800, FP_UNAVAIL, FloatingPointUnavailable, unknown_exception) + EXCEPTION(0x0800, FP_UNAVAIL, FloatingPointUnavailable, emulation_assist_interrupt) #endif /* System Call Interrupt */
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 33/88 net/mlx5: Bridge, fix peer entry ageing in LAG mode
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Buslov <[email protected]>
[ Upstream commit 7a3ce8074878a68a75ceacec93d9ae05906eec86 ]
With current implementation in single FDB LAG mode all packets are processed by eswitch 0 rules. As such, 'peer' FDB entries receive the packets for rules of other eswitches and are responsible for updating the main entry by sending SWITCHDEV_FDB_ADD_TO_BRIDGE notification from their background update wq task. However, this introduces a race condition when non-zero eswitch instance decides to delete a FDB entry, sends SWITCHDEV_FDB_DEL_TO_BRIDGE notification, but another eswitch's update task refreshes the same entry concurrently while its async delete work is still pending on the workque. In such case another SWITCHDEV_FDB_ADD_TO_BRIDGE event may be generated and entry will remain stuck in FDB marked as 'offloaded' since no more SWITCHDEV_FDB_DEL_TO_BRIDGE notifications are sent for deleting the peer entries.
Fix the issue by synchronously marking deleted entries with MLX5_ESW_BRIDGE_FLAG_DELETED flag and skipping them in background update job.
--- .../mellanox/mlx5/core/en/rep/bridge.c | 11 ++++++++ .../ethernet/mellanox/mlx5/core/esw/bridge.c | 25 ++++++++++++++++++- .../ethernet/mellanox/mlx5/core/esw/bridge.h | 3 +++ .../mellanox/mlx5/core/esw/bridge_priv.h | 1 + 4 files changed, 39 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c +11 -0
@@ -463,6 +463,17 @@ static int mlx5_esw_bridge_switchdev_event(struct notifier_block *nb,/* only handle the event on peers */ if (mlx5_esw_bridge_is_local (dev, rep, esw))break ; + + fdb_info =container_of (info, + struct switchdev_notifier_fdb_info, + info); +/* Mark for deletion to prevent the update wq task from +* spuriously refreshing the entry which would mark it again as +* offloaded in SW bridge. After this fallthrough to regular +* async delete code. +*/ +mlx5_esw_bridge_fdb_mark_deleted (dev, vport_num, esw_owner_vhca_id, br_offloads, + fdb_info); fallthrough;case SWITCHDEV_FDB_ADD_TO_DEVICE :case SWITCHDEV_FDB_DEL_TO_DEVICE :
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +24 -1
@@ -1748,6 +1748,28 @@ void mlx5_esw_bridge_fdb_update_used(struct net_device *dev, u16 vport_num, u16 entry->lastuse = jiffies; } +void mlx5_esw_bridge_fdb_mark_deleted (struct net_device *dev,u16 vport_num,u16 esw_owner_vhca_id, +struct mlx5_esw_bridge_offloads *br_offloads, +struct switchdev_notifier_fdb_info *fdb_info) +{ +struct mlx5_esw_bridge_fdb_entry *entry; +struct mlx5_esw_bridge *bridge; + + bridge =mlx5_esw_bridge_from_port_lookup (vport_num, esw_owner_vhca_id, br_offloads); +if (!bridge) +return ; + + entry =mlx5_esw_bridge_fdb_lookup (bridge, fdb_info->addr, fdb_info->vid); +if (!entry) { +esw_debug (br_offloads->esw->dev, +"FDB mark deleted entry with specified key not found (MAC=%pM,vid=%u,vport=%u)\n" , + fdb_info->addr, fdb_info->vid, vport_num); +return ; + } + + entry->flags |=MLX5_ESW_BRIDGE_FLAG_DELETED ; +} +void mlx5_esw_bridge_fdb_create (struct net_device *dev,u16 vport_num,u16 esw_owner_vhca_id,struct mlx5_esw_bridge_offloads *br_offloads,struct switchdev_notifier_fdb_info *fdb_info)
@@ -1810,7 +1832,8 @@ void mlx5_esw_bridge_update(struct mlx5_esw_bridge_offloads *br_offloads)unsigned long lastuse = (unsigned long )mlx5_fc_query_lastuse (entry->ingress_counter); -if (entry->flags &MLX5_ESW_BRIDGE_FLAG_ADDED_BY_USER ) +if (entry->flags & (MLX5_ESW_BRIDGE_FLAG_ADDED_BY_USER | +MLX5_ESW_BRIDGE_FLAG_DELETED ))continue ;if (time_after (lastuse, entry->lastuse))
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h +3 -0
@@ -62,6 +62,9 @@ int mlx5_esw_bridge_vport_peer_unlink(struct net_device *br_netdev, u16 vport_nuvoid mlx5_esw_bridge_fdb_update_used (struct net_device *dev,u16 vport_num,u16 esw_owner_vhca_id,struct mlx5_esw_bridge_offloads *br_offloads,struct switchdev_notifier_fdb_info *fdb_info); +void mlx5_esw_bridge_fdb_mark_deleted (struct net_device *dev,u16 vport_num,u16 esw_owner_vhca_id, +struct mlx5_esw_bridge_offloads *br_offloads, +struct switchdev_notifier_fdb_info *fdb_info);void mlx5_esw_bridge_fdb_create (struct net_device *dev,u16 vport_num,u16 esw_owner_vhca_id,struct mlx5_esw_bridge_offloads *br_offloads,struct switchdev_notifier_fdb_info *fdb_info);
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_priv.h +1 -0
@@ -133,6 +133,7 @@ struct mlx5_esw_bridge_mdb_key {enum {MLX5_ESW_BRIDGE_FLAG_ADDED_BY_USER =BIT (0 ),MLX5_ESW_BRIDGE_FLAG_PEER =BIT (1 ), +MLX5_ESW_BRIDGE_FLAG_DELETED =BIT (2 ), };enum {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 34/88 x86/efistub: Dont try to print after ExitBootService()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikolay Borisov <[email protected]>
[ Upstream commit ff07186b4d774ac22a5345d30763045af4569416 ]
setup_e820() is executed after UEFI's ExitBootService has been called. This causes the firmware to throw an exception because the Console IO protocol is supposed to work only during boot service environment. As per UEFI 2.9, section 12.1:
"This protocol is used to handle input and output of text-based information intended for the system user during the operation of code in the boot services environment."
So drop the diagnostic warning from this function. We might add back a warning that is issued later when initializing the kernel itself.
--- drivers/firmware/efi/libstub/x86-stub.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/firmware/efi/libstub/x86-stub.c +1 -4
@@ -648,11 +648,8 @@ setup_e820(struct boot_params *params, struct setup_data *e820ext, u32 e820ext_sbreak ;case EFI_UNACCEPTED_MEMORY : -if (!IS_ENABLED (CONFIG_UNACCEPTED_MEMORY )) { -efi_warn_once ( -"The system has unaccepted memory, but kernel does not support it\nConsider enabling CONFIG_UNACCEPTED_MEMORY\n" ); +if (!IS_ENABLED (CONFIG_UNACCEPTED_MEMORY ))continue ; - } e820_type =E820_TYPE_RAM ;process_unaccepted_memory (d->phys_addr, d->phys_addr +PAGE_SIZE * d->num_pages);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 35/88 efi: fix memory leak in krealloc failure handling
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Wei Chiu <[email protected]>
[ Upstream commit 0d3ad1917996839a5042d18f04e41915cfa1b74a ]
In the previous code, there was a memory leak issue where the previously allocated memory was not freed upon a failed krealloc operation. This patch addresses the problem by releasing the old memory before setting the pointer to NULL in case of a krealloc failure. This ensures that memory is properly managed and avoids potential memory leaks.
--- drivers/firmware/efi/efi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/firmware/efi/efi.c +6 -2
@@ -273,9 +273,13 @@ static __init int efivar_ssdt_load(void)if (status ==EFI_NOT_FOUND ) {break ; }else if (status ==EFI_BUFFER_TOO_SMALL ) { - name =krealloc (name, name_size,GFP_KERNEL ); -if (!name) +efi_char16_t *name_tmp = +krealloc (name, name_size,GFP_KERNEL ); +if (!name_tmp) { +kfree (name);return -ENOMEM ; + } + name = name_tmp;continue ; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 36/88 ASoC: rt5650: fix the wrong result of key button
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuming Fan <[email protected]>
[ Upstream commit f88dfbf333b3661faff996bb03af2024d907b76a ]
The RT5650 should enable a power setting for button detection to avoid the wrong result.
--- sound/soc/codecs/rt5645.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/rt5645.c +2 -0
@@ -3251,6 +3251,8 @@ int rt5645_set_jack_detect(struct snd_soc_component *component, RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ);regmap_update_bits (rt5645->regmap,RT5645_GEN_CTRL1 ,RT5645_DIG_GATE_CTRL ,RT5645_DIG_GATE_CTRL ); +regmap_update_bits (rt5645->regmap,RT5645_DEPOP_M1 , +RT5645_HP_CB_MASK ,RT5645_HP_CB_PU ); }rt5645_irq (0 , rt5645);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 37/88 ASoC: codecs: tas2780: Fix log of failed reset via I2C.
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roy Chateau <[email protected]>
[ Upstream commit 4e9a429ae80657bdc502d3f5078e2073656ec5fd ]
Correctly log failures of reset via I2C.
--- sound/soc/codecs/tas2780.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tas2780.c +1 -1
@@ -39,7 +39,7 @@ static void tas2780_reset(struct tas2780_priv *tas2780)usleep_range (2000 ,2050 ); } -snd_soc_component_write (tas2780->component,TAS2780_SW_RST , + ret =snd_soc_component_write (tas2780->component,TAS2780_SW_RST ,TAS2780_RST );if (ret) dev_err(tas2780->dev, "%s:errCode:0x%x Reset error!\n",
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 38/88 s390/kasan: handle DCSS mapping in memory holes
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasily Gorbik <[email protected]>
[ Upstream commit 327899674eef18f96644be87aa5510b7523fe4f6 ]
When physical memory is defined under z/VM using DEF STOR CONFIG, there may be memory holes that are not hotpluggable memory. In such cases, DCSS mapping could be placed in one of these memory holes. Subsequently, attempting memory access to such DCSS mapping would result in a kasan failure because there is no shadow memory mapping for it.
To maintain consistency with cases where DCSS mapping is positioned after the kernel identity mapping, which is then covered by kasan zero shadow mapping, handle the scenario above by populating zero shadow mapping for memory holes where DCSS mapping could potentially be placed.
--- arch/s390/boot/vmem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/s390/boot/vmem.c +6 -1
@@ -57,6 +57,7 @@ static void kasan_populate_shadow(void)pmd_t pmd_z =__pmd (__pa (kasan_early_shadow_pte) | _SEGMENT_ENTRY);pud_t pud_z =__pud (__pa (kasan_early_shadow_pmd) | _REGION3_ENTRY);p4d_t p4d_z =__p4d (__pa (kasan_early_shadow_pud) | _REGION2_ENTRY); +unsigned long memgap_start =0 ;unsigned long untracked_end;unsigned long start, end;int i;
@@ -101,8 +102,12 @@ static void kasan_populate_shadow(void)* +- shadow end ----+---------+- shadow end ---+ */ -for_each_physmem_usable_range (i, &start, &end) +for_each_physmem_usable_range (i, &start, &end) {kasan_populate (start, end,POPULATE_KASAN_MAP_SHADOW ); +if (memgap_start && physmem_info.info_source ==MEM_DETECT_DIAG260 ) +kasan_populate (memgap_start, start,POPULATE_KASAN_ZERO_SHADOW ); + memgap_start = end; + }if (IS_ENABLED (CONFIG_KASAN_VMALLOC )) { untracked_end =VMALLOC_START ;/* shallowly populate kasan shadow for vmalloc and modules */
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 39/88 drm/ttm: Reorder sys manager cleanup step
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karolina Stolarek <[email protected]>
[ Upstream commit 3b401e30c249849d803de6c332dad2a595a58658 ]
With the current cleanup flow, we could trigger a NULL pointer dereference if there is a delayed destruction of a BO with a system resource that gets executed on drain_workqueue() call, as we attempt to free a resource using an already released resource manager.
Remove the device from the device list and drain its workqueue before releasing the system domain manager in ttm_device_fini().
--- drivers/gpu/drm/ttm/ttm_device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/ttm/ttm_device.c +4 -4
@@ -232,10 +232,6 @@ void ttm_device_fini(struct ttm_device *bdev)struct ttm_resource_manager *man;unsigned i; - man =ttm_manager_type (bdev,TTM_PL_SYSTEM ); -ttm_resource_manager_set_used (man, false); -ttm_set_driver_manager (bdev,TTM_PL_SYSTEM ,NULL ); -mutex_lock (&ttm_global_mutex);list_del (&bdev->device_list);mutex_unlock (&ttm_global_mutex);
@@ -243,6 +239,10 @@ void ttm_device_fini(struct ttm_device *bdev)drain_workqueue (bdev->wq);destroy_workqueue (bdev->wq); + man =ttm_manager_type (bdev,TTM_PL_SYSTEM ); +ttm_resource_manager_set_used (man, false); +ttm_set_driver_manager (bdev,TTM_PL_SYSTEM ,NULL ); +spin_lock (&bdev->lru_lock);for (i =0 ; i <TTM_MAX_BO_PRIORITY ; ++i)if (list_empty (&man->lru[0 ]))
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 40/88 fbdev: omapfb: fix some error codes
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit dc608db793731426938baa2f0e75a4a3cce5f5cf ]
Return negative -ENXIO instead of positive ENXIO.
--- drivers/video/fbdev/omap/omapfb_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/omap/omapfb_main.c +2 -2
@@ -1648,13 +1648,13 @@ static int omapfb_do_probe(struct platform_device *pdev, } fbdev->int_irq =platform_get_irq (pdev,0 );if (fbdev->int_irq <0 ) { - r =ENXIO ; + r = -ENXIO ; goto cleanup; } fbdev->ext_irq =platform_get_irq (pdev,1 );if (fbdev->ext_irq <0 ) { - r =ENXIO ; + r = -ENXIO ; goto cleanup; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 41/88 fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jorge Maidana <[email protected]>
[ Upstream commit 1022e7e2f40574c74ed32c3811b03d26b0b81daf ]
Delete the v86d netlink only after all the VBE tasks have been completed.
Fixes initial state restore on module unload:
uvesafb: VBE state restore call failed (eax=0x4f04, err=-19)
--- drivers/video/fbdev/uvesafb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/uvesafb.c +1 -1
@@ -1931,10 +1931,10 @@ static void uvesafb_exit(void) } } -cn_del_callback (&uvesafb_cn_id);driver_remove_file (&uvesafb_driver.driver, &driver_attr_v86d);platform_device_unregister (uvesafb_device);platform_driver_unregister (&uvesafb_driver); +cn_del_callback (&uvesafb_cn_id); }module_exit (uvesafb_exit);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 42/88 scsi: mpt3sas: Fix in error path
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Henzl <[email protected]>
[ Upstream commit e40c04ade0e2f3916b78211d747317843b11ce10 ]
The driver should be deregistered as misc driver after PCI registration failure.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +3 -1
@@ -12913,8 +12913,10 @@ _mpt3sas_init(void)mpt3sas_ctl_init (hbas_to_enumerate); error =pci_register_driver (&mpt3sas_driver); -if (error) +if (error) { +mpt3sas_ctl_exit (hbas_to_enumerate);scsih_exit (); + }return error; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 16/88 media: i2c: ov8858: Dont set fwnode in the driver
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Jirman <[email protected]>
[ Upstream commit c46f16f156ac58afcf4addc850bb5dfbca77b9fc ]
This makes the driver work with the new check in v4l2_async_register_subdev() that was introduced recently in 6.6-rc1. Without this change, probe fails with:
ov8858 1-0036: Detected OV8858 sensor, revision 0xb2 ov8858 1-0036: sub-device fwnode is an endpoint! ov8858 1-0036: v4l2 async register subdev failed
ov8858: probe of 1-0036 failed with error -22
This also simplifies the driver a bit.
--- drivers/media/i2c/ov8858.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/media/i2c/ov8858.c +2 -8
@@ -1850,9 +1850,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858) } ret =v4l2_fwnode_endpoint_parse (endpoint, &vep); +fwnode_handle_put (endpoint);if (ret) {dev_err (dev,"Failed to parse endpoint: %d\n" , ret); -fwnode_handle_put (endpoint);return ret; }
@@ -1864,12 +1864,9 @@ static int ov8858_parse_of(struct ov8858 *ov8858)default :dev_err (dev,"Unsupported number of data lanes %u\n" , ov8858->num_lanes); -fwnode_handle_put (endpoint);return -EINVAL ; } - ov8858->subdev.fwnode = endpoint; -return 0 ; }
@@ -1913,7 +1910,7 @@ static int ov8858_probe(struct i2c_client *client) ret =ov8858_init_ctrls (ov8858);if (ret) - goto err_put_fwnode; +return ret; sd = &ov8858->subdev; sd->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE |V4L2_SUBDEV_FL_HAS_EVENTS ;
@@ -1964,8 +1961,6 @@ static int ov8858_probe(struct i2c_client *client)media_entity_cleanup (&sd->entity); err_free_handler:v4l2_ctrl_handler_free (&ov8858->ctrl_handler); -err_put_fwnode: -fwnode_handle_put (ov8858->subdev.fwnode);return ret; }
@@ -1978,7 +1973,6 @@ static void ov8858_remove(struct i2c_client *client)v4l2_async_unregister_subdev (sd);media_entity_cleanup (&sd->entity);v4l2_ctrl_handler_free (&ov8858->ctrl_handler); -fwnode_handle_put (ov8858->subdev.fwnode);pm_runtime_disable (&client->dev);if (!pm_runtime_status_suspended (&client->dev))
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 43/88 ASoC: da7219: Correct the process of setting up Gnd switch in AAD
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Rau <[email protected]>
[ Upstream commit e8ecffd9962fe051d53a0761921b26d653b3df6b ]
Enable Gnd switch to improve stability when Jack insert event occurs, and then disable Gnd switch after Jack type detection is finished.
--- sound/soc/codecs/da7219-aad.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
sound/soc/codecs/da7219-aad.c +5 -6
@@ -59,9 +59,6 @@ static void da7219_aad_btn_det_work(struct work_struct *work)bool micbias_up = false;int retries =0 ; -/* Disable ground switch */ -snd_soc_component_update_bits (component,0xFB ,0x01 ,0x00 ); -/* Drive headphones/lineout */ snd_soc_component_update_bits(component, DA7219_HP_L_CTRL, DA7219_HP_L_AMP_OE_MASK,
@@ -155,9 +152,6 @@ static void da7219_aad_hptest_work(struct work_struct *work) tonegen_freq_hptest =cpu_to_le16 (DA7219_AAD_HPTEST_RAMP_FREQ_INT_OSC ); } -/* Disable ground switch */ -snd_soc_component_update_bits (component,0xFB ,0x01 ,0x00 ); -/* Ensure gain ramping at fastest rate */ gain_ramp_ctrl =snd_soc_component_read (component,DA7219_GAIN_RAMP_CTRL );snd_soc_component_write (component,DA7219_GAIN_RAMP_CTRL ,DA7219_GAIN_RAMP_RATE_X8 );
@@ -421,6 +415,11 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data)* handle a removal, and we can check at the end of * hptest if we have a valid result or not. */ + +cancel_delayed_work_sync (&da7219_aad->jack_det_work); +/* Disable ground switch */ +snd_soc_component_update_bits (component,0xFB ,0x01 ,0x00 ); +if (statusa &DA7219_JACK_TYPE_STS_MASK ) { report |=SND_JACK_HEADSET ; mask |=SND_JACK_HEADSET |SND_JACK_LINEOUT ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 44/88 drm/amdgpu: Unset context priority is now invalid
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luben Tuikov <[email protected]>
[ Upstream commit eab0261967aeab528db4d0a51806df8209aec179 ]
A context priority value of AMD_CTX_PRIORITY_UNSET is now invalid--instead of carrying it around and passing it to the Direct Rendering Manager--and it becomes AMD_CTX_PRIORITY_NORMAL in amdgpu_ctx_ioctl(), the gateway to context creation.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
@@ -47,7 +47,6 @@ const unsigned int amdgpu_ctx_num_entities[AMDGPU_HW_IP_NUM] = {bool amdgpu_ctx_priority_is_valid (int32_t ctx_prio) {switch (ctx_prio) { -case AMDGPU_CTX_PRIORITY_UNSET :case AMDGPU_CTX_PRIORITY_VERY_LOW :case AMDGPU_CTX_PRIORITY_LOW :case AMDGPU_CTX_PRIORITY_NORMAL :
@@ -55,6 +54,7 @@ bool amdgpu_ctx_priority_is_valid(int32_t ctx_prio)case AMDGPU_CTX_PRIORITY_VERY_HIGH :return true;default : +case AMDGPU_CTX_PRIORITY_UNSET :return false; } }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 17/88 Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
[ Upstream commit 5030b2fe6aab37fe42d14f31842ea38be7c55c57 ]
Touch controllers need some time after receiving reset command for the firmware to finish re-initializing and be ready to respond to commands from the host. The driver already had handling for the post-reset delay for I2C and SPI transports, this change adds the handling to SMBus-connected devices.
SMBus devices are peculiar because they implement legacy PS/2 compatibility mode, so reset is actually issued by psmouse driver on the associated serio port, after which the control is passed to the RMI4 driver with SMBus companion device.
Note that originally the delay was added to psmouse driver in 92e24e0e57f7 ("Input: psmouse - add delay when deactivating for SMBus mode"), but that resulted in an unwanted delay in "fast" reconnect handler for the serio port, so it was decided to revert the patch and have the delay being handled in the RMI4 driver, similar to the other transports.
--- drivers/input/mouse/synaptics.c | 1 + drivers/input/rmi4/rmi_smbus.c | 50 ++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 22 deletions(-)
drivers/input/mouse/synaptics.c +1 -0
@@ -1753,6 +1753,7 @@ static int synaptics_create_intertouch(struct psmouse *psmouse,psmouse_matches_pnp_id (psmouse, topbuttonpad_pnp_ids) && !SYN_CAP_EXT_BUTTONS_STICK (info->ext_cap_10);const struct rmi_device_platform_data pdata = { + .reset_delay_ms =30 , .sensor_pdata = { .sensor_type = rmi_sensor_touchpad, .axis_align.flip_y = true,
drivers/input/rmi4/rmi_smbus.c +28 -22
76 lines not on this page · raw message
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 18/88 fbdev: atyfb: only use ioremap_uc() on i386 and ia64
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit c1a8d1d0edb71dec15c9649cb56866c71c1ecd9e ]
ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension, and on ia64 with its slightly unconventional ioremap() behavior, everywhere else this is the same as ioremap() anyway.
Change the only driver that still references ioremap_uc() to only do so on x86-32/ia64 in order to allow removing that interface at some point in the future for the other architectures.
On some architectures, ioremap_uc() just returns NULL, changing the driver to call ioremap() means that they now have a chance of working correctly.
--- drivers/video/fbdev/aty/atyfb_base.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/video/fbdev/aty/atyfb_base.c +4 -0
@@ -3440,11 +3440,15 @@ static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info, } info->fix.mmio_start = raddr; +#if defined(__i386__) || defined(__ia64__)/* * By using strong UC we force the MTRR to never have an * effect on the MMIO region on both non-PAT and PAT systems. */ par->ati_regbase =ioremap_uc (info->fix.mmio_start,0x1000 ); +#else + par->ati_regbase =ioremap (info->fix.mmio_start,0x1000 ); +#endif if (par->ati_regbase ==NULL )return -ENOMEM ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 19/88 fs/ntfs3: Add ckeck in ni_update_parent()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit 87d1888aa40f25773fa0b948bcb2545f97e2cb15 ]
Check simple case when parent inode equals current inode.
--- fs/ntfs3/frecord.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/ntfs3/frecord.c +6 -0
@@ -3208,6 +3208,12 @@ static bool ni_update_parent(struct ntfs_inode *ni, struct NTFS_DUP_INFO *dup,if (!fname || !memcmp (&fname->dup, dup,sizeof (fname->dup)))continue ; +/* Check simple case when parent inode equals current inode. */ +if (ino_get (&fname->home) == ni->vfs_inode.i_ino) { +ntfs_set_state (sbi,NTFS_DIRTY_ERROR ); +continue ; + } +/* ntfs_iget5 may sleep. */ dir =ntfs_iget5 (sb, &fname->home,NULL );if (IS_ERR (dir)) {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 20/88 fs/ntfs3: Write immediately updated ntfs state
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit 06ccfb00645990a9fcc14249e6d1c25921ecb836 ]
--- fs/ntfs3/fsntfs.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
fs/ntfs3/fsntfs.c +3 -10
@@ -983,18 +983,11 @@ int ntfs_set_state(struct ntfs_sb_info *sbi, enum NTFS_DIRTY_FLAGS dirty)if (err)return err; -mark_inode_dirty (&ni->vfs_inode); +mark_inode_dirty_sync (&ni->vfs_inode);/* verify(!ntfs_update_mftmirr()); */ -/* -* If we used wait=1, sync_inode_metadata waits for the io for the -* inode to finish. It hangs when media is removed. -* So wait=0 is sent down to sync_inode_metadata -* and filemap_fdatawrite is used for the data blocks. -*/ - err =sync_inode_metadata (&ni->vfs_inode,0 ); -if (!err) - err =filemap_fdatawrite (ni->vfs_inode.i_mapping); +/* write mft record on disk. */ + err =_ni_write_inode (&ni->vfs_inode,1 );return err; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 21/88 fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN)
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit fc471e39e38fea6677017cbdd6d928088a59fc67 ]
--- fs/ntfs3/attrlist.c | 15 +++++++++++++-- fs/ntfs3/bitmap.c | 3 ++- fs/ntfs3/super.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-)
fs/ntfs3/attrlist.c +13 -2
@@ -52,7 +52,8 @@ int ntfs_load_attr_list(struct ntfs_inode *ni, struct ATTRIB *attr)if (!attr->non_res) { lsize =le32_to_cpu (attr->res.data_size); - le =kmalloc (al_aligned (lsize),GFP_NOFS | __GFP_NOWARN); +/* attr is resident: lsize < record_size (1K or 4K) */ + le =kvmalloc (al_aligned (lsize),GFP_KERNEL );if (!le) { err = -ENOMEM ; goto out;
@@ -80,7 +81,17 @@ int ntfs_load_attr_list(struct ntfs_inode *ni, struct ATTRIB *attr)if (err <0 ) goto out; - le =kmalloc (al_aligned (lsize),GFP_NOFS | __GFP_NOWARN); +/* attr is nonresident. +* The worst case: +* 1T (2^40) extremely fragmented file. +* cluster = 4K (2^12) => 2^28 fragments +* 2^9 fragments per one record => 2^19 records +* 2^5 bytes of ATTR_LIST_ENTRY per one record => 2^24 bytes. +* +* the result is 16M bytes per attribute list. +* Use kvmalloc to allocate in range [several Kbytes - dozen Mbytes] +*/ + le =kvmalloc (al_aligned (lsize),GFP_KERNEL );if (!le) { err = -ENOMEM ; goto out;
fs/ntfs3/bitmap.c +2 -1
@@ -659,7 +659,8 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits) wnd->bits_last = wbits; wnd->free_bits = -kcalloc (wnd->nwnd,sizeof (u16),GFP_NOFS | __GFP_NOWARN); +kvmalloc_array (wnd->nwnd,sizeof (u16),GFP_KERNEL | __GFP_ZERO); +if (!wnd->free_bits)return -ENOMEM ;
fs/ntfs3/super.c +1 -1
@@ -1388,7 +1388,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) } bytes = inode->i_size; - sbi->def_table = t =kmalloc (bytes,GFP_NOFS | __GFP_NOWARN); + sbi->def_table = t =kvmalloc (bytes,GFP_KERNEL );if (!t) { err = -ENOMEM ; goto put_inode_out;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 22/88 fs/ntfs3: Add more attributes checks in mi_enum_attr()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit 013ff63b649475f0ee134e2c8d0c8e65284ede50 ]
--- fs/ntfs3/record.c | 68 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 16 deletions(-)
fs/ntfs3/record.c +52 -16
@@ -193,8 +193,9 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr) {const struct MFT_REC *rec = mi->mrec;u32 used =le32_to_cpu (rec->used); -u32 t32, off, asize; +u32 t32, off, asize, prev_type;u16 t16; +u64 data_size, alloc_size, tot_size;if (!attr) {u32 total =le32_to_cpu (rec->total);
@@ -213,6 +214,7 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)if (!is_rec_inuse (rec))return NULL ; + prev_type =0 ; attr =Add2Ptr (rec, off); }else {/* Check if input attr inside record. */
@@ -226,11 +228,11 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)return NULL ; } -if (off + asize < off) { -/* Overflow check. */ +/* Overflow check. */ +if (off + asize < off)return NULL ; - } + prev_type =le32_to_cpu (attr->type); attr =Add2Ptr (attr, asize); off += asize; }
@@ -250,7 +252,11 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)/* 0x100 is last known attribute for now. */ t32 =le32_to_cpu (attr->type); -if ((t32 &0xf ) || (t32 >0x100 )) +if (!t32 || (t32 &0xf ) || (t32 >0x100 )) +return NULL ; + +/* attributes in record must be ordered by type */ +if (t32 < prev_type)return NULL ;/* Check overflow and boundary. */
@@ -259,16 +265,15 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)/* Check size of attribute. */ if (!attr->non_res) { +/* Check resident fields. */ if (asize <SIZEOF_RESIDENT )return NULL ; t16 =le16_to_cpu (attr->res.data_off); -if (t16 > asize)return NULL ; - t32 =le32_to_cpu (attr->res.data_size); -if (t16 + t32 > asize) +if (t16 +le32_to_cpu (attr->res.data_size) > asize)return NULL ; t32 =sizeof (short ) * attr->name_len;
@@ -278,21 +283,52 @@ struct ATTRIB *mi_enum_attr(struct mft_inode *mi, struct ATTRIB *attr)return attr; } -/* Check some nonresident fields. */ -if (attr->name_len && -le16_to_cpu (attr->name_off) +sizeof (short ) * attr->name_len > -le16_to_cpu (attr->nres.run_off)) { +/* Check nonresident fields. */ +if (attr->non_res !=1 ) +return NULL ; + + t16 =le16_to_cpu (attr->nres.run_off); +if (t16 > asize) +return NULL ; + + t32 =sizeof (short ) * attr->name_len; +if (t32 &&le16_to_cpu (attr->name_off) + t32 > t16) +return NULL ; + +/* Check start/end vcn. */ +if (le64_to_cpu (attr->nres.svcn) >le64_to_cpu (attr->nres.evcn) +1 ) +return NULL ; + + data_size =le64_to_cpu (attr->nres.data_size); +if (le64_to_cpu (attr->nres.valid_size) > data_size)return NULL ; - } -if (attr->nres.svcn || !is_attr_ext (attr)) { + alloc_size =le64_to_cpu (attr->nres.alloc_size); +if (data_size > alloc_size) +return NULL ; + + t32 = mi->sbi->cluster_mask; +if (alloc_size & t32) +return NULL ; + +if (!attr->nres.svcn &&is_attr_ext (attr)) { +/* First segment of sparse/compressed attribute */ +if (asize +8 <SIZEOF_NONRESIDENT_EX ) +return NULL ; + + tot_size =le64_to_cpu (attr->nres.total_size); +if (tot_size & t32) +return NULL ; + +if (tot_size > alloc_size) +return NULL ; + }else {if (asize +8 <SIZEOF_NONRESIDENT )return NULL ;if (attr->nres.c_unit)return NULL ; - }else if (asize +8 <SIZEOF_NONRESIDENT_EX ) -return NULL ; + }return attr; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 13/88 ata: pata_parport: add custom version of wait_after_reset
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Zary <[email protected]>
[ Upstream commit f343e578fef99a69b3322aca38b94a6d8ded2ce7 ]
Some parallel adapters (e.g. EXP Computer MC-1285B EPP Cable) return bogus values when there's no master device present. This can cause reset to fail, preventing the lone slave device (such as EXP Computer CD-865) from working.
Add custom version of wait_after_reset that ignores master failure when a slave device is present. The custom version is also needed because the generic ata_sff_wait_after_reset uses direct port I/O for slave device detection.
--- drivers/ata/pata_parport/pata_parport.c | 68 ++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-)
drivers/ata/pata_parport/pata_parport.c +67 -1
@@ -80,6 +80,72 @@ static bool pata_parport_devchk(struct ata_port *ap, unsigned int device)return (nsect ==0x55 ) && (lbal ==0xaa ); } +static int pata_parport_wait_after_reset (struct ata_link *link, +unsigned int devmask, +unsigned long deadline) +{ +struct ata_port *ap = link->ap; +struct pi_adapter *pi = ap->host->private_data; +unsigned int dev0 = devmask & (1 <<0 ); +unsigned int dev1 = devmask & (1 <<1 ); +int rc, ret =0 ; + +ata_msleep (ap,ATA_WAIT_AFTER_RESET ); + +/* always check readiness of the master device */ + rc =ata_sff_wait_ready (link, deadline); +if (rc) { +/* +* some adapters return bogus values if master device is not +* present, so don't abort now if a slave device is present +*/ +if (!dev1) +return rc; + ret = -ENODEV ; + } + +/* +* if device 1 was found in ata_devchk, wait for register +* access briefly, then wait for BSY to clear. +*/ +if (dev1) { +int i; + +pata_parport_dev_select (ap,1 ); + +/* +* Wait for register access. Some ATAPI devices fail +* to set nsect/lbal after reset, so don't waste too +* much time on it. We're gonna wait for !BSY anyway. +*/ +for (i =0 ; i <2 ; i++) { +u8 nsect, lbal; + + nsect = pi->proto->read_regr (pi,0 ,ATA_REG_NSECT ); + lbal = pi->proto->read_regr (pi,0 ,ATA_REG_LBAL ); +if (nsect ==1 && lbal ==1 ) +break ; +/* give drive a breather */ +ata_msleep (ap,50 ); + } + + rc =ata_sff_wait_ready (link, deadline); +if (rc) { +if (rc != -ENODEV ) +return rc; + ret = rc; + } + } + +pata_parport_dev_select (ap,0 ); +if (dev1) +pata_parport_dev_select (ap,1 ); +if (dev0) +pata_parport_dev_select (ap,0 ); + +return ret; +} +static int pata_parport_bus_softreset (struct ata_port *ap,unsigned int devmask,unsigned long deadline) {
@@ -94,7 +160,7 @@ static int pata_parport_bus_softreset(struct ata_port *ap, unsigned int devmask, ap->last_ctl = ap->ctl;/* wait the port to become ready */ -return ata_sff_wait_after_reset (&ap->link, devmask, deadline); +return pata_parport_wait_after_reset (&ap->link, devmask, deadline); } static int pata_parport_softreset(struct ata_link *link, unsigned int *classes,
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 46/88 LoongArch: Use SYM_CODE_* to annotate exception handlers
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit 00c2ca84c680f64b79b5e10a482ca435fd7d98ce ]
As described in include/linux/linkage.h,
FUNC -- C-like functions (proper stack frame etc.)
CODE -- non-C code (e.g. irq handlers with different, special stack etc.)
SYM_FUNC_{START, END} -- use for global functions SYM_CODE_{START, END} -- use for non-C (special) functions
So use SYM_CODE_* to annotate exception handlers.
--- arch/loongarch/include/asm/linkage.h | 8 +++++++ arch/loongarch/kernel/entry.S | 4 ++-- arch/loongarch/kernel/genex.S | 16 ++++++------- arch/loongarch/mm/tlbex.S | 36 ++++++++++++++-------------- 4 files changed, 36 insertions(+), 28 deletions(-)
arch/loongarch/include/asm/linkage.h +8 -0
@@ -33,4 +33,12 @@ .cfi_endproc; \ SYM_END(name, SYM_T_FUNC) +#define SYM_CODE_START (name) \ + SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) \ + .cfi_startproc; + +#define SYM_CODE_END (name) \ + .cfi_endproc; \ + SYM_END(name, SYM_T_NONE) +#endif
arch/loongarch/kernel/entry.S +2 -2
@@ -18,7 +18,7 @@ .text .cfi_sections .debug_frame .align 5 -SYM_FUNC_START(handle_syscall) +SYM_CODE_START(handle_syscall) csrrd t0, PERCPU_BASE_KS la.pcrel t1, kernelsp add.d t1, t1, t0
@@ -66,7 +66,7 @@ SYM_FUNC_START(handle_syscall) bl do_syscall RESTORE_ALL_AND_RET -SYM_FUNC_END(handle_syscall) +SYM_CODE_END(handle_syscall) _ASM_NOKPROBE(handle_syscall) SYM_CODE_START(ret_from_fork)
arch/loongarch/kernel/genex.S +8 -8
@@ -31,7 +31,7 @@ SYM_FUNC_START(__arch_cpu_idle) 1: jr ra SYM_FUNC_END(__arch_cpu_idle) -SYM_FUNC_START(handle_vint) +SYM_CODE_START(handle_vint) BACKUP_T0T1 SAVE_ALL la_abs t1, __arch_cpu_idle
@@ -46,11 +46,11 @@ SYM_FUNC_START(handle_vint) la_abs t0, do_vint jirl ra, t0, 0 RESTORE_ALL_AND_RET -SYM_FUNC_END(handle_vint) +SYM_CODE_END(handle_vint) -SYM_FUNC_START(except_vec_cex) +SYM_CODE_START(except_vec_cex) b cache_parity_error -SYM_FUNC_END(except_vec_cex) +SYM_CODE_END(except_vec_cex) .macro build_prep_badv csrrd t0, LOONGARCH_CSR_BADV
@@ -66,7 +66,7 @@ SYM_FUNC_END(except_vec_cex) .macro BUILD_HANDLER exception handler prep .align 5 - SYM_FUNC_START(handle_\exception) + SYM_CODE_START(handle_\exception) 666: BACKUP_T0T1 SAVE_ALL
@@ -76,7 +76,7 @@ SYM_FUNC_END(except_vec_cex) jirl ra, t0, 0 668: RESTORE_ALL_AND_RET - SYM_FUNC_END(handle_\exception) + SYM_CODE_END(handle_\exception) SYM_DATA(unwind_hint_\exception, .word 668b - 666b) .endm
@@ -93,7 +93,7 @@ SYM_FUNC_END(except_vec_cex) BUILD_HANDLER watch watch none BUILD_HANDLER reserved reserved none /* others */ -SYM_FUNC_START(handle_sys) +SYM_CODE_START(handle_sys) la_abs t0, handle_syscall jr t0 -SYM_FUNC_END(handle_sys) +SYM_CODE_END(handle_sys)
arch/loongarch/mm/tlbex.S +18 -18
@@ -17,7 +17,7 @@ #define PTRS_PER_PTE_BITS (PAGE_SHIFT - 3) .macro tlb_do_page_fault, write - SYM_FUNC_START(tlb_do_page_fault_\write) + SYM_CODE_START(tlb_do_page_fault_\write) SAVE_ALL csrrd a2, LOONGARCH_CSR_BADV move a0, sp
@@ -25,13 +25,13 @@ li.w a1, \write bl do_page_fault RESTORE_ALL_AND_RET - SYM_FUNC_END(tlb_do_page_fault_\write) + SYM_CODE_END(tlb_do_page_fault_\write) .endm tlb_do_page_fault 0 tlb_do_page_fault 1 -SYM_FUNC_START(handle_tlb_protect) +SYM_CODE_START(handle_tlb_protect) BACKUP_T0T1 SAVE_ALL move a0, sp
@@ -41,9 +41,9 @@ SYM_FUNC_START(handle_tlb_protect) la_abs t0, do_page_fault jirl ra, t0, 0 RESTORE_ALL_AND_RET -SYM_FUNC_END(handle_tlb_protect) +SYM_CODE_END(handle_tlb_protect) -SYM_FUNC_START(handle_tlb_load) +SYM_CODE_START(handle_tlb_load) csrwr t0, EXCEPTION_KS0 csrwr t1, EXCEPTION_KS1 csrwr ra, EXCEPTION_KS2
@@ -187,16 +187,16 @@ nopage_tlb_load: csrrd ra, EXCEPTION_KS2 la_abs t0, tlb_do_page_fault_0 jr t0 -SYM_FUNC_END(handle_tlb_load) +SYM_CODE_END(handle_tlb_load) -SYM_FUNC_START(handle_tlb_load_ptw) +SYM_CODE_START(handle_tlb_load_ptw) csrwr t0, LOONGARCH_CSR_KS0 csrwr t1, LOONGARCH_CSR_KS1 la_abs t0, tlb_do_page_fault_0 jr t0 -SYM_FUNC_END(handle_tlb_load_ptw) +SYM_CODE_END(handle_tlb_load_ptw) -SYM_FUNC_START(handle_tlb_store) +SYM_CODE_START(handle_tlb_store) csrwr t0, EXCEPTION_KS0 csrwr t1, EXCEPTION_KS1 csrwr ra, EXCEPTION_KS2
@@ -343,16 +343,16 @@ nopage_tlb_store: csrrd ra, EXCEPTION_KS2 la_abs t0, tlb_do_page_fault_1 jr t0 -SYM_FUNC_END(handle_tlb_store) +SYM_CODE_END(handle_tlb_store) -SYM_FUNC_START(handle_tlb_store_ptw) +SYM_CODE_START(handle_tlb_store_ptw) csrwr t0, LOONGARCH_CSR_KS0 csrwr t1, LOONGARCH_CSR_KS1 la_abs t0, tlb_do_page_fault_1 jr t0 -SYM_FUNC_END(handle_tlb_store_ptw) +SYM_CODE_END(handle_tlb_store_ptw) -SYM_FUNC_START(handle_tlb_modify) +SYM_CODE_START(handle_tlb_modify) csrwr t0, EXCEPTION_KS0 csrwr t1, EXCEPTION_KS1 csrwr ra, EXCEPTION_KS2
@@ -497,16 +497,16 @@ nopage_tlb_modify: csrrd ra, EXCEPTION_KS2 la_abs t0, tlb_do_page_fault_1 jr t0 -SYM_FUNC_END(handle_tlb_modify) +SYM_CODE_END(handle_tlb_modify) -SYM_FUNC_START(handle_tlb_modify_ptw) +SYM_CODE_START(handle_tlb_modify_ptw) csrwr t0, LOONGARCH_CSR_KS0 csrwr t1, LOONGARCH_CSR_KS1 la_abs t0, tlb_do_page_fault_1 jr t0 -SYM_FUNC_END(handle_tlb_modify_ptw) +SYM_CODE_END(handle_tlb_modify_ptw) -SYM_FUNC_START(handle_tlb_refill) +SYM_CODE_START(handle_tlb_refill) csrwr t0, LOONGARCH_CSR_TLBRSAVE csrrd t0, LOONGARCH_CSR_PGD lddir t0, t0, 3
@@ -521,4 +521,4 @@ SYM_FUNC_START(handle_tlb_refill) tlbfill csrrd t0, LOONGARCH_CSR_TLBRSAVE ertn -SYM_FUNC_END(handle_tlb_refill) +SYM_CODE_END(handle_tlb_refill)
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 55/88 r8152: Check for unplug in rtl_phy_patch_request()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit dc90ba37a8c37042407fa6970b9830890cfe6047 ]
If the adapter is unplugged while we're looping in rtl_phy_patch_request() we could end up looping for 10 seconds (2 ms * 5000 loops). Add code similar to what's done in other places in the driver to check for unplug and bail.
--- drivers/net/usb/r8152.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/r8152.c +3 -0
@@ -4059,6 +4059,9 @@ static int rtl_phy_patch_request(struct r8152 *tp, bool request, bool wait)for (i =0 ; wait && i <5000 ; i++) {u32 ocp_data; +if (test_bit (RTL8152_UNPLUG , &tp->flags)) +break ; +usleep_range (1000 ,2000 ); ocp_data =ocp_reg_read (tp,OCP_PHY_PATCH_STAT );if ((ocp_data &PATCH_READY ) ^ check)
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 56/88 r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit bc65cc42af737a5a35f83842408ef2c6c79ba025 ]
If the adapter is unplugged while we're looping in r8153b_ups_en() / r8153c_ups_en() we could end up looping for 10 seconds (20 ms * 500 loops). Add code similar to what's done in other places in the driver to check for unplug and bail.
--- drivers/net/usb/r8152.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/usb/r8152.c +4 -0
@@ -3656,6 +3656,8 @@ static void r8153b_ups_en(struct r8152 *tp, bool enable)int i;for (i =0 ; i <500 ; i++) { +if (test_bit (RTL8152_UNPLUG , &tp->flags)) +return ;if (ocp_read_word (tp,MCU_TYPE_PLA ,PLA_BOOT_CTRL ) &AUTOLOAD_DONE )break ;
@@ -3696,6 +3698,8 @@ static void r8153c_ups_en(struct r8152 *tp, bool enable)int i;for (i =0 ; i <500 ; i++) { +if (test_bit (RTL8152_UNPLUG , &tp->flags)) +return ;if (ocp_read_word (tp,MCU_TYPE_PLA ,PLA_BOOT_CTRL ) &AUTOLOAD_DONE )break ;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 57/88 powerpc/mm: Fix boot crash with FLATMEM
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit daa9ada2093ed23d52b4c1fe6e13cf78f55cc85f ]
Erhard reported that his G5 was crashing with v6.6-rc kernels:
mpic: Setting up HT PICs workarounds for U3/U4
BUG: Unable to handle kernel data access at 0xfeffbb62ffec65fe
Faulting instruction address: 0xc00000000005dc40
Oops: Kernel access of bad area, sig: 11 [#1]
BE PAGE_SIZE=4K MMU=Hash SMP NR_CPUS=2 PowerMac
Modules linked in:
CPU: 0 PID: 0 Comm: swapper/0 Tainted: G T 6.6.0-rc3-PMacGS #1
Hardware name: PowerMac11,2 PPC970MP 0x440101 PowerMac
NIP: c00000000005dc40 LR: c000000000066660 CTR: c000000000007730
REGS: c0000000022bf510 TRAP: 0380 Tainted: G T (6.6.0-rc3-PMacGS)
MSR: 9000000000001032 <SF,HV,ME,IR,DR,RI> CR: 44004242 XER: 00000000
IRQMASK: 3
GPR00: 0000000000000000 c0000000022bf7b0 c0000000010c0b00 00000000000001ac
GPR04: 0000000003c80000 0000000000000300 c0000000f20001ae 0000000000000300
GPR08: 0000000000000006 feffbb62ffec65ff 0000000000000001 0000000000000000
GPR12: 9000000000001032 c000000002362000 c000000000f76b80 000000000349ecd8
GPR16: 0000000002367ba8 0000000002367f08 0000000000000006 0000000000000000
GPR20: 00000000000001ac c000000000f6f920 c0000000022cd985 000000000000000c
GPR24: 0000000000000300 00000003b0a3691d c0003e008030000e 0000000000000000
GPR28: c00000000000000c c0000000f20001ee feffbb62ffec65fe 00000000000001ac
NIP hash_page_do_lazy_icache+0x50/0x100
LR __hash_page_4K+0x420/0x590
Call Trace:
hash_page_mm+0x364/0x6f0
do_hash_fault+0x114/0x2b0
data_access_common_virt+0x198/0x1f0
--- interrupt: 300 at mpic_init+0x4bc/0x10c4
NIP: c000000002020a5c LR: c000000002020a04 CTR: 0000000000000000
REGS: c0000000022bf9f0 TRAP: 0300 Tainted: G T (6.6.0-rc3-PMacGS)
MSR: 9000000000001032 <SF,HV,ME,IR,DR,RI> CR: 24004248 XER: 00000000
DAR: c0003e008030000e DSISR: 40000000 IRQMASK: 1
...
NIP mpic_init+0x4bc/0x10c4
LR mpic_init+0x464/0x10c4
--- interrupt: 300
pmac_setup_one_mpic+0x258/0x2dc
pmac_pic_init+0x28c/0x3d8
init_IRQ+0x90/0x140
start_kernel+0x57c/0x78c
start_here_common+0x1c/0x20A bisect pointed to the breakage beginning with commit 9fee28baa601 ("powerpc:
implement the new page table range API").
Analysis of the oops pointed to a struct page with a corrupted compound_head being loaded via page_folio() -> _compound_head() in hash_page_do_lazy_icache().
The access by the mpic code is to an MMIO address, so the expectation is that the struct page for that address would be initialised by init_unavailable_range(), as pointed out by Aneesh.
Instrumentation showed that was not the case, which eventually lead to the realisation that pfn_valid() was returning false for that address, causing the struct page to not be initialised.
Because the system is using FLATMEM, the version of pfn_valid() in memory_model.h is used:
static inline int pfn_valid(unsigned long pfn)
{
...
return pfn >= pfn_offset && (pfn - pfn_offset) < max_mapnr;
}Which relies on max_mapnr being initialised. Early in boot max_mapnr is zero meaning no PFNs are valid.
max_mapnr is initialised in mem_init() called via:
start_kernel()
mm_core_init() # init/main.c:928
mem_init()But that is too late for the usage in init_unavailable_range() called via:
start_kernel()
setup_arch() # init/main.c:893
paging_init()
free_area_init()
init_unavailable_range()Although max_mapnr is currently set in mem_init(), the value is actually already available much earlier, as soon as mem_topology_setup() has completed, which is also before paging_init() is called. So move the initialisation there, which causes paging_init() to correctly initialise the struct page and fixes the bug.
This bug seems to have been lurking for years, but went unnoticed because the pre-folio code was inspecting the uninitialised page->flags but not dereferencing it.
Thanks to Erhard and Aneesh for help debugging.
--- arch/powerpc/kernel/setup-common.c | 2 ++ arch/powerpc/mm/mem.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/kernel/setup-common.c +2 -0
@@ -948,6 +948,8 @@ void __init setup_arch(char **cmdline_p)/* Parse memory topology */ mem_topology_setup (); +/* Set max_mapnr before paging_init() */ +set_max_mapnr (max_pfn);/* * Release secondary cpus out of their spinloops at 0x60 now that
arch/powerpc/mm/mem.c +0 -1
@@ -288,7 +288,6 @@ void __init mem_init(void)#endif high_memory = (void *)__va (max_low_pfn *PAGE_SIZE ); -set_max_mapnr (max_pfn);kasan_late_init ();
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 58/88 io_uring: kiocb_done() should *not* trust ->ki_pos if ->{read,write}_iter() failed
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 1939316bf988f3e49a07d9c4dd6f660bf4daa53d ]
->ki_pos value is unreliable in such cases. For an obvious example, consider O_DSYNC write - we feed the data to page cache and start IO, then we make sure it's completed. Update of ->ki_pos is dealt with by the first part; failure in the second ends up with negative value returned _and_ ->ki_pos left advanced as if sync had been successful. In the same situation write(2) does not advance the file position at all.
--- io_uring/rw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/rw.c +1 -1
@@ -332,7 +332,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret, struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);unsigned final_ret =io_fixup_rw_res (req, ret); -if (req->flags &REQ_F_CUR_POS ) +if (ret >=0 && req->flags &REQ_F_CUR_POS ) req->file->f_pos = rw->kiocb.ki_pos;if (ret >=0 && (rw->kiocb.ki_complete == io_complete_rw)) {if (!__io_complete_rw_common (req, ret)) {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 59/88 ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit dc32464a5fe4946fe1a4d8f8e29961dc411933c5 ]
Use of dget() after we'd dropped ->d_lock is too late - dentry might be gone by that point.
--- fs/ceph/mds_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/mds_client.c +1 -1
@@ -709,8 +709,8 @@ int ceph_wait_on_conflict_unlink(struct dentry *dentry)if (!d_same_name (udentry, pdentry, &dname)) goto next; + found =dget_dlock (udentry);spin_unlock (&udentry->d_lock); - found =dget (udentry);break ; next:spin_unlock (&udentry->d_lock);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 60/88 drm/amd/display: Dont use fsleep for PSR exit waits
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 79df45dc4bfb13d9bd3a75338b9d9dab948be3d6 ]
[Why]
These functions can be called from high IRQ levels and the OS will hang if it tries to use a usleep_highres or a msleep.
[How]
Replace the fsleep with a udelay.
--- drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 ++- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +2 -1
@@ -586,7 +586,8 @@ static void dcn10_dmcu_set_psr_enable(struct dmcu *dmcu, bool enable, bool wait)if (state ==PSR_STATE0 )break ; } -fsleep (500 ); +/* must *not* be fsleep - this can be called from high irq levels */ +udelay (500 ); }/* assert if max retry hit */
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +2 -1
@@ -216,7 +216,8 @@ static void dmub_psr_enable(struct dmub_psr *dmub, bool enable, bool wait, uint8break ; } -fsleep (500 ); +/* must *not* be fsleep - this can be called from high irq levels */ +udelay (500 ); }/* assert if max retry hit */
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 61/88 rust: make `UnsafeCell` the outer type in `Opaque`
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alice Ryhl <[email protected]>
[ Upstream commit 35cad617df2eeef8440a38e82bb2d81ae32ca50d ]
When combining UnsafeCell with MaybeUninit, it is idiomatic to use UnsafeCell as the outer type. Intuitively, this is because a MaybeUninit<T> might not contain a T, but we always want the effect of the UnsafeCell, even if the inner value is uninitialized.
Now, strictly speaking, this doesn't really make a difference. The compiler will always apply the UnsafeCell effect even if the inner value is uninitialized. But I think we should follow the convention here.
Stable-dep-of: 0b4e3b6f6b79 ("rust: types: make Opaque be !Unpin")
--- rust/kernel/types.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
rust/kernel/types.rs +5 -5
@@ -206,17 +206,17 @@ fn drop(&mut self) {/// /// This is meant to be used with FFI objects that are never interpreted by Rust code. #[repr(transparent)] -pub struct Opaque <T >(MaybeUninit <UnsafeCell <T >>); +pub struct Opaque <T >(UnsafeCell <MaybeUninit <T >>);impl <T >Opaque <T > {/// Creates a new opaque value. pub const fn new (value:T ) ->Self { -Self (MaybeUninit ::new (UnsafeCell ::new (value))) +Self (UnsafeCell ::new (MaybeUninit ::new (value))) }/// Creates an uninitialised value. pub const fn uninit () ->Self { -Self (MaybeUninit ::uninit ()) +Self (UnsafeCell ::new (MaybeUninit ::uninit ())) }/// Creates a pin-initializer from the given initializer closure.
@@ -240,7 +240,7 @@ pub fn ffi_init(init_func: impl FnOnce(*mut T)) -> impl PinInit<Self> {/// Returns a raw pointer to the opaque data. pub fn get (&self) -> *mut T { -UnsafeCell ::raw_get (self.0 .as_ptr ()) +UnsafeCell ::get (&self.0 ).cast ::<T >() }/// Gets the value behind `this`.
@@ -248,7 +248,7 @@ pub fn get(&self) -> *mut T {/// This function is useful to get access to the value without creating intermediate /// references. pub const fn raw_get (this: *const Self ) -> *mut T { -UnsafeCell ::raw_get (this.cast ::<UnsafeCell <T >>()) +UnsafeCell ::raw_get (this.cast ::<UnsafeCell <MaybeUninit <T >>>()).cast ::<T >() } }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 62/88 rust: types: make `Opaque` be `!Unpin`
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benno Lossin <[email protected]>
[ Upstream commit 0b4e3b6f6b79b1add04008a6ceaaf661107e8902 ]
Adds a PhantomPinned field to Opaque<T>. This removes the last Rust
guarantee: the assumption that the type T can be freely moved. This is not the case for many types from the C side (e.g. if they contain a struct list_head). This change removes the need to add a PhantomPinned field manually to Rust structs that contain C structs which must not be moved.
--- rust/kernel/types.rs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
rust/kernel/types.rs +14 -5
@@ -6,7 +6,7 @@use alloc::boxed::Box ;use core::{ cell::UnsafeCell , - marker::PhantomData , + marker::{PhantomData ,PhantomPinned }, mem::MaybeUninit , ops::{Deref ,DerefMut }, ptr::NonNull ,
@@ -206,17 +206,26 @@ fn drop(&mut self) {/// /// This is meant to be used with FFI objects that are never interpreted by Rust code. #[repr(transparent)] -pub struct Opaque <T >(UnsafeCell <MaybeUninit <T >>); +pub struct Opaque <T > { + value:UnsafeCell <MaybeUninit <T >>, + _pin:PhantomPinned , +}impl <T >Opaque <T > {/// Creates a new opaque value. pub const fn new (value:T ) ->Self { -Self (UnsafeCell ::new (MaybeUninit ::new (value))) +Self { + value:UnsafeCell ::new (MaybeUninit ::new (value)), + _pin:PhantomPinned , + } }/// Creates an uninitialised value. pub const fn uninit () ->Self { -Self (UnsafeCell ::new (MaybeUninit ::uninit ())) +Self { + value:UnsafeCell ::new (MaybeUninit ::uninit ()), + _pin:PhantomPinned , + } }/// Creates a pin-initializer from the given initializer closure.
@@ -240,7 +249,7 @@ pub fn ffi_init(init_func: impl FnOnce(*mut T)) -> impl PinInit<Self> {/// Returns a raw pointer to the opaque data. pub fn get (&self) -> *mut T { -UnsafeCell ::get (&self.0 ).cast ::<T >() +UnsafeCell ::get (&self.value).cast ::<T >() }/// Gets the value behind `this`.
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 63/88 power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai-Heng Feng <[email protected]>
[ Upstream commit bbaa6ffa5b6c9609d3b3c431c389b407eea5441f ]
AMD PMF driver can cause the following warning:
[ 196.159546] ------------[ cut here ]------------ [ 196.159556] Voluntary context switch within RCU read-side critical section! [ 196.159571] WARNING: CPU: 0 PID: 9 at kernel/rcu/tree_plugin.h:320 rcu_note_context_switch+0x43d/0x560 [ 196.159604] Modules linked in: nvme_fabrics ccm rfcomm snd_hda_scodec_cs35l41_spi cmac algif_hash algif_skcipher af_alg bnep joydev btusb btrtl uvcvideo btintel btbcm videobuf2_vmalloc intel_rapl_msr btmtk videobuf2_memops uvc videobuf2_v4l2 intel_rapl_common binfmt_misc hid_sensor_als snd_sof_amd_vangogh hid_sensor_trigger bluetooth industrialio_triggered_buffer videodev snd_sof_amd_rembrandt hid_sensor_iio_common amdgpu ecdh_generic kfifo_buf videobuf2_common hp_wmi kvm_amd sparse_keymap snd_sof_amd_renoir wmi_bmof industrialio ecc mc nls_iso8859_1 kvm snd_sof_amd_acp irqbypass snd_sof_xtensa_dsp crct10dif_pclmul crc32_pclmul mt7921e snd_sof_pci snd_ctl_led polyval_clmulni mt7921_common polyval_generic snd_sof ghash_clmulni_intel mt792x_lib mt76_connac_lib sha512_ssse3 snd_sof_utils aesni_intel snd_hda_codec_realtek crypto_simd mt76 snd_hda_codec_generic cryptd snd_soc_core snd_hda_codec_hdmi rapl ledtrig_audio input_leds snd_compress i2c_algo_bit drm_ttm_helper mac80211 snd_pci_ps hid_multitouch ttm drm_exec [ 196.159970] drm_suballoc_helper snd_rpl_pci_acp6x amdxcp drm_buddy snd_hda_intel snd_acp_pci snd_hda_scodec_cs35l41_i2c serio_raw gpu_sched snd_hda_scodec_cs35l41 snd_acp_legacy_common snd_intel_dspcfg snd_hda_cs_dsp_ctls snd_hda_codec libarc4 drm_display_helper snd_pci_acp6x cs_dsp snd_hwdep snd_soc_cs35l41_lib video k10temp snd_pci_acp5x thunderbolt snd_hda_core drm_kms_helper cfg80211 snd_seq snd_rn_pci_acp3x snd_pcm snd_acp_config cec snd_soc_acpi snd_seq_device rc_core ccp snd_pci_acp3x snd_timer snd soundcore wmi amd_pmf platform_profile amd_pmc mac_hid serial_multi_instantiate wireless_hotkey hid_sensor_hub sch_fq_codel msr parport_pc ppdev lp parport efi_pstore ip_tables x_tables autofs4 btrfs blake2b_generic raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx libcrc32c xor raid6_pq raid1 raid0 multipath linear dm_mirror dm_region_hash dm_log cdc_ether usbnet r8152 mii hid_generic nvme i2c_hid_acpi i2c_hid nvme_core i2c_piix4 xhci_pci amd_sfh drm xhci_pci_renesas nvme_common hid [ 196.160382] CPU: 0 PID: 9 Comm: kworker/0:1 Not tainted 6.6.0-rc1 #4 [ 196.160397] Hardware name: HP HP EliteBook 845 14 inch G10 Notebook PC/8B6E, BIOS V82 Ver. 01.02.00 08/24/2023 [ 196.160405] Workqueue: events power_supply_changed_work [ 196.160426] RIP: 0010:rcu_note_context_switch+0x43d/0x560 [ 196.160440] Code: 00 48 89 be 40 08 00 00 48 89 86 48 08 00 00 48 89 10 e9 63 fe ff ff 48 c7 c7 10 e7 b0 9e c6 05 e8 d8 20 02 01 e8 13 0f f3 ff <0f> 0b e9 27 fc ff ff a9 ff ff ff 7f 0f 84 cf fc ff ff 65 48 8b 3c [ 196.160450] RSP: 0018:ffffc900001878f0 EFLAGS: 00010046 [ 196.160462] RAX: 0000000000000000 RBX: ffff88885e834040 RCX: 0000000000000000 [ 196.160470] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 [ 196.160476] RBP: ffffc90000187910 R08: 0000000000000000 R09: 0000000000000000 [ 196.160482] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 [ 196.160488] R13: 0000000000000000 R14: ffff888100990000 R15: ffff888100990000 [ 196.160495] FS: 0000000000000000(0000) GS:ffff88885e800000(0000) knlGS:0000000000000000 [ 196.160504] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 196.160512] CR2: 000055cb053c8246 CR3: 000000013443a000 CR4: 0000000000750ef0 [ 196.160520] PKRU: 55555554 [ 196.160526] Call Trace: [ 196.160532] <TASK> [ 196.160548] ? show_regs+0x72/0x90 [ 196.160570] ? rcu_note_context_switch+0x43d/0x560 [ 196.160580] ? __warn+0x8d/0x160 [ 196.160600] ? rcu_note_context_switch+0x43d/0x560 [ 196.160613] ? report_bug+0x1bb/0x1d0 [ 196.160637] ? handle_bug+0x46/0x90 [ 196.160658] ? exc_invalid_op+0x19/0x80 [ 196.160675] ? asm_exc_invalid_op+0x1b/0x20 [ 196.160709] ? rcu_note_context_switch+0x43d/0x560 [ 196.160727] __schedule+0xb9/0x15f0 [ 196.160746] ? srso_alias_return_thunk+0x5/0x7f [ 196.160765] ? srso_alias_return_thunk+0x5/0x7f [ 196.160778] ? acpi_ns_search_one_scope+0xbe/0x270 [ 196.160806] schedule+0x68/0x110 [ 196.160820] schedule_timeout+0x151/0x160 [ 196.160829] ? srso_alias_return_thunk+0x5/0x7f [ 196.160842] ? srso_alias_return_thunk+0x5/0x7f [ 196.160855] ? acpi_ns_lookup+0x3c5/0xa90 [ 196.160878] __down_common+0xff/0x220 [ 196.160905] __down_timeout+0x16/0x30 [ 196.160920] down_timeout+0x64/0x70 [ 196.160938] acpi_os_wait_semaphore+0x85/0x200 [ 196.160959] acpi_ut_acquire_mutex+0x9e/0x280 [ 196.160979] acpi_ex_enter_interpreter+0x2d/0xb0 [ 196.160992] acpi_ns_evaluate+0x2f0/0x5f0 [ 196.161005] acpi_evaluate_object+0x172/0x490 [ 196.161018] ? acpi_os_signal_semaphore+0x8a/0xd0 [ 196.161038] acpi_evaluate_integer+0x52/0xe0 [ 196.161055] ? kfree+0x79/0x120 [ 196.161071] ? srso_alias_return_thunk+0x5/0x7f [ 196.161089] acpi_ac_get_state.part.0+0x27/0x80 [ 196.161110] get_ac_property+0x5c/0x70 [ 196.161127] ? __pfx___power_supply_is_system_supplied+0x10/0x10 [ 196.161146] __power_supply_is_system_supplied+0x44/0xb0 [ 196.161166] class_for_each_device+0x124/0x160 [ 196.161184] ? acpi_ac_get_state.part.0+0x27/0x80 [ 196.161203] ? srso_alias_return_thunk+0x5/0x7f [ 196.161223] power_supply_is_system_supplied+0x3c/0x70 [ 196.161243] amd_pmf_get_power_source+0xe/0x20 [amd_pmf] [ 196.161276] amd_pmf_power_slider_update_event+0x49/0x90 [amd_pmf] [ 196.161310] amd_pmf_pwr_src_notify_call+0xe7/0x100 [amd_pmf] [ 196.161340] notifier_call_chain+0x5f/0xe0 [ 196.161362] atomic_notifier_call_chain+0x33/0x60 [ 196.161378] power_supply_changed_work+0x84/0x110 [ 196.161394] process_one_work+0x178/0x360 [ 196.161412] ? __pfx_worker_thread+0x10/0x10 [ 196.161424] worker_thread+0x307/0x430 [ 196.161440] ? __pfx_worker_thread+0x10/0x10 [ 196.161451] kthread+0xf4/0x130 [ 196.161467] ? __pfx_kthread+0x10/0x10 [ 196.161486] ret_from_fork+0x43/0x70 [ 196.161502] ? __pfx_kthread+0x10/0x10 [ 196.161518] ret_from_fork_asm+0x1b/0x30 [ 196.161558] </TASK> [ 196.161562] ---[ end trace 0000000000000000 ]---
Since there's no guarantee that all the callbacks can work in atomic context, switch to use blocking_notifier_call_chain to relax the constraint.
--- drivers/power/supply/power_supply_core.c | 8 ++++---- include/linux/power_supply.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/power/supply/power_supply_core.c +4 -4
@@ -29,7 +29,7 @@struct class *power_supply_class;EXPORT_SYMBOL_GPL (power_supply_class); -ATOMIC_NOTIFIER_HEAD (power_supply_notifier); +BLOCKING_NOTIFIER_HEAD (power_supply_notifier);EXPORT_SYMBOL_GPL (power_supply_notifier);static struct device_type power_supply_dev_type;
@@ -97,7 +97,7 @@ static void power_supply_changed_work(struct work_struct *work)class_for_each_device (power_supply_class,NULL , psy, __power_supply_changed_work);power_supply_update_leds (psy); -atomic_notifier_call_chain (&power_supply_notifier, +blocking_notifier_call_chain (&power_supply_notifier,PSY_EVENT_PROP_CHANGED , psy);kobject_uevent (&psy->dev.kobj,KOBJ_CHANGE );spin_lock_irqsave (&psy->changed_lock, flags);
@@ -1262,13 +1262,13 @@ static void power_supply_dev_release(struct device *dev)int power_supply_reg_notifier (struct notifier_block *nb) { -return atomic_notifier_chain_register (&power_supply_notifier, nb); +return blocking_notifier_chain_register (&power_supply_notifier, nb); }EXPORT_SYMBOL_GPL (power_supply_reg_notifier);void power_supply_unreg_notifier (struct notifier_block *nb) { -atomic_notifier_chain_unregister (&power_supply_notifier, nb); +blocking_notifier_chain_unregister (&power_supply_notifier, nb); }EXPORT_SYMBOL_GPL (power_supply_unreg_notifier);
include/linux/power_supply.h +1 -1
@@ -767,7 +767,7 @@ struct power_supply_battery_info {int bti_resistance_tolerance; }; -extern struct atomic_notifier_head power_supply_notifier; +extern struct blocking_notifier_head power_supply_notifier;extern int power_supply_reg_notifier (struct notifier_block *nb);extern void power_supply_unreg_notifier (struct notifier_block *nb);#if IS_ENABLED (CONFIG_POWER_SUPPLY )
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 64/88 perf evlist: Avoid frequency mode for the dummy event
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit f9cdeb58a9cf46c09b56f5f661ea8da24b6458c3 ]
Dummy events are created with an attribute where the period and freq are zero. evsel__config will then see the uninitialized values and initialize them in evsel__default_freq_period. As fequency mode is used by default the dummy event would be set to use frequency mode. However, this has no effect on the dummy event but does cause unnecessary timers/interrupts. Avoid this overhead by setting the period to 1 for dummy events.
evlist__add_aux_dummy calls evlist__add_dummy then sets freq=0 and period=1. This isn't necessary after this change and so the setting is removed.
Quoted 1 line
From Stephane:
The dummy event is not counting anything. It is used to collect mmap records and avoid a race condition during the synthesize mmap phase of perf record. As such, it should not cause any overhead during active profiling. Yet, it did. Because of a bug the dummy event was programmed as a sampling event in frequency mode. Events in that mode incur more kernel overheads because on timer tick, the kernel has to look at the number of samples for each event and potentially adjust the sampling period to achieve the desired frequency. The dummy event was therefore adding a frequency event to task and ctx contexts we may otherwise not have any, e.g.,
perf record -a -e cpu/event=0x3c,period=10000000/.
On each timer tick the perf_adjust_freq_unthr_context() is invoked and if ctx->nr_freq is non-zero, then the kernel will loop over ALL the events of the context looking for frequency mode ones. In doing, so it locks the context, and enable/disable the PMU of each hw event. If all the events of the context are in period mode, the kernel will have to traverse the list for nothing incurring overhead. The overhead is multiplied by a very large factor when this happens in a guest kernel. There is no need for the dummy event to be in frequency mode, it does not count anything and therefore should not cause extra overhead for no reason.
--- tools/perf/util/evlist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/evlist.c +3 -2
@@ -251,6 +251,9 @@ static struct evsel *evlist__dummy_event(struct evlist *evlist) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_DUMMY, .size = sizeof(attr), /* to capture ABI version */ + /* Avoid frequency mode for dummy events to avoid associated timers. */ + .freq = 0, + .sample_period = 1, };return evsel__new_idx (&attr, evlist->core.nr_entries);
@@ -277,8 +280,6 @@ struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wide) evsel->core.attr.exclude_kernel =1 ; evsel->core.attr.exclude_guest =1 ; evsel->core.attr.exclude_hv =1 ; - evsel->core.attr.freq =0 ; - evsel->core.attr.sample_period =1 ; evsel->core.system_wide = system_wide; evsel->no_aux_samples = true; evsel->name =strdup ("dummy:u" );
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 47/88 LoongArch: Export symbol invalid_pud_table for modules building
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 449c2756c2323c9e32b2a2fa9c8b59ce91b5819d ]
Export symbol invalid_pud_table for modules building (such as the KVM module) if 4-level page tables enabled. Otherwise we get:
ERROR: modpost: "invalid_pud_table" [arch/loongarch/kvm/kvm.ko] undefined!
--- arch/loongarch/mm/init.c | 1 + 1 file changed, 1 insertion(+)
arch/loongarch/mm/init.c +1 -0
@@ -267,6 +267,7 @@ pgd_t swapper_pg_dir[_PTRS_PER_PGD] __section(".bss..swapper_pg_dir"); pgd_t invalid_pg_dir[_PTRS_PER_PGD] __page_aligned_bss;#ifndef __PAGETABLE_PUD_FOLDED pud_t invalid_pud_table[PTRS_PER_PUD] __page_aligned_bss; +EXPORT_SYMBOL (invalid_pud_table);#endif #ifndef __PAGETABLE_PMD_FOLDED pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned_bss;
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 65/88 mmap: fix vma_iterator in error path of vma_merge()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liam R. Howlett <[email protected]>
commit 1419430c8abb5a00590169068590dd54d86590ba upstream.
During the error path, the vma iterator may not be correctly positioned or set to the correct range. Undo the vma_prev() call by resetting to the passed in address. Re-walking to the same range will fix the range to the area previously passed in.
Users would notice increased cycles as vma_merge() would be called an extra time with vma == prev, and thus would fail to merge and return.
--- mm/mmap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
mm/mmap.c +8 -2
@@ -988,10 +988,10 @@ struct vm_area_struct *vma_merge(struct/* Error in anon_vma clone. */ if (err) -return NULL ; + goto anon_vma_fail;if (vma_iter_prealloc (vmi)) -return NULL ; + goto prealloc_fail;init_multi_vma_prep (&vp, vma, adjust, remove, remove2); VM_WARN_ON(vp.anon_vma && adjust && adjust->anon_vma &&
@@ -1024,6 +1024,12 @@ struct vm_area_struct *vma_merge(structkhugepaged_enter_vma (res, vm_flags);return res; + +prealloc_fail: +anon_vma_fail: +vma_iter_set (vmi, addr); +vma_iter_load (vmi); +return NULL ; }/*
Greg Kroah-Hartman
maintainerPATCH 66/88 mmap: fix error paths with dup_anon_vma()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liam R. Howlett <[email protected]>
commit 824135c46b00df7fb369ec7f1f8607427bbebeb0 upstream.
When the calling function fails after the dup_anon_vma(), the duplication of the anon_vma is not being undone. Add the necessary unlink_anon_vma() call to the error paths that are missing them.
This issue showed up during inspection of the error path in vma_merge() for an unrelated vma iterator issue.
Users may experience increased memory usage, which may be problematic as the failure would likely be caused by a low memory situation.
--- mm/mmap.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)
mm/mmap.c +22 -8
@@ -603,11 +603,12 @@ again:* dup_anon_vma() - Helper function to duplicate anon_vma * @dst: The destination VMA * @src: The source VMA +* @dup: Pointer to the destination VMA when successful. * * Returns: 0 on success. */ static inline int dup_anon_vma (struct vm_area_struct *dst, -struct vm_area_struct *src) +struct vm_area_struct *src,struct vm_area_struct **dup) {/* * Easily overlooked: when mprotect shifts the boundary, make sure the
@@ -615,9 +616,15 @@ static inline int dup_anon_vma(struct vm* anon pages imported. */ if (src->anon_vma && !dst->anon_vma) { +int ret; +vma_start_write (dst); dst->anon_vma = src->anon_vma; -return anon_vma_clone (dst, src); + ret =anon_vma_clone (dst, src); +if (ret) +return ret; + + *dup = dst; }return 0 ;
@@ -644,6 +651,7 @@ int vma_expand(struct vma_iterator *vmi, unsigned long start, unsigned long end, pgoff_t pgoff, struct vm_area_struct *next) { + struct vm_area_struct *anon_dup = NULL;bool remove_next = false;struct vma_prepare vp;
@@ -651,7 +659,7 @@ int vma_expand(struct vma_iterator *vmi,int ret; remove_next = true; - ret =dup_anon_vma (vma, next); + ret =dup_anon_vma (vma, next, &anon_dup);if (ret)return ret; }
@@ -683,6 +691,8 @@ int vma_expand(struct vma_iterator *vmi,return 0 ; nomem: +if (anon_dup) +unlink_anon_vmas (anon_dup);return -ENOMEM ; }
@@ -881,6 +891,7 @@ struct vm_area_struct *vma_merge(struct {struct vm_area_struct *curr, *next, *res;struct vm_area_struct *vma, *adjust, *remove, *remove2; +struct vm_area_struct *anon_dup =NULL ;struct vma_prepare vp;pgoff_t vma_pgoff;int err =0 ;
@@ -945,16 +956,16 @@ struct vm_area_struct *vma_merge(struct is_mergeable_anon_vma(prev->anon_vma, next->anon_vma, NULL)) { remove = next;/* case 1 */ vma_end = next->vm_end; - err =dup_anon_vma (prev, next); + err =dup_anon_vma (prev, next, &anon_dup);if (curr) {/* case 6 */ remove = curr; remove2 = next;if (!next->anon_vma) - err =dup_anon_vma (prev, curr); + err =dup_anon_vma (prev, curr, &anon_dup); } } else if (merge_prev) { /* case 2 */if (curr) { - err =dup_anon_vma (prev, curr); + err =dup_anon_vma (prev, curr, &anon_dup);if (end == curr->vm_end) {/* case 7 */ remove = curr; }else {/* case 5 */
@@ -968,7 +979,7 @@ struct vm_area_struct *vma_merge(struct vma_end = addr; adjust = next; adj_start = -(prev->vm_end - addr); - err =dup_anon_vma (next, prev); + err =dup_anon_vma (next, prev, &anon_dup); }else {/* * Note that cases 3 and 8 are the ONLY ones where prev
@@ -981,7 +992,7 @@ struct vm_area_struct *vma_merge(structif (curr) {/* case 8 */ vma_pgoff = curr->vm_pgoff; remove = curr; - err =dup_anon_vma (next, curr); + err =dup_anon_vma (next, curr, &anon_dup); } } }
@@ -1026,6 +1037,9 @@ struct vm_area_struct *vma_merge(structreturn res; prealloc_fail: +if (anon_dup) +unlink_anon_vmas (anon_dup); + anon_vma_fail:vma_iter_set (vmi, addr);vma_iter_load (vmi);
Greg Kroah-Hartman
maintainerPATCH 67/88 ALSA: usb-audio: add quirk flag to enable native DSD for McIntosh devices
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max McCarthy <[email protected]>
commit 99248c8902f505ec064cf2b0f74629016f2f4c82 upstream.
McIntosh devices supporting native DSD require the feature to be explicitly exposed. Add a flag that fixes an issue where DSD audio was defaulting to DSD over PCM instead of delivering raw DSD data.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -2220,6 +2220,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_DSD_RAW),VENDOR_FLG (0x2ab6 ,/* T+A devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x2afd ,/* McIntosh Laboratory, Inc. */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x2d87 ,/* Cayin device */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0x3336, /* HEM devices */
Greg Kroah-Hartman
maintainerPATCH 68/88 PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vicki Pfau <[email protected]>
commit 7e6f3b6d2c352b5fde37ce3fed83bdf6172eebd4 upstream.
The AMD VanGogh SoC contains a DesignWare USB3 Dual-Role Device that can be operated as either a USB Host or a USB Device, similar to on the AMD Nolan platform.
be6646bfbaec ("PCI: Prevent xHCI driver from claiming AMD Nolan USB3 DRD device") added a quirk to let the dwc3 driver claim the Nolan device since it provides more specific support.
Extend that quirk to include the VanGogh SoC USB3 device.
--- drivers/pci/quirks.c | 8 +++++--- include/linux/pci_ids.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/pci/quirks.c +5 -3
@@ -688,7 +688,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT/* * In the AMD NL platform, this device ([1022:7912]) has a class code of * PCI_CLASS_SERIAL_USB_XHCI (0x0c0330), which means the xhci driver will -* claim it. +* claim it. The same applies on the VanGogh platform device ([1022:163a]). * * But the dwc3 driver is a more specific driver for this device, and we'd * prefer to use it instead of xhci. To prevent xhci from claiming the
@@ -696,7 +696,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT* defines as "USB device (not host controller)". The dwc3 driver can then * claim it based on its Vendor and Device ID. */ -static void quirk_amd_nl_class (struct pci_dev *pdev) +static void quirk_amd_dwc_class (struct pci_dev *pdev) {u32 class = pdev->class;
@@ -706,7 +706,9 @@ static void quirk_amd_nl_class(struct pc class, pdev->class); }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_NL_USB , - quirk_amd_nl_class); + quirk_amd_dwc_class); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_VANGOGH_USB , + quirk_amd_dwc_class);/* * Synopsys USB 3.x host HAPS platform has a class code of
include/linux/pci_ids.h +1 -0
@@ -579,6 +579,7 @@#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb#define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3 +#define PCI_DEVICE_ID_AMD_VANGOGH_USB 0x163a#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
Greg Kroah-Hartman
maintainerPATCH 69/88 usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: LihaSika <[email protected]>
commit 0e3139e6543b241b3e65956a55c712333bef48ac upstream.
Change lower bcdDevice value for "Super Top USB 2.0 SATA BRIDGE" to match 1.50. I have such an older device with bcdDevice=1.50 and it will not work otherwise.
--- drivers/usb/storage/unusual_cypress.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/unusual_cypress.h +1 -1
@@ -19,7 +19,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x "Cypress ISD-300LP", USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), -UNUSUAL_DEV (0x14cd ,0x6116 ,0x0160 ,0x0160 , +UNUSUAL_DEV (0x14cd ,0x6116 ,0x0150 ,0x0160 ,"Super Top" ,"USB 2.0 SATA BRIDGE" , USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
Greg Kroah-Hartman
maintainerPATCH 70/88 usb: typec: tcpm: Add additional checks for contaminant
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Badhri Jagan Sridharan <[email protected]>
commit 1a4a2df07c1f087704c24282cebe882268e38146 upstream.
When transitioning from SNK_DEBOUNCED to unattached, its worthwhile to check for contaminant to mitigate wakeups.
``` [81334.219571] Start toggling [81334.228220] CC1: 0 -> 0, CC2: 0 -> 0 [state TOGGLING, polarity 0, disconnected] [81334.305147] CC1: 0 -> 0, CC2: 0 -> 3 [state TOGGLING, polarity 0, connected] [81334.305162] state change TOGGLING -> SNK_ATTACH_WAIT [rev3 NONE_AMS] [81334.305187] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS] [81334.475515] state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED [delayed 170 ms] [81334.486480] CC1: 0 -> 0, CC2: 3 -> 0 [state SNK_DEBOUNCED, polarity 0, disconnected] [81334.486495] state change SNK_DEBOUNCED -> SNK_DEBOUNCED [rev3 NONE_AMS] [81334.486515] pending state change SNK_DEBOUNCED -> SNK_UNATTACHED @ 20 ms [rev3 NONE_AMS] [81334.506621] state change SNK_DEBOUNCED -> SNK_UNATTACHED [delayed 20 ms] [81334.506640] Start toggling [81334.516972] CC1: 0 -> 0, CC2: 0 -> 0 [state TOGGLING, polarity 0, disconnected] [81334.592759] CC1: 0 -> 0, CC2: 0 -> 3 [state TOGGLING, polarity 0, connected] [81334.592773] state change TOGGLING -> SNK_ATTACH_WAIT [rev3 NONE_AMS] [81334.592792] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS] [81334.762940] state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED [delayed 170 ms] [81334.773557] CC1: 0 -> 0, CC2: 3 -> 0 [state SNK_DEBOUNCED, polarity 0, disconnected] [81334.773570] state change SNK_DEBOUNCED -> SNK_DEBOUNCED [rev3 NONE_AMS] [81334.773588] pending state change SNK_DEBOUNCED -> SNK_UNATTACHED @ 20 ms [rev3 NONE_AMS] [81334.793672] state change SNK_DEBOUNCED -> SNK_UNATTACHED [delayed 20 ms] [81334.793681] Start toggling [81334.801840] CC1: 0 -> 0, CC2: 0 -> 0 [state TOGGLING, polarity 0, disconnected] [81334.878655] CC1: 0 -> 0, CC2: 0 -> 3 [state TOGGLING, polarity 0, connected] [81334.878672] state change TOGGLING -> SNK_ATTACH_WAIT [rev3 NONE_AMS] [81334.878696] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS] [81335.048968] state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED [delayed 170 ms] [81335.060684] CC1: 0 -> 0, CC2: 3 -> 0 [state SNK_DEBOUNCED, polarity 0, disconnected] [81335.060754] state change SNK_DEBOUNCED -> SNK_DEBOUNCED [rev3 NONE_AMS] [81335.060775] pending state change SNK_DEBOUNCED -> SNK_UNATTACHED @ 20 ms [rev3 NONE_AMS] [81335.080884] state change SNK_DEBOUNCED -> SNK_UNATTACHED [delayed 20 ms] [81335.080900] Start toggling ```
--- drivers/usb/typec/tcpm/tcpm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/typec/tcpm/tcpm.c +2 -0
@@ -3970,6 +3970,8 @@ static void run_state_machine(struct tcp port->potential_contaminant = ((port->enter_state ==SRC_ATTACH_WAIT && port->state ==SRC_UNATTACHED ) || (port->enter_state ==SNK_ATTACH_WAIT && + port->state ==SNK_UNATTACHED ) || + (port->enter_state ==SNK_DEBOUNCED && port->state ==SNK_UNATTACHED )); port->enter_state = port->state;
Greg Kroah-Hartman
maintainerPATCH 71/88 usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jimmy Hu <[email protected]>
commit 4987daf86c152ff882d51572d154ad12e4ff3a4b upstream.
It is possible that typec_register_partner() returns ERR_PTR on failure. When port->partner is an error, a NULL pointer dereference may occur as shown below.
[91222.095236][ T319] typec port0: failed to register partner (-17) ... [91225.061491][ T319] Unable to handle kernel NULL pointer dereference at virtual address 000000000000039f [91225.274642][ T319] pc : tcpm_pd_data_request+0x310/0x13fc [91225.274646][ T319] lr : tcpm_pd_data_request+0x298/0x13fc [91225.308067][ T319] Call trace: [91225.308070][ T319] tcpm_pd_data_request+0x310/0x13fc [91225.308073][ T319] tcpm_pd_rx_handler+0x100/0x9e8 [91225.355900][ T319] kthread_worker_fn+0x178/0x58c [91225.355902][ T319] kthread+0x150/0x200 [91225.355905][ T319] ret_from_fork+0x10/0x30
Add a check for port->partner to avoid dereferencing a NULL pointer.
--- drivers/usb/typec/tcpm/tcpm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/typec/tcpm/tcpm.c +3 -0
@@ -1625,6 +1625,9 @@ static int tcpm_pd_svdm(struct tcpm_portif (PD_VDO_VID (p[0 ]) !=USB_SID_PD )break ; +if (IS_ERR_OR_NULL (port->partner)) +break ; +if (PD_VDO_SVDM_VER (p[0 ]) < svdm_version) {typec_partner_set_svdm_version (port->partner,PD_VDO_SVDM_VER (p[0 ]));
Greg Kroah-Hartman
maintainerPATCH 72/88 usb: raw-gadget: properly handle interrupted requests
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Konovalov <[email protected]>
commit e8033bde451eddfb9b1bbd6e2d848c1b5c277222 upstream.
Currently, if a USB request that was queued by Raw Gadget is interrupted (via a signal), wait_for_completion_interruptible returns -ERESTARTSYS. Raw Gadget then attempts to propagate this value to userspace as a return value from its ioctls. However, when -ERESTARTSYS is returned by a syscall handler, the kernel internally restarts the syscall.
This doesn't allow userspace applications to interrupt requests queued by Raw Gadget (which is required when the emulated device is asked to switch altsettings). It also violates the implied interface of Raw Gadget that a single ioctl must only queue a single USB request.
Instead, make Raw Gadget do what GadgetFS does: check whether the request was interrupted (dequeued with status == -ECONNRESET) and report -EINTR to userspace.
--- drivers/usb/gadget/legacy/raw_gadget.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/usb/gadget/legacy/raw_gadget.c +16 -10
@@ -663,12 +663,12 @@ static int raw_process_ep0_io(struct rawif (WARN_ON (in && dev->ep0_out_pending)) { ret = -ENODEV ; dev->state =STATE_DEV_FAILED ; - goto out_done; + goto out_unlock; }if (WARN_ON (!in && dev->ep0_in_pending)) { ret = -ENODEV ; dev->state =STATE_DEV_FAILED ; - goto out_done; + goto out_unlock; } dev->req->buf = data;
@@ -683,7 +683,7 @@ static int raw_process_ep0_io(struct raw "fail, usb_ep_queue returned %d\n", ret);spin_lock_irqsave (&dev->lock, flags); dev->state =STATE_DEV_FAILED ; - goto out_done; + goto out_queue_failed; } ret =wait_for_completion_interruptible (&dev->ep0_done);
@@ -692,13 +692,16 @@ static int raw_process_ep0_io(struct rawusb_ep_dequeue (dev->gadget->ep0, dev->req);wait_for_completion (&dev->ep0_done);spin_lock_irqsave (&dev->lock, flags); - goto out_done; +if (dev->ep0_status == -ECONNRESET ) + dev->ep0_status = -EINTR ; + goto out_interrupted; }spin_lock_irqsave (&dev->lock, flags); - ret = dev->ep0_status; -out_done: +out_interrupted: + ret = dev->ep0_status; +out_queue_failed: dev->ep0_urb_queued = false; out_unlock:spin_unlock_irqrestore (&dev->lock, flags);
@@ -1067,7 +1070,7 @@ static int raw_process_ep_io(struct raw_ "fail, usb_ep_queue returned %d\n", ret);spin_lock_irqsave (&dev->lock, flags); dev->state =STATE_DEV_FAILED ; - goto out_done; + goto out_queue_failed; } ret =wait_for_completion_interruptible (&done);
@@ -1076,13 +1079,16 @@ static int raw_process_ep_io(struct raw_usb_ep_dequeue (ep->ep, ep->req);wait_for_completion (&done);spin_lock_irqsave (&dev->lock, flags); - goto out_done; +if (ep->status == -ECONNRESET ) + ep->status = -EINTR ; + goto out_interrupted; }spin_lock_irqsave (&dev->lock, flags); - ret = ep->status; -out_done: +out_interrupted: + ret = ep->status; +out_queue_failed: ep->urb_queued = false; out_unlock:spin_unlock_irqrestore (&dev->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 73/88 Bluetooth: hci_bcm4377: Mark bcm4378/bcm4387 as BROKEN_LE_CODED
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Janne Grunau <[email protected]>
commit 41e9cdea9c4ab6606ca462ff4ec901a82d022c05 upstream.
bcm4378 and bcm4387 claim to support LE Coded PHY but fail to pair (reliably) with BLE devices if it is enabled.
On bcm4378 pairing usually succeeds after 2-3 tries. On bcm4387 pairing appears to be completely broken.
--- drivers/bluetooth/hci_bcm4377.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/bluetooth/hci_bcm4377.c +5 -0
@@ -512,6 +512,7 @@ struct bcm4377_hw { unsigned long disable_aspm : 1; unsigned long broken_ext_scan : 1; unsigned long broken_mws_transport_config : 1; + unsigned long broken_le_coded : 1;int (*send_calibration)(struct bcm4377_data *bcm4377); int (*send_ptb)(struct bcm4377_data *bcm4377,
@@ -2372,6 +2373,8 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id)set_bit (HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG , &hdev->quirks);if (bcm4377->hw->broken_ext_scan)set_bit (HCI_QUIRK_BROKEN_EXT_SCAN , &hdev->quirks); +if (bcm4377->hw->broken_le_coded) +set_bit (HCI_QUIRK_BROKEN_LE_CODED , &hdev->quirks);pci_set_drvdata (pdev, bcm4377);hci_set_drvdata (hdev, bcm4377);
@@ -2461,6 +2464,7 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = { .bar0_core2_window2 = 0x18107000, .has_bar0_core2_window2 = true, .broken_mws_transport_config = true, + .broken_le_coded = true, .send_calibration = bcm4378_send_calibration, .send_ptb = bcm4378_send_ptb, },
@@ -2474,6 +2478,7 @@ static const struct bcm4377_hw bcm4377_hw_variants[] = { .has_bar0_core2_window2 = true, .clear_pciecfg_subsystem_ctrl_bit19 = true, .broken_mws_transport_config = true, + .broken_le_coded = true, .send_calibration = bcm4387_send_calibration, .send_ptb = bcm4378_send_ptb, },
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 74/88 tty: n_gsm: fix race condition in status line change on dead connections
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Starke <[email protected]>
commit 3a75b205de43365f80a33b98ec9289785da56243 upstream.
gsm_cleanup_mux() cleans up the gsm by closing all DLCIs, stopping all timers, removing the virtual tty devices and clearing the data queues. This procedure, however, may cause subsequent changes of the virtual modem status lines of a DLCI. More data is being added the outgoing data queue and the deleted kick timer is restarted to handle this. At this point many resources have already been removed by the cleanup procedure. Thus, a kernel panic occurs.
Fix this by proving in gsm_modem_update() that the cleanup procedure has not been started and the mux is still alive.
Note that writing to a virtual tty is already protected by checks against the DLCI specific connection state.
--- drivers/tty/n_gsm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/n_gsm.c +2 -0
@@ -4058,6 +4058,8 @@ static int gsm_modem_upd_via_msc(structstatic int gsm_modem_update (struct gsm_dlci *dlci,u8 brk) { +if (dlci->gsm->dead) +return -EL2HLT ;if (dlci->adaption ==2 ) {/* Send convergence layer type 2 empty data frame. */ gsm_modem_upd_via_data (dlci, brk);
Greg Kroah-Hartman
maintainerPATCH 48/88 LoongArch: Replace kmap_atomic() with kmap_local_page() in copy_user_highpage()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 477a0ebec101359f49d92796e3b609857d564b52 ]
Replace kmap_atomic()/kunmap_atomic() calls with kmap_local_page()/ kunmap_local() in copy_user_highpage() which can be invoked from both preemptible and atomic context [1].
[1] https://lore.kernel.org/all/[email protected]/
--- arch/loongarch/mm/init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/loongarch/mm/init.c +4 -4
@@ -68,11 +68,11 @@ void copy_user_highpage(struct page *to, struct page *from, {void *vfrom, *vto; - vto =kmap_atomic (to); - vfrom =kmap_atomic (from); + vfrom =kmap_local_page (from); + vto =kmap_local_page (to);copy_page (vto, vfrom); -kunmap_atomic (vfrom); -kunmap_atomic (vto); +kunmap_local (vfrom); +kunmap_local (vto);/* Make sure this page is cleared on other CPU's too before using it */ smp_wmb (); }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 75/88 tty: 8250: Remove UC-257 and UC-431
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit 33092fb3af51deb80849e90a17bada44bbcde6b3 upstream.
The UC-257 is a serial + LPT card, so remove it from this driver. A patch has been submitted to add it to parport_serial instead.
Additionaly, the UC-431 does not use this card ID, only the UC-420 does. The 431 is a 3-port card and there is no generic 3-port configuration available, so remove reference to it from this driver.
--- drivers/tty/serial/8250/8250_pci.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/tty/serial/8250/8250_pci.c +1 -8
@@ -4939,13 +4939,6 @@ static const struct pci_device_id serial0 ,0 , pbn_b2_1_115200 },/* -* Brainboxes UC-257 -*/ - { PCI_VENDOR_ID_INTASHIELD, 0x0861, -PCI_ANY_ID ,PCI_ANY_ID , -0 ,0 , - pbn_b2_2_115200 }, -/* * Brainboxes UC-260/271/701/756 */ { PCI_VENDOR_ID_INTASHIELD, 0x0D21,
@@ -5024,7 +5017,7 @@ static const struct pci_device_id serial0 ,0 , pbn_b2_4_115200 },/* -* Brainboxes UC-420/431 +* Brainboxes UC-420 */ { PCI_VENDOR_ID_INTASHIELD, 0x0921, PCI_ANY_ID, PCI_ANY_ID,
Greg Kroah-Hartman
maintainerPATCH 49/88 LoongArch: Disable WUC for pgprot_writecombine() like ioremap_wc()
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Icenowy Zheng <[email protected]>
[ Upstream commit 278be83601dd1725d4732241f066d528e160a39d ]
Currently the code disables WUC only disables it for ioremap_wc(), which is only used when mapping writecombine pages like ioremap() (mapped to the kernel space). But for VRAM mapped in TTM/GEM, it is mapped with a crafted pgprot by the pgprot_writecombine() function, in which case WUC isn't disabled now.
Disable WUC for pgprot_writecombine() (fallback to SUC) if needed, like ioremap_wc().
This improves the AMDGPU driver's stability (solves some misrendering) on Loongson-3A5000/3A6000 machines.
--- arch/loongarch/include/asm/io.h | 5 ++--- arch/loongarch/include/asm/pgtable-bits.h | 4 +++- arch/loongarch/kernel/setup.c | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-)
arch/loongarch/include/asm/io.h +2 -3
@@ -54,10 +54,9 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,* @offset: bus address of the memory * @size: size of the resource to map */ -extern pgprot_t pgprot_wc; -#define ioremap_wc (offset, size) \ - ioremap_prot((offset), (size), pgprot_val(pgprot_wc)) + ioremap_prot((offset), (size), \ + pgprot_val(wc_enabled ? PAGE_KERNEL_WUC : PAGE_KERNEL_SUC))#define ioremap_cache (offset, size) \ ioremap_prot((offset), (size), pgprot_val(PAGE_KERNEL))
arch/loongarch/include/asm/pgtable-bits.h +3 -1
@@ -105,13 +105,15 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)return __pgprot (prot); } +extern bool wc_enabled; +#define pgprot_writecombine pgprot_writecombinestatic inline pgprot_t pgprot_writecombine (pgprot_t _prot) {unsigned long prot =pgprot_val (_prot); - prot = (prot & ~_CACHE_MASK) | _CACHE_WUC; + prot = (prot & ~_CACHE_MASK) | (wc_enabled ? _CACHE_WUC : _CACHE_SUC);return __pgprot (prot); }
arch/loongarch/kernel/setup.c +5 -5
@@ -161,19 +161,19 @@ static void __init smbios_parse(void) }#ifdef CONFIG_ARCH_WRITECOMBINE -pgprot_t pgprot_wc =PAGE_KERNEL_WUC ; +bool wc_enabled = true;#else -pgprot_t pgprot_wc =PAGE_KERNEL_SUC ; +bool wc_enabled = false;#endif -EXPORT_SYMBOL (pgprot_wc); +EXPORT_SYMBOL (wc_enabled);static int __init setup_writecombine (char *p) {if (!strcmp (p,"on" )) - pgprot_wc =PAGE_KERNEL_WUC ; + wc_enabled = true;else if (!strcmp (p,"off" )) - pgprot_wc =PAGE_KERNEL_SUC ; + wc_enabled = false;else pr_warn ("Unknown writecombine setting \"%s\".\n" , p);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 50/88 netfilter: nf_tables: audit log object reset once per table
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phil Sutter <[email protected]>
[ Upstream commit 1baf0152f7707c6c7e4ea815dcc1f431c0e603f9 ]
When resetting multiple objects at once (via dump request), emit a log message per table (or filled skb) and resurrect the 'entries' parameter to contain the number of objects being logged for.
To test the skb exhaustion path, perform some bulk counter and quota adds in the kselftest.
--- net/netfilter/nf_tables_api.c | 50 +++++++++++-------- .../testing/selftests/netfilter/nft_audit.sh | 46 +++++++++++++++++ 2 files changed, 74 insertions(+), 22 deletions(-)
net/netfilter/nf_tables_api.c +28 -22
@@ -7604,6 +7604,16 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net,return -1 ; } +static void audit_log_obj_reset (const struct nft_table *table, +unsigned int base_seq,unsigned int nentries) +{ +char *buf =kasprintf (GFP_ATOMIC ,"%s:%u" , table->name, base_seq); + +audit_log_nfcfg (buf, table->family, nentries, +AUDIT_NFT_OP_OBJ_RESET ,GFP_ATOMIC ); +kfree (buf); +} +struct nft_obj_filter {char *table;u32 type;
@@ -7618,8 +7628,10 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)struct net *net =sock_net (skb->sk);int family = nfmsg->nfgen_family;struct nftables_pernet *nft_net; +unsigned int entries =0 ;struct nft_object *obj;bool reset = false; +int rc =0 ;if (NFNL_MSG_TYPE (cb->nlh->nlmsg_type) ==NFT_MSG_GETOBJ_RESET ) reset = true;
@@ -7632,6 +7644,7 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)if (family !=NFPROTO_UNSPEC && family != table->family)continue ; + entries =0 ;list_for_each_entry_rcu (obj, &table->objects, list) {if (!nft_is_active (net, obj)) goto cont;
@@ -7647,34 +7660,27 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb) filter->type != NFT_OBJECT_UNSPEC && obj->ops->type->type != filter->type) goto cont; -if (reset) { -char *buf =kasprintf (GFP_ATOMIC , -"%s:%u" , - table->name, - nft_net->base_seq); - -audit_log_nfcfg (buf, - family, - obj->handle, -AUDIT_NFT_OP_OBJ_RESET , -GFP_ATOMIC ); -kfree (buf); - } -if (nf_tables_fill_obj_info (skb, net,NETLINK_CB (cb->skb).portid, - cb->nlh->nlmsg_seq, -NFT_MSG_NEWOBJ , -NLM_F_MULTI |NLM_F_APPEND , - table->family, table, - obj, reset) <0 ) - goto done; + rc =nf_tables_fill_obj_info (skb, net, +NETLINK_CB (cb->skb).portid, + cb->nlh->nlmsg_seq, +NFT_MSG_NEWOBJ , +NLM_F_MULTI |NLM_F_APPEND , + table->family, table, + obj, reset); +if (rc <0 ) +break ; + entries++;nl_dump_check_consistent (cb,nlmsg_hdr (skb)); cont: idx++; } +if (reset && entries) +audit_log_obj_reset (table, nft_net->base_seq, entries); +if (rc <0 ) +break ; } -done:rcu_read_unlock (); cb->args[0 ] = idx;
@@ -7779,7 +7785,7 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,audit_log_nfcfg (buf, family, - obj->handle, +1 ,AUDIT_NFT_OP_OBJ_RESET ,GFP_ATOMIC );kfree (buf);
tools/testing/selftests/netfilter/nft_audit.sh +46 -0
64 lines not on this page · raw message
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 51/88 platform/mellanox: mlxbf-tmfifo: Fix a warning message
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liming Sun <[email protected]>
[ Upstream commit 99c09c985e5973c8f0ad976ebae069548dd86f12 ]
This commit fixes the smatch static checker warning in function mlxbf_tmfifo_rxtx_word() which complains data not initialized at line 634 when IS_VRING_DROP() is TRUE.
--- drivers/platform/mellanox/mlxbf-tmfifo.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/platform/mellanox/mlxbf-tmfifo.c +11 -10
@@ -607,24 +607,25 @@ static void mlxbf_tmfifo_rxtx_word(struct mlxbf_tmfifo_vring *vring,if (vring->cur_len +sizeof (u64) <= len) {/* The whole word. */ -if (!IS_VRING_DROP (vring)) { -if (is_rx) +if (is_rx) { +if (!IS_VRING_DROP (vring))memcpy (addr + vring->cur_len, &data,sizeof (u64)); -else -memcpy (&data, addr + vring->cur_len, -sizeof (u64)); + }else { +memcpy (&data, addr + vring->cur_len, +sizeof (u64)); } vring->cur_len +=sizeof (u64); }else {/* Leftover bytes. */ -if (!IS_VRING_DROP (vring)) { -if (is_rx) +if (is_rx) { +if (!IS_VRING_DROP (vring))memcpy (addr + vring->cur_len, &data, len - vring->cur_len); -else -memcpy (&data, addr + vring->cur_len, - len - vring->cur_len); + }else { + data =0 ; +memcpy (&data, addr + vring->cur_len, + len - vring->cur_len); } vring->cur_len = len; }
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 52/88 drm/amdgpu: Reserve fences for VM update
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Kuehling <[email protected]>
[ Upstream commit 316baf09d355aec1179981b6dfe28eba50c5ee5b ]
In amdgpu_dma_buf_move_notify reserve fences for the page table updates in amdgpu_vm_clear_freed and amdgpu_vm_handle_moved. This fixes a BUG_ON in dma_resv_add_fence when using SDMA for page table updates.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4 -1
@@ -403,7 +403,10 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach)continue ; } - r =amdgpu_vm_clear_freed (adev, vm,NULL ); +/* Reserve fences for two SDMA page table updates */ + r =dma_resv_reserve_fences (resv,2 ); +if (!r) + r =amdgpu_vm_clear_freed (adev, vm,NULL );if (!r) r =amdgpu_vm_handle_moved (adev, vm);
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 53/88 riscv: dts: thead: set dma-noncoherent to soc bus
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jisheng Zhang <[email protected]>
[ Upstream commit 759426c758c7053a941a4c06c7571461439fcff6 ]
riscv select ARCH_DMA_DEFAULT_COHERENT by default, and th1520 isn't dma coherent, so set dma-noncoherent to reflect this fact.
--- arch/riscv/boot/dts/thead/th1520.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/riscv/boot/dts/thead/th1520.dtsi +1 -0
@@ -139,6 +139,7 @@ interrupt-parent = <&plic>; #address-cells = <2>; #size-cells = <2>; + dma-noncoherent; ranges; plic: interrupt-controller@ffd8000000 {
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 54/88 net: chelsio: cxgb4: add an error code check in t4_load_phy_fw
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 9f771493da935299c6393ad3563b581255d01a37 ]
t4_set_params_timeout() can return -EINVAL if failed, add check for this.
--- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +2 -0
@@ -3816,6 +3816,8 @@ int t4_load_phy_fw(struct adapter *adap, int win, FW_PARAMS_PARAM_Z_V(FW_PARAMS_PARAM_DEV_PHYFW_DOWNLOAD)); ret =t4_set_params_timeout (adap, adap->mbox, adap->pf,0 ,1 , ¶m, &val,30000 ); +if (ret) +return ret;/* If we have version number support, then check to see that the new * firmware got loaded properly.
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 45/88 gpu/drm: Eliminate DRM_SCHED_PRIORITY_UNSET
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luben Tuikov <[email protected]>
[ Upstream commit fa8391ad68c16716e2c06ada397e99ceed2fb647 ]
Eliminate DRM_SCHED_PRIORITY_UNSET, value of -2, whose only user was amdgpu. Furthermore, eliminate an index bug, in that when amdgpu boots, it calls drm_sched_entity_init() with DRM_SCHED_PRIORITY_UNSET, which uses it to index sched->sched_rq[].
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 ++- include/drm/gpu_scheduler.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +2 -1
@@ -64,7 +64,8 @@ amdgpu_ctx_to_drm_sched_prio(int32_t ctx_prio) {switch (ctx_prio) {case AMDGPU_CTX_PRIORITY_UNSET : -return DRM_SCHED_PRIORITY_UNSET ; +pr_warn_once ("AMD-->DRM context priority value UNSET-->NORMAL" ); +return DRM_SCHED_PRIORITY_NORMAL ;case AMDGPU_CTX_PRIORITY_VERY_LOW :return DRM_SCHED_PRIORITY_MIN ;
include/drm/gpu_scheduler.h +1 -2
@@ -68,8 +68,7 @@ enum drm_sched_priority {DRM_SCHED_PRIORITY_HIGH ,DRM_SCHED_PRIORITY_KERNEL , -DRM_SCHED_PRIORITY_COUNT , - DRM_SCHED_PRIORITY_UNSET = -2 + DRM_SCHED_PRIORITY_COUNT };/* Used to chose between FIFO and RR jobs scheduling */
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 77/88 tty: 8250: Add support for Brainboxes UP cards
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit 2c6fec1e1532f15350be7e14ba6b88a39d289fe4 upstream.
Add support for the Brainboxes UP (powered PCI) range of cards, namely UP-189, UP-200, UP-869 and UP-880.
--- drivers/tty/serial/8250/8250_pci.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)
drivers/tty/serial/8250/8250_pci.c +60 -0
@@ -5081,6 +5081,66 @@ static const struct pci_device_id serial0 ,0 , pbn_b2_4_115200 },/* +* Brainboxes UP-189 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x0AC1, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0AC2, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0AC3, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, +/* +* Brainboxes UP-200 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x0B21, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0B22, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0B23, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, +/* +* Brainboxes UP-869 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x0C01, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0C02, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0C03, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, +/* +* Brainboxes UP-880 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x0C21, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0C22, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0C23, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, +/* * Brainboxes PX-101 */ { PCI_VENDOR_ID_INTASHIELD, 0x4005,
Greg Kroah-Hartman
maintainerPATCH 86/88 serial: core: Fix runtime PM handling for pending tx
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
commit 6f699743aebf07538e506a46c5965eb8bdd2c716 upstream.
Richard reported that a serial port may end up sometimes with tx data pending in the buffer for long periods of time.
Turns out we bail out early on any errors from pm_runtime_get(), including -EINPROGRESS. To fix the issue, we need to ignore -EINPROGRESS as we only care about the runtime PM usage count at this point. We check for an active runtime PM state later on for tx.
--- drivers/tty/serial/serial_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/serial_core.c +1 -1
@@ -147,7 +147,7 @@ static void __uart_start(struct tty_stru/* Increment the runtime PM usage count for the active check below */ err =pm_runtime_get (&port_dev->dev); -if (err <0 ) { +if (err <0 && err != -EINPROGRESS ) {pm_runtime_put_noidle (&port_dev->dev);return ; }
Greg Kroah-Hartman
maintainerPATCH 87/88 ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Hasemeyer <[email protected]>
commit 7c05b44e1a50d9cbfc4f731dddc436a24ddc129a upstream.
Some Jasperlake Chromebooks overwrite the system vendor DMI value to the name of the OEM that manufactured the device. This breaks Chromebook quirk detection as it expects the system vendor to be "Google".
Add another quirk detection entry that looks for "Google" in the BIOS version.
--- sound/hda/intel-dsp-config.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/hda/intel-dsp-config.c +6 -0
@@ -343,6 +343,12 @@ static const struct config_entry config_ DMI_MATCH(DMI_SYS_VENDOR, "Google"), } }, + { + .ident = "Google firmware", + .matches = { + DMI_MATCH(DMI_BIOS_VERSION, "Google"), + } + }, {} } },
Greg Kroah-Hartman
maintainerPATCH 88/88 ASoC: SOF: sof-pci-dev: Fix community key quirk detection
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Hasemeyer <[email protected]>
commit 7dd692217b861a8292ff8ac2c9d4458538fd6b96 upstream.
Some Chromebooks do not populate the product family DMI value resulting in firmware load failures.
Add another quirk detection entry that looks for "Google" in the BIOS version. Theoretically, PRODUCT_FAMILY could be replaced with BIOS_VERSION, but it is left as a quirk to be conservative.
--- sound/soc/sof/sof-pci-dev.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/sof/sof-pci-dev.c +7 -0
@@ -145,6 +145,13 @@ static const struct dmi_system_id commun DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"), } }, + { + .ident = "Google firmware", + .callback = chromebook_use_community_key, + .matches = { + DMI_MATCH(DMI_BIOS_VERSION, "Google"), + } + }, {}, };
Greg Kroah-Hartman
maintainerPATCH 78/88 tty: 8250: Add support for Intashield IS-100
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit 4d994e3cf1b541ff32dfb03fbbc60eea68f9645b upstream.
Add support for the Intashield IS-100 1 port serial card.
--- drivers/tty/serial/8250/8250_pci.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/8250/8250_pci.c +6 -0
@@ -4912,6 +4912,12 @@ static const struct pci_device_id serial pbn_b1_bt_1_115200 },/* +* IntaShield IS-100 +*/ + {PCI_VENDOR_ID_INTASHIELD ,0x0D60 , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + pbn_b2_1_115200 }, +/* * IntaShield IS-200 */ { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200,
Greg Kroah-Hartman
maintainerPATCH 79/88 tty: 8250: Fix port count of PX-257
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit d0ff5b24c2f112f29dea4c38b3bac9597b1be9ba upstream.
The port count of the PX-257 Rev3 is actually 2, not 4.
--- drivers/tty/serial/8250/8250_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_pci.c +1 -1
@@ -5178,7 +5178,7 @@ static const struct pci_device_id serial {PCI_VENDOR_ID_INTASHIELD ,0x4015 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , - pbn_oxsemi_4_15625000 }, + pbn_oxsemi_2_15625000 },/* * Brainboxes PX-260/PX-701 */
Greg Kroah-Hartman
maintainerPATCH 80/88 tty: 8250: Fix up PX-803/PX-857
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit ee61337b934c99c2611e0a945d592019b2e00c82 upstream.
The PX-803/PX-857 are variants of each other, add a note. Additionally fix up the port counts for the card (2, not 1).
--- drivers/tty/serial/8250/8250_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/serial/8250/8250_pci.c +3 -3
@@ -5233,16 +5233,16 @@ static const struct pci_device_id serial0 ,0 , pbn_oxsemi_4_15625000 },/* -* Brainboxes PX-803 +* Brainboxes PX-803/PX-857 */ { PCI_VENDOR_ID_INTASHIELD, 0x4009,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , - pbn_b0_1_115200 }, + pbn_b0_2_115200 }, { PCI_VENDOR_ID_INTASHIELD, 0x401E,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , - pbn_oxsemi_1_15625000 }, + pbn_oxsemi_2_15625000 },/* * Brainboxes PX-846 */
Greg Kroah-Hartman
maintainerPATCH 81/88 tty: 8250: Add support for additional Brainboxes PX cards
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit 9604884e592cd04ead024c9737c67a77f175cab9 upstream.
Add support for some more of the Brainboxes PX (PCIe) range of serial cards, namely
PX-275/PX-279, PX-475 (serial port, not LPT), PX-820, PX-803/PX-857 (additional ID).
--- drivers/tty/serial/8250/8250_pci.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/tty/serial/8250/8250_pci.c +29 -0
@@ -5187,6 +5187,13 @@ static const struct pci_device_id serial0 ,0 , pbn_oxsemi_4_15625000 },/* +* Brainboxes PX-275/279 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x0E41, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_8_115200 }, +/* * Brainboxes PX-310 */ { PCI_VENDOR_ID_INTASHIELD, 0x400E,
@@ -5233,17 +5240,39 @@ static const struct pci_device_id serial0 ,0 , pbn_oxsemi_4_15625000 },/* +* Brainboxes PX-475 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x401D, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_oxsemi_1_15625000 }, +/* * Brainboxes PX-803/PX-857 */ { PCI_VENDOR_ID_INTASHIELD, 0x4009,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b0_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x4018, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_oxsemi_2_15625000 }, { PCI_VENDOR_ID_INTASHIELD, 0x401E,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_oxsemi_2_15625000 },/* +* Brainboxes PX-820 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x4002, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b0_4_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x4013, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_oxsemi_4_15625000 }, +/* * Brainboxes PX-846 */ { PCI_VENDOR_ID_INTASHIELD, 0x4008,
Greg Kroah-Hartman
maintainerPATCH 82/88 tty: 8250: Add support for Intashield IX cards
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit 62d2ec2ded278c7512d91ca7bf8eb9bac46baf90 upstream.
Add support for the IX-100, IX-200 and IX-400 serial cards.
--- drivers/tty/serial/8250/8250_pci.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/tty/serial/8250/8250_pci.c +21 -0
@@ -4929,6 +4929,27 @@ static const struct pci_device_id serial {PCI_VENDOR_ID_INTASHIELD ,PCI_DEVICE_ID_INTASHIELD_IS400 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,/* 135a.0dc0 */ pbn_b2_4_115200 }, +/* +* IntaShield IX-100 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x4027, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_oxsemi_1_15625000 }, +/* +* IntaShield IX-200 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x4028, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_oxsemi_2_15625000 }, +/* +* IntaShield IX-400 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x4029, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_oxsemi_4_15625000 },/* Brainboxes Devices */ /* * Brainboxes UC-101
Greg Kroah-Hartman
maintainerPATCH 83/88 tty: 8250: Add Brainboxes Oxford Semiconductor-based quirks
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit e4876dacaca46a1b09f9b417480924ab12019a5b upstream.
Some of the later revisions of the Brainboxes PX cards are based on the Oxford Semiconductor chipset. Due to the chip's unique setup these cards need to be initialised.
Previously these were tested against a reference card with the same broken baudrate on another PC, cancelling out the effect. With this patch they work and can transfer/receive find against an FTDI-based device.
Add all of the cards which require this setup to the quirks table. Thanks to Maciej W. Rozycki for clarification on this chip.
--- drivers/tty/serial/8250/8250_pci.c | 147 +++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+)
drivers/tty/serial/8250/8250_pci.c +147 -0
@@ -2427,6 +2427,153 @@ static struct pci_serial_quirk pci_seria .init = pci_oxsemi_tornado_init, .setup = pci_oxsemi_tornado_setup, }, + /* + * Brainboxes devices - all Oxsemi based + */ + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4027, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4028, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4029, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4019, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4016, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4015, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x400A, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x400E, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x400C, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x400B, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x400F, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4010, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4011, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x401D, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x401E, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4013, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4017, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, + { + .vendor = PCI_VENDOR_ID_INTASHIELD, + .device = 0x4018, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .init = pci_oxsemi_tornado_init, + .setup = pci_oxsemi_tornado_setup, + }, { .vendor = PCI_VENDOR_ID_INTEL, .device = 0x8811,
Greg Kroah-Hartman
maintainerPATCH 84/88 dt-bindings: serial: rs485: Add rs485-rts-active-high
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francesco Dolcini <[email protected]>
commit 0c01b20fb50ba63c03841aa83070dc59c3b1b02f upstream.
Add rs485-rts-active-high property, this is a legacy property used by 8250_omap.
This fixes the following make dt_binding_check warning:
Documentation/devicetree/bindings/serial/8250_omap.yaml:
rs485-rts-active-high: missing type definition
--- Documentation/devicetree/bindings/serial/rs485.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/serial/rs485.yaml +4 -0
@@ -29,6 +29,10 @@ properties: default: 0 maximum: 100 + rs485-rts-active-high: + description: drive RTS high when sending (this is the default). + $ref: /schemas/types.yaml#/definitions/flag + rs485-rts-active-low: description: drive RTS low when sending (default is high). $ref: /schemas/types.yaml#/definitions/flag
Signature · 1 line
2.42.0
Greg Kroah-Hartman
maintainerPATCH 85/88 misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP device support
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Vadapalli <[email protected]>
commit 8293703a492ae97c86af27c75b76e6239ec86483 upstream.
Add DEVICE_ID for J721S2 and enable support for endpoints configured with this DEVICE_ID in the pci_endpoint_test driver.
--- drivers/misc/pci_endpoint_test.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/misc/pci_endpoint_test.c +4 -0
@@ -71,6 +71,7 @@#define PCI_DEVICE_ID_TI_AM654 0xb00c#define PCI_DEVICE_ID_TI_J7200 0xb00f#define PCI_DEVICE_ID_TI_AM64 0xb010 +#define PCI_DEVICE_ID_TI_J721S2 0xb013#define PCI_DEVICE_ID_LS1088A 0x80c0#define PCI_DEVICE_ID_IMX8 0x0808
@@ -999,6 +1000,9 @@ static const struct pci_device_id pci_en { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_AM64), .driver_data = (kernel_ulong_t)&j721e_data, }, + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J721S2), + .driver_data = (kernel_ulong_t)&j721e_data, + }, { } };MODULE_DEVICE_TABLE (pci, pci_endpoint_test_tbl);
Greg Kroah-Hartman
maintainerPATCH 76/88 tty: 8250: Add support for additional Brainboxes UC cards
In reply to Greg Kroah-Hartman6.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
commit c563db486db7d245c0e2f319443417ae8e692f7f upstream.
Add device IDs for some more Brainboxes UC cards, namely UC-235/UC-246, UC-253/UC-734, UC-302, UC-313, UC-346, UC-357, UC-607 and UC-836.
--- drivers/tty/serial/8250/8250_pci.c | 57 +++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
drivers/tty/serial/8250/8250_pci.c +57 -0
@@ -4938,6 +4938,17 @@ static const struct pci_device_id serialPCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b2_1_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0AA2, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_1_115200 }, +/* +* Brainboxes UC-253/UC-734 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x0CA1, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 },/* * Brainboxes UC-260/271/701/756 */
@@ -4970,6 +4981,14 @@ static const struct pci_device_id serialPCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x08E2, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x08E3, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 },/* * Brainboxes UC-310 */
@@ -4980,6 +4999,14 @@ static const struct pci_device_id serial/* * Brainboxes UC-313 */ + {PCI_VENDOR_ID_INTASHIELD ,0x08A1 , +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x08A2, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, { PCI_VENDOR_ID_INTASHIELD, 0x08A3,PCI_ANY_ID ,PCI_ANY_ID , 0, 0,
@@ -4994,6 +5021,10 @@ static const struct pci_device_id serial/* * Brainboxes UC-346 */ + {PCI_VENDOR_ID_INTASHIELD ,0x0B01 , +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_4_115200 }, { PCI_VENDOR_ID_INTASHIELD, 0x0B02,PCI_ANY_ID ,PCI_ANY_ID , 0, 0,
@@ -5005,6 +5036,10 @@ static const struct pci_device_id serialPCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x0A82, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, { PCI_VENDOR_ID_INTASHIELD, 0x0A83,PCI_ANY_ID ,PCI_ANY_ID , 0, 0,
@@ -5023,6 +5058,28 @@ static const struct pci_device_id serialPCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b2_4_115200 }, +/* +* Brainboxes UC-607 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x09A1, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x09A2, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, + { PCI_VENDOR_ID_INTASHIELD, 0x09A3, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_2_115200 }, +/* +* Brainboxes UC-836 +*/ + { PCI_VENDOR_ID_INTASHIELD, 0x0D41, +PCI_ANY_ID ,PCI_ANY_ID , +0 ,0 , + pbn_b2_4_115200 },/* * Brainboxes PX-101 */
Hello,
Quoted 5 lines · On Mon, 6 Nov 2023 14:02:54 +0100 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.
This rc kernel passes DAMON functionality test[1] on my test machine. Attaching the test results summary below. Please note that I retrieved the kernel from linux-stable-rc tree[2].
[1] https://github.com/awslabs/damon-tests/tree/next/corr
[2] 73d52afec3ab ("Linux 6.5.11-rc1")
Thanks,
SJ
[...]
---
ok 1 selftests: damon: debugfs_attrs.sh
ok 2 selftests: damon: debugfs_schemes.sh
ok 3 selftests: damon: debugfs_target_ids.sh
ok 4 selftests: damon: debugfs_empty_targets.sh
ok 5 selftests: damon: debugfs_huge_count_read_write.sh
ok 6 selftests: damon: debugfs_duplicate_context_creation.sh
ok 7 selftests: damon: debugfs_rm_non_contexts.sh
ok 8 selftests: damon: sysfs.sh
ok 9 selftests: damon: sysfs_update_removed_scheme_dir.sh
ok 10 selftests: damon: reclaim.sh
ok 11 selftests: damon: lru_sort.sh
ok 1 selftests: damon-tests: kunit.sh
ok 2 selftests: damon-tests: huge_count_read_write.sh
ok 3 selftests: damon-tests: buffer_overflow.sh
ok 4 selftests: damon-tests: rm_contexts.sh
ok 5 selftests: damon-tests: record_null_deref.sh
ok 6 selftests: damon-tests: dbgfs_target_ids_read_before_terminate_race.sh ok 7 selftests: damon-tests: dbgfs_target_ids_pid_leak.sh
ok 8 selftests: damon-tests: damo_tests.sh
ok 9 selftests: damon-tests: masim-record.sh
ok 10 selftests: damon-tests: build_i386.sh
ok 11 selftests: damon-tests: build_arm64.sh
ok 12 selftests: damon-tests: build_i386_idle_flag.sh
ok 13 selftests: damon-tests: build_i386_highpte.sh
ok 14 selftests: damon-tests: build_nomemcg.sh
[33m
[92mPASS [39m
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 against the Fedora build system (aarch64, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Successfully compiled and installed bindeb-pkgs on my computer (Acer Aspire E15, Intel Core i3 Haswell). No noticeable regressions.
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.5:
10 builds: 10 pass, 0 fail
26 boots: 26 pass, 0 fail
88 tests: 88 pass, 0 failLinux version: 6.5.11-rc1-g73d52afec3ab
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Cheers,
Conor.
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 6.5.11-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-6.5.y
* git commit: 73d52afec3ab4d2fede2bfcd5e386ef12e6181ba
* git describe: v6.5.10-89-g73d52afec3ab
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.5.y/build/v6.5.10-89-g73d52afec3ab
## Test Regressions (compared to v6.5.10)
## Metric Regressions (compared to v6.5.10)
## Test Fixes (compared to v6.5.10)
## Metric Fixes (compared to v6.5.10)
## Test result summary
total: 137604, pass: 118888, fail: 1923, skip: 16686, xfail: 107
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 140 total, 140 passed, 0 failed
* arm64: 53 total, 51 passed, 2 failed
* i386: 41 total, 41 passed, 0 failed
* mips: 25 total, 25 passed, 0 failed
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 34 total, 34 passed, 0 failed
* riscv: 25 total, 25 passed, 0 failed
* s390: 13 total, 13 passed, 0 failed
* sh: 10 total, 10 passed, 0 failed
* sparc: 8 total, 8 passed, 0 failed
* x86_64: 46 total, 46 passed, 0 failed
## Test suites summary
* boot
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-filesystems-epoll
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-vm
* kselftest-watchdog
* kselftest-x86
* kselftest-zram
* kunit
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* perf
* rcutorture
* v4l2-compliance
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.5.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.5.y
and the diffstat can be found below.thanks,
greg k-h
No regressions on my system.
Thank you.
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.5.11 release. There are 88 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 08 Nov 2023 13:02:46 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 157 fail: 0 Qemu test results: total: 530 pass: 530 fail: 0
Guenter