phy: qcom-snps-femto-v2: keep cfg_ahb_clk enabled during runtime suspend
Subsystems (17)
Sasha Levin
maintainerPATCH 1/25 phy: qcom-snps-femto-v2: keep cfg_ahb_clk enabled during runtime suspend
From: Adrien Thierry <[email protected]>
[ Upstream commit 45d89a344eb46db9dce851c28e14f5e3c635c251 ]
In the dwc3 core, both system and runtime suspend end up calling dwc3_suspend_common(). From there, what happens for the PHYs depends on the USB mode and whether the controller is entering system or runtime suspend.
HOST mode:
(1) system suspend on a non-wakeup-capable controller
The [1] if branch is taken. dwc3_core_exit() is called, which ends up calling phy_power_off() and phy_exit(). Those two functions decrease the PM runtime count at some point, so they will trigger the PHY runtime sleep (assuming the count is right).
(2) runtime suspend / system suspend on a wakeup-capable controller
The [1] branch is not taken. dwc3_suspend_common() calls phy_pm_runtime_put_sync(). Assuming the ref count is right, the PHY runtime suspend op is called.
DEVICE mode:
dwc3_core_exit() is called on both runtime and system sleep unless the controller is already runtime suspended.
OTG mode:
(1) system suspend : dwc3_core_exit() is called
(2) runtime suspend : do nothing
In host mode, the code seems to make a distinction between 1) runtime sleep / system sleep for wakeup-capable controller, and 2) system sleep for non-wakeup-capable controller, where phy_power_off() and phy_exit() are only called for the latter. This suggests the PHY is not supposed to be in a fully powered-off state for runtime sleep and system sleep for wakeup-capable controller.
Moreover, downstream, cfg_ahb_clk only gets disabled for system suspend. The clocks are disabled by phy->set_suspend() [2] which is only called in the system sleep path through dwc3_core_exit() [3].
With that in mind, don't disable the clocks during the femto PHY runtime suspend callback. The clocks will only be disabled during system suspend for non-wakeup-capable controllers, through dwc3_core_exit().
[1] https://elixir.bootlin.com/linux/v6.4/source/drivers/usb/dwc3/core.c#L1988
[2] https://git.codelinaro.org/clo/la/kernel/msm-5.4/-/blob/LV.AU.1.2.1.r2-05300-gen3meta.0/drivers/usb/phy/phy-msm-snps-hs.c#L524
[3] https://git.codelinaro.org/clo/la/kernel/msm-5.4/-/blob/LV.AU.1.2.1.r2-05300-gen3meta.0/drivers/usb/dwc3/core.c#L1915
--- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c +0 -9
@@ -122,22 +122,13 @@ static int qcom_snps_hsphy_suspend(struct qcom_snps_hsphy *hsphy) 0, USB2_AUTO_RESUME); } -clk_disable_unprepare (hsphy->cfg_ahb_clk);return 0 ; }static int qcom_snps_hsphy_resume (struct qcom_snps_hsphy *hsphy) { -int ret; -dev_dbg (&hsphy->phy->dev,"Resume QCOM SNPS PHY, mode\n" ); - ret =clk_prepare_enable (hsphy->cfg_ahb_clk); -if (ret) { -dev_err (&hsphy->phy->dev,"failed to enable cfg ahb clock\n" ); -return ret; - } -return 0 ; }
Signature · 7 lines
2.40.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Sasha Levin
maintainerPATCH 2/25 phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code
From: Adrien Thierry <[email protected]>
[ Upstream commit 8932089b566c24ea19b57e37704c492678de1420 ]
The return value from qcom_snps_hsphy_suspend/resume is not used. Make sure qcom_snps_hsphy_runtime_suspend/resume return this value as well.
--- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c +2 -4
@@ -139,8 +139,7 @@ static int __maybe_unused qcom_snps_hsphy_runtime_suspend(struct device *dev)if (!hsphy->phy_initialized)return 0 ; -qcom_snps_hsphy_suspend (hsphy); -return 0 ; +return qcom_snps_hsphy_suspend (hsphy); }static int __maybe_unused qcom_snps_hsphy_runtime_resume (struct device *dev)
@@ -150,8 +149,7 @@ static int __maybe_unused qcom_snps_hsphy_runtime_resume(struct device *dev)if (!hsphy->phy_initialized)return 0 ; -qcom_snps_hsphy_resume (hsphy); -return 0 ; +return qcom_snps_hsphy_resume (hsphy); } static int qcom_snps_hsphy_set_mode(struct phy *phy, enum phy_mode mode,
Signature · 7 lines
2.40.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Sasha Levin
maintainerPATCH 3/25 media: pulse8-cec: handle possible ping error
In reply to Sasha LevinFrom: Dmitry Antipov <[email protected]>
[ Upstream commit 92cbf865ea2e0f2997ff97815c6db182eb23df1b ]
Handle (and warn about) possible error waiting for MSGCODE_PING result.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/cec/usb/pulse8/pulse8-cec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/cec/usb/pulse8/pulse8-cec.c +5 -2
@@ -809,8 +809,11 @@ static void pulse8_ping_eeprom_work_handler(struct work_struct *work)mutex_lock (&pulse8->lock); cmd =MSGCODE_PING ; -pulse8_send_and_wait (pulse8, &cmd,1 , -MSGCODE_COMMAND_ACCEPTED ,0 ); +if (pulse8_send_and_wait (pulse8, &cmd,1 , +MSGCODE_COMMAND_ACCEPTED ,0 )) { +dev_warn (pulse8->dev,"failed to ping EEPROM\n" ); + goto unlock; + }if (pulse8->vers <2 ) goto unlock;
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 4/25 media: pci: cx23885: fix error handling for cx23885 ATSC boards
In reply to Sasha LevinFrom: Nikolay Burykin <[email protected]>
[ Upstream commit 4aaa96b59df5fac41ba891969df6b092061ea9d7 ]
After having been assigned to NULL value at cx23885-dvb.c:1202, pointer '0' is dereferenced at cx23885-dvb.c:2469.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/pci/cx23885/cx23885-dvb.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/media/pci/cx23885/cx23885-dvb.c +0 -12
@@ -2459,16 +2459,10 @@ static int dvb_register(struct cx23885_tsport *port)request_module ("%s" , info.type); client_tuner =i2c_new_client_device (&dev->i2c_bus[1 ].i2c_adap, &info);if (!i2c_client_has_driver (client_tuner)) { -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; }if (!try_module_get (client_tuner->dev.driver->owner)) {i2c_unregister_device (client_tuner); -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; } port->i2c_client_tuner = client_tuner;
@@ -2505,16 +2499,10 @@ static int dvb_register(struct cx23885_tsport *port)request_module ("%s" , info.type); client_tuner =i2c_new_client_device (&dev->i2c_bus[1 ].i2c_adap, &info);if (!i2c_client_has_driver (client_tuner)) { -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; }if (!try_module_get (client_tuner->dev.driver->owner)) {i2c_unregister_device (client_tuner); -module_put (client_demod->dev.driver->owner); -i2c_unregister_device (client_demod); - port->i2c_client_demod =NULL ; goto frontend_detach; } port->i2c_client_tuner = client_tuner;
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 5/25 9p: virtio: make sure 'offs' is initialized in zc_request
In reply to Sasha LevinFrom: Dominique Martinet <[email protected]>
[ Upstream commit 4a73edab69d3a6623f03817fe950a2d9585f80e4 ]
Similarly to the previous patch: offs can be used in handle_rerrors without initializing on small payloads; in this case handle_rerrors will not use it because of the size check, but it doesn't hurt to make sure it is zero to please scan-build.
This fixes the following warning:net/9p/trans_virtio.c:539:3: warning: 3rd function call argument is an uninitialized value [core.CallAndMessage]
handle_rerror(req, in_hdr_len, offs, in_pages);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- net/9p/trans_virtio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/9p/trans_virtio.c +1 -1
@@ -394,7 +394,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,struct page **in_pages =NULL , **out_pages =NULL ;struct virtio_chan *chan = client->trans;struct scatterlist *sgs[4 ]; -size_t offs; +size_t offs =0 ;int need_drop =0 ;int kicked =0 ;
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 6/25 ASoC: da7219: Flush pending AAD IRQ when suspending
In reply to Sasha LevinFrom: Dmytro Maluka <[email protected]>
[ Upstream commit 91e292917dad64ab8d1d5ca2ab3069ad9dac6f72 ]
da7219_aad_suspend() disables jack detection, which should prevent generating new interrupts by DA7219 while suspended. However, there is a theoretical possibility that there is a pending interrupt generated just before suspending DA7219 and not handled yet, so the IRQ handler may still run after DA7219 is suspended. To prevent that, wait until the pending IRQ handling is done.
This patch arose as an attempt to fix the following I2C failure occurring sometimes during system suspend or resume:
[ 355.876211] i2c_designware i2c_designware.3: Transfer while suspended [ 355.876245] WARNING: CPU: 2 PID: 3576 at drivers/i2c/busses/i2c-designware-master.c:570 i2c_dw_xfer+0x411/0x440 ... [ 355.876462] Call Trace: [ 355.876468] <TASK> [ 355.876475] ? update_load_avg+0x1b3/0x615 [ 355.876484] __i2c_transfer+0x101/0x1d8 [ 355.876494] i2c_transfer+0x74/0x10d [ 355.876504] regmap_i2c_read+0x6a/0x9c [ 355.876513] _regmap_raw_read+0x179/0x223 [ 355.876521] regmap_raw_read+0x1e1/0x28e [ 355.876527] regmap_bulk_read+0x17d/0x1ba [ 355.876532] ? __wake_up+0xed/0x1bb [ 355.876542] da7219_aad_irq_thread+0x54/0x2c9 [snd_soc_da7219 5fb8ebb2179cf2fea29af090f3145d68ed8e2184] [ 355.876556] irq_thread+0x13c/0x231 [ 355.876563] ? irq_forced_thread_fn+0x5f/0x5f [ 355.876570] ? irq_thread_fn+0x4d/0x4d [ 355.876576] kthread+0x13a/0x152 [ 355.876581] ? synchronize_irq+0xc3/0xc3 [ 355.876587] ? kthread_blkcg+0x31/0x31 [ 355.876592] ret_from_fork+0x1f/0x30 [ 355.876601] </TASK>
which indicates that the AAD IRQ handler is unexpectedly running when DA7219 is suspended, and as a result, is trying to read data from DA7219 over I2C and is hitting the I2C driver "Transfer while suspended" failure.
However, with this patch the above failure is still reproducible. So this patch does not fix any real observed issue so far, but at least is useful for confirming that the above issue is not caused by a pending IRQ but rather looks like a DA7219 hardware issue with an IRQ unexpectedly generated after jack detection is already disabled.
--- sound/soc/codecs/da7219-aad.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/da7219-aad.c +2 -0
@@ -854,6 +854,8 @@ void da7219_aad_suspend(struct snd_soc_component *component) } } } + +synchronize_irq (da7219_aad->irq); }void da7219_aad_resume (struct snd_soc_component *component)
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 7/25 ASoC: da7219: Check for failure reading AAD IRQ events
In reply to Sasha LevinFrom: Dmytro Maluka <[email protected]>
[ Upstream commit f0691dc16206f21b13c464434366e2cd632b8ed7 ]
When handling an AAD interrupt, if IRQ events read failed (for example, due to i2c "Transfer while suspended" failure, i.e. when attempting to read it while DA7219 is suspended, which may happen due to a spurious AAD interrupt), the events array contains garbage uninitialized values. So instead of trying to interprete those values and doing any actions based on them (potentially resulting in misbehavior, e.g. reporting bogus events), refuse to handle the interrupt.
--- sound/soc/codecs/da7219-aad.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/soc/codecs/da7219-aad.c +7 -3
@@ -347,11 +347,15 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data)struct da7219_priv *da7219 =snd_soc_component_get_drvdata (component);u8 events[DA7219_AAD_IRQ_REG_MAX ];u8 statusa; -int i, report =0 , mask =0 ; +int i, ret, report =0 , mask =0 ;/* Read current IRQ events */ -regmap_bulk_read (da7219->regmap,DA7219_ACCDET_IRQ_EVENT_A , - events,DA7219_AAD_IRQ_REG_MAX ); + ret =regmap_bulk_read (da7219->regmap,DA7219_ACCDET_IRQ_EVENT_A , + events,DA7219_AAD_IRQ_REG_MAX ); +if (ret) { +dev_warn_ratelimited (component->dev,"Failed to read IRQ events: %d\n" , ret); +return IRQ_NONE ; + }if (!events[DA7219_AAD_IRQ_REG_A ] && !events[DA7219_AAD_IRQ_REG_B ])return IRQ_NONE ;
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 8/25 ethernet: atheros: fix return value check in atl1c_tso_csum()
In reply to Sasha LevinFrom: Yuanjun Gong <[email protected]>
[ Upstream commit 8d01da0a1db237c44c92859ce3612df7af8d3a53 ]
in atl1c_tso_csum, it should check the return value of pskb_trim(), and return an error code if an unexpected value is returned by pskb_trim().
--- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +5 -2
@@ -1987,8 +1987,11 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, real_len = (((unsigned char *)ip_hdr (skb) - skb->data) +ntohs (ip_hdr (skb)->tot_len)); -if (real_len < skb->len) -pskb_trim (skb, real_len); +if (real_len < skb->len) { + err =pskb_trim (skb, real_len); +if (err) +return err; + } hdr_len = (skb_transport_offset (skb) +tcp_hdrlen (skb));if (unlikely (skb->len == hdr_len)) {
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 9/25 vxlan: generalize vxlan_parse_gpe_hdr and remove unused args
In reply to Sasha LevinFrom: Jiri Benc <[email protected]>
[ Upstream commit 17a0a64448b568442a101de09575f81ffdc45d15 ]
The vxlan_parse_gpe_hdr function extracts the next protocol value from the GPE header and marks GPE bits as parsed.
In order to be used in the next patch, split the function into protocol extraction and bit marking. The bit marking is meaningful only in vxlan_rcv; move it directly there.
Rename the function to vxlan_parse_gpe_proto to reflect what it now does. Remove unused arguments skb and vxflags. Move the function earlier in the file to allow it to be called from more places in the next patch.
--- drivers/net/vxlan.c | 58 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 30 deletions(-)
drivers/net/vxlan.c +28 -30
@@ -729,6 +729,32 @@ static int vxlan_fdb_append(struct vxlan_fdb *f,return 1 ; } +static bool vxlan_parse_gpe_proto (struct vxlanhdr *hdr,__be16 *protocol) +{ +struct vxlanhdr_gpe *gpe = (struct vxlanhdr_gpe *)hdr; + +/* Need to have Next Protocol set for interfaces in GPE mode. */ +if (!gpe->np_applied) +return false; +/* "The initial version is 0. If a receiver does not support the +* version indicated it MUST drop the packet. +*/ +if (gpe->version !=0 ) +return false; +/* "When the O bit is set to 1, the packet is an OAM packet and OAM +* processing MUST occur." However, we don't implement OAM +* processing, thus drop the packet. +*/ +if (gpe->oam_flag) +return false; + + *protocol =tun_p_to_eth_p (gpe->next_protocol); +if (!*protocol) +return false; + +return true; +} + static struct vxlanhdr *vxlan_gro_remcsum(struct sk_buff *skb, unsigned int off, struct vxlanhdr *vh, size_t hdrlen,
@@ -1737,35 +1763,6 @@ static void vxlan_parse_gbp_hdr(struct vxlanhdr *unparsed, unparsed->vx_flags &= ~VXLAN_GBP_USED_BITS ; } -static bool vxlan_parse_gpe_hdr (struct vxlanhdr *unparsed, -__be16 *protocol, -struct sk_buff *skb,u32 vxflags) -{ -struct vxlanhdr_gpe *gpe = (struct vxlanhdr_gpe *)unparsed; - -/* Need to have Next Protocol set for interfaces in GPE mode. */ -if (!gpe->np_applied) -return false; -/* "The initial version is 0. If a receiver does not support the -* version indicated it MUST drop the packet. -*/ -if (gpe->version !=0 ) -return false; -/* "When the O bit is set to 1, the packet is an OAM packet and OAM -* processing MUST occur." However, we don't implement OAM -* processing, thus drop the packet. -*/ -if (gpe->oam_flag) -return false; - - *protocol =tun_p_to_eth_p (gpe->next_protocol); -if (!*protocol) -return false; - - unparsed->vx_flags &= ~VXLAN_GPE_USED_BITS ; -return true; -} -static bool vxlan_set_mac (struct vxlan_dev *vxlan,struct vxlan_sock *vs,struct sk_buff *skb,__be32 vni)
@@ -1866,8 +1863,9 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)* used by VXLAN extensions if explicitly requested. */ if (vs->flags &VXLAN_F_GPE ) { -if (!vxlan_parse_gpe_hdr (&unparsed, &protocol, skb, vs->flags)) +if (!vxlan_parse_gpe_proto (&unparsed, &protocol)) goto drop; + unparsed.vx_flags &= ~VXLAN_GPE_USED_BITS ; raw_proto = true; }
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 10/25 m68k: Fix invalid .section syntax
In reply to Sasha LevinFrom: Ben Hutchings <[email protected]>
[ Upstream commit 922a9bd138101e3e5718f0f4d40dba68ef89bb43 ]
gas supports several different forms for .section for ELF targets, including:
.section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]]
and:
.section "NAME"[, #FLAGS...]
In several places we use a mix of these two forms:
.section NAME, #FLAGS...
A current development snapshot of binutils (2.40.50.20230611) treats this mixed syntax as an error.
Change to consistently use:
.section NAME, "FLAGS"
as is used elsewhere in the kernel.
--- arch/m68k/fpsp040/skeleton.S | 4 ++-- arch/m68k/ifpsp060/os.S | 4 ++-- arch/m68k/kernel/relocate_kernel.S | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/m68k/fpsp040/skeleton.S +2 -2
@@ -499,12 +499,12 @@ in_ea: dbf %d0,morein rts - .section .fixup,#alloc,#execinstr + .section .fixup,"ax" .even 1: jbra fpsp040_die - .section __ex_table,#alloc + .section __ex_table,"a" .align 4 .long in_ea,1b
arch/m68k/ifpsp060/os.S +2 -2
@@ -379,11 +379,11 @@ _060_real_access: | Execption handling for movs access to illegal memory - .section .fixup,#alloc,#execinstr + .section .fixup,"ax" .even 1: moveq #-1,%d1 rts -.section __ex_table,#alloc +.section __ex_table,"a" .align 4 .long dmrbuae,1b .long dmrwuae,1b
arch/m68k/kernel/relocate_kernel.S +2 -2
@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) lea %pc@(.Lcopy),%a4 2: addl #0x00000000,%a4 /* virt_to_phys() */ - .section ".m68k_fixup","aw" + .section .m68k_fixup,"aw" .long M68K_FIXUP_MEMOFFSET, 2b+2 .previous
@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) lea %pc@(.Lcont040),%a4 5: addl #0x00000000,%a4 /* virt_to_phys() */ - .section ".m68k_fixup","aw" + .section .m68k_fixup,"aw" .long M68K_FIXUP_MEMOFFSET, 5b+2 .previous
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 11/25 s390/dasd: use correct number of retries for ERP requests
In reply to Sasha LevinFrom: Stefan Haberland <[email protected]>
[ Upstream commit acea28a6b74f458defda7417d2217b051ba7d444 ]
If a DASD request fails an error recovery procedure (ERP) request might be built as a copy of the original request to do error recovery.
The ERP request gets a number of retries assigned.
This number is always 256 no matter what other value might have been set for the original request. This is not what is expected when a user specifies a certain amount of retries for the device via sysfs.
Correctly use the number of retries of the original request for ERP requests.
--- drivers/s390/block/dasd_3990_erp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/block/dasd_3990_erp.c +1 -1
@@ -2436,7 +2436,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr) erp->block = cqr->block; erp->magic = cqr->magic; erp->expires = cqr->expires; - erp->retries =256 ; + erp->retries = device->default_retries; erp->buildclk =get_tod_clock (); erp->status =DASD_CQR_FILLED ;
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 12/25 s390/dasd: fix hanging device after request requeue
In reply to Sasha LevinFrom: Stefan Haberland <[email protected]>
[ Upstream commit 8a2278ce9c25048d999fe1a3561def75d963f471 ]
The DASD device driver has a function to requeue requests to the blocklayer.
This function is used in various cases when basic settings for the device have to be changed like High Performance Ficon related parameters or copy pair settings.
The functions iterates over the device->ccw_queue and also removes the requests from the block->ccw_queue.
In case the device is started on an alias device instead of the base device it might be removed from the block->ccw_queue without having it canceled properly before. This might lead to a hanging device since the request is no longer on a queue and can not be handled properly.
Fix by iterating over the block->ccw_queue instead of the device->ccw_queue. This will take care of all blocklayer related requests and handle them on all associated DASD devices.
--- drivers/s390/block/dasd.c | 125 +++++++++++++++----------------------- 1 file changed, 48 insertions(+), 77 deletions(-)
drivers/s390/block/dasd.c +48 -77
@@ -2985,41 +2985,32 @@ static void _dasd_wake_block_flush_cb(struct dasd_ccw_req *cqr, void *data)* Requeue a request back to the block request queue * only works for block requests */ -static int _dasd_requeue_request (struct dasd_ccw_req *cqr) +static void _dasd_requeue_request (struct dasd_ccw_req *cqr) { -struct dasd_block *block = cqr->block;struct request *req; -if (!block) -return -EINVAL ;/* * If the request is an ERP request there is nothing to requeue. * This will be done with the remaining original request. */ if (cqr->refers) -return 0 ; +return ;spin_lock_irq (&cqr->dq->lock); req = (struct request *) cqr->callback_data;blk_mq_requeue_request (req, true);spin_unlock_irq (&cqr->dq->lock); -return 0 ; +return ; } -/* -* Go through all request on the dasd_block request queue, cancel them -* on the respective dasd_device, and return them to the generic -* block layer. -*/ -static int dasd_flush_block_queue (struct dasd_block *block) +static int _dasd_requests_to_flushqueue (struct dasd_block *block, +struct list_head *flush_queue) {struct dasd_ccw_req *cqr, *n; -int rc, i; -struct list_head flush_queue;unsigned long flags; +int rc, i; -INIT_LIST_HEAD (&flush_queue); -spin_lock_bh (&block->queue_lock); +spin_lock_irqsave (&block->queue_lock, flags); rc =0 ; restart:list_for_each_entry_safe (cqr, n, &block->ccw_queue, blocklist) {
@@ -3034,13 +3025,32 @@ static int dasd_flush_block_queue(struct dasd_block *block)* is returned from the dasd_device layer. */ cqr->callback = _dasd_wake_block_flush_cb; -for (i =0 ; cqr !=NULL ; cqr = cqr->refers, i++) -list_move_tail (&cqr->blocklist, &flush_queue); +for (i =0 ; cqr; cqr = cqr->refers, i++) +list_move_tail (&cqr->blocklist, flush_queue);if (i >1 )/* moved more than one request - need to restart */ goto restart; } -spin_unlock_bh (&block->queue_lock); +spin_unlock_irqrestore (&block->queue_lock, flags); + +return rc; +} + +/* +* Go through all request on the dasd_block request queue, cancel them +* on the respective dasd_device, and return them to the generic +* block layer. +*/ +static int dasd_flush_block_queue (struct dasd_block *block) +{ +struct dasd_ccw_req *cqr, *n; +struct list_head flush_queue; +unsigned long flags; +int rc; + +INIT_LIST_HEAD (&flush_queue); + rc =_dasd_requests_to_flushqueue (block, &flush_queue); +/* Now call the callback function of flushed requests */ restart_cb:list_for_each_entry_safe (cqr, n, &flush_queue, blocklist) {
@@ -3977,75 +3987,36 @@ EXPORT_SYMBOL_GPL(dasd_generic_space_avail);*/ static int dasd_generic_requeue_all_requests (struct dasd_device *device) { +struct dasd_block *block = device->block;struct list_head requeue_queue;struct dasd_ccw_req *cqr, *n; -struct dasd_ccw_req *refers;int rc; -INIT_LIST_HEAD (&requeue_queue); -spin_lock_irq (get_ccwdev_lock (device->cdev)); - rc =0 ; -list_for_each_entry_safe (cqr, n, &device->ccw_queue, devlist) { -/* Check status and move request to flush_queue */ -if (cqr->status ==DASD_CQR_IN_IO ) { - rc = device->discipline->term_IO (cqr); -if (rc) { -/* unable to terminate requeust */ -dev_err (&device->cdev->dev, -"Unable to terminate request %p " -"on suspend\n" , cqr); -spin_unlock_irq (get_ccwdev_lock (device->cdev)); -dasd_put_device (device); -return rc; - } - } -list_move_tail (&cqr->devlist, &requeue_queue); - } -spin_unlock_irq (get_ccwdev_lock (device->cdev)); - -list_for_each_entry_safe (cqr, n, &requeue_queue, devlist) { -wait_event (dasd_flush_wq, - (cqr->status !=DASD_CQR_CLEAR_PENDING )); +if (!block) +return 0 ; -/* -* requeue requests to blocklayer will only work -* for block device requests -*/ -if (_dasd_requeue_request (cqr)) -continue ; +INIT_LIST_HEAD (&requeue_queue); + rc =_dasd_requests_to_flushqueue (block, &requeue_queue); -/* remove requests from device and block queue */ -list_del_init (&cqr->devlist); -while (cqr->refers !=NULL ) { - refers = cqr->refers; -/* remove the request from the block queue */ -list_del (&cqr->blocklist); -/* free the finished erp request */ -dasd_free_erp_request (cqr, cqr->memdev); - cqr = refers; +/* Now call the callback function of flushed requests */ +restart_cb: +list_for_each_entry_safe (cqr, n, &requeue_queue, blocklist) { +wait_event (dasd_flush_wq, (cqr->status <DASD_CQR_QUEUED )); +/* Process finished ERP request. */ +if (cqr->refers) { +spin_lock_bh (&block->queue_lock); +__dasd_process_erp (block->base, cqr); +spin_unlock_bh (&block->queue_lock); +/* restart list_for_xx loop since dasd_process_erp +* might remove multiple elements +*/ + goto restart_cb; } - -/* -* _dasd_requeue_request already checked for a valid -* blockdevice, no need to check again -* all erp requests (cqr->refers) have a cqr->block -* pointer copy from the original cqr -*/ +_dasd_requeue_request (cqr);list_del_init (&cqr->blocklist); cqr->block->base->discipline->free_cp ( cqr, (struct request *) cqr->callback_data); } - -/* -* if requests remain then they are internal request -* and go back to the device queue -*/ -if (!list_empty (&requeue_queue)) { -/* move freeze_queue to start of the ccw_queue */ -spin_lock_irq (get_ccwdev_lock (device->cdev)); -list_splice_tail (&requeue_queue, &device->ccw_queue); -spin_unlock_irq (get_ccwdev_lock (device->cdev)); - }dasd_schedule_device_bh (device);return rc; }
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 13/25 fs/nls: make load_nls() take a const parameter
In reply to Sasha LevinFrom: Winston Wen <[email protected]>
[ Upstream commit c1ed39ec116272935528ca9b348b8ee79b0791da ]
load_nls() take a char * parameter, use it to find nls module in list or construct the module name to load it.
This change make load_nls() take a const parameter, so we don't need do some cast like this:
ses->local_nls = load_nls((char *)ctx->local_nls->charset);
--- fs/nls/nls_base.c | 4 ++-- include/linux/nls.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/nls/nls_base.c +2 -2
@@ -272,7 +272,7 @@ int unregister_nls(struct nls_table * nls)return -EINVAL ; } -static struct nls_table *find_nls (char *charset) +static struct nls_table *find_nls (const char *charset) {struct nls_table *nls;spin_lock (&nls_lock);
@@ -288,7 +288,7 @@ static struct nls_table *find_nls(char *charset)return nls; } -struct nls_table *load_nls (char *charset) +struct nls_table *load_nls (const char *charset) {return try_then_request_module (find_nls (charset),"nls_%s" , charset); }
include/linux/nls.h +1 -1
@@ -47,7 +47,7 @@ enum utf16_endian {/* nls_base.c */ extern int __register_nls (struct nls_table *,struct module *);extern int unregister_nls (struct nls_table *); -extern struct nls_table *load_nls (char *); +extern struct nls_table *load_nls (const char *charset);extern void unload_nls (struct nls_table *);extern struct nls_table *load_nls_default (void );#define register_nls (nls) __register_nls((nls), THIS_MODULE)
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 14/25 ASoc: codecs: ES8316: Fix DMIC config
In reply to Sasha LevinFrom: Edgar <[email protected]>
[ Upstream commit d20d35d1ad62c6cca36368c1e8f29335a068659e ]
According to the datasheet, the DMIC config should be changed to { 0, 2 ,3 }
--- sound/soc/codecs/es8316.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/es8316.c +1 -1
@@ -153,7 +153,7 @@ static const char * const es8316_dmic_txt[] = {"dmic data at high level" , "dmic data at low level", }; -static const unsigned int es8316_dmic_values[] = {0 ,1 ,2 }; +static const unsigned int es8316_dmic_values[] = {0 ,2 ,3 };static const struct soc_enum es8316_dmic_src_enum = SOC_VALUE_ENUM_SINGLE(ES8316_ADC_DMIC, 0, 3, ARRAY_SIZE(es8316_dmic_txt),
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 15/25 ASoC: atmel: Fix the 8K sample parameter in I2SC master
In reply to Sasha LevinFrom: Guiting Shen <[email protected]>
[ Upstream commit f85739c0b2b0d98a32f5ca4fcc5501d2b76df4f6 ]
The 8K sample parameter of 12.288Mhz main system bus clock doesn't work because the I2SC_MR.IMCKDIV must not be 0 according to the sama5d2 series datasheet(I2SC Mode Register of Register Summary).
So use the 6.144Mhz instead of 12.288Mhz to support 8K sample.
--- sound/soc/atmel/atmel-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/atmel/atmel-i2s.c +4 -1
@@ -163,11 +163,14 @@ struct atmel_i2s_gck_param {#define I2S_MCK_12M288 12288000UL#define I2S_MCK_11M2896 11289600UL +#define I2S_MCK_6M144 6144000UL/* mck = (32 * (imckfs+1) / (imckdiv+1)) * fs */ static const struct atmel_i2s_gck_param gck_params[] = { +/* mck = 6.144Mhz */ + {8000 ,I2S_MCK_6M144 ,1 ,47 },/* mck = 768 fs */ +/* mck = 12.288MHz */ - {8000 ,I2S_MCK_12M288 ,0 ,47 },/* mck = 1536 fs */ {16000 ,I2S_MCK_12M288 ,1 ,47 },/* mck = 768 fs */ {24000 ,I2S_MCK_12M288 ,3 ,63 },/* mck = 512 fs */ {32000 ,I2S_MCK_12M288 ,3 ,47 },/* mck = 384 fs */
Signature · 7 lines
2.40.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 16/25 platform/x86: intel: hid: Always call BTNL ACPI method
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit e3ab18de2b09361d6f0e4aafb9cfd6d002ce43a1 ]
On a HP Elite Dragonfly G2 the 0xcc and 0xcd events for SW_TABLET_MODE are only send after the BTNL ACPI method has been called.
Likely more devices need this, so make the BTNL ACPI method unconditional instead of only doing it on devices with a 5 button array.
Note this also makes the intel_button_array_enable() call in probe() unconditional, that function does its own priv->array check. This makes the intel_button_array_enable() call in probe() consistent with the calls done on suspend/resume which also rely on the priv->array check inside the function.
--- drivers/platform/x86/intel-hid.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/platform/x86/intel-hid.c +9 -12
@@ -458,7 +458,7 @@ static bool button_array_present(struct platform_device *device)static int intel_hid_probe (struct platform_device *device) {acpi_handle handle =ACPI_HANDLE (&device->dev); -unsigned long long mode; +unsigned long long mode, dummy;struct intel_hid_priv *priv;acpi_status status;int err;
@@ -510,18 +510,15 @@ static int intel_hid_probe(struct platform_device *device)if (err) goto err_remove_notify; -if (priv->array) { -unsigned long long dummy; +intel_button_array_enable (&device->dev, true); -intel_button_array_enable (&device->dev, true); - -/* Call button load method to enable HID power button */ -if (!intel_hid_evaluate_method (handle,INTEL_HID_DSM_BTNL_FN , - &dummy)) { -dev_warn (&device->dev, -"failed to enable HID power button\n" ); - } - } +/* +* Call button load method to enable HID power button +* Always do this since it activates events on some devices without +* a button array too. +*/ +if (!intel_hid_evaluate_method (handle,INTEL_HID_DSM_BTNL_FN , &dummy)) +dev_warn (&device->dev,"failed to enable HID power button\n" );device_init_wakeup (&device->dev, true);/*
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 17/25 platform/x86: huawei-wmi: Silence ambient light sensor
In reply to Sasha LevinFrom: Konstantin Shelekhin <[email protected]>
[ Upstream commit c21733754cd6ecbca346f2adf9b17d4cfa50504f ]
Currently huawei-wmi causes a lot of spam in dmesg on my Huawei MateBook X Pro 2022:
...
[36409.328463] input input9: Unknown key pressed, code: 0x02c1 [36411.335104] input input9: Unknown key pressed, code: 0x02c1 [36412.338674] input input9: Unknown key pressed, code: 0x02c1 [36414.848564] input input9: Unknown key pressed, code: 0x02c1 [36416.858706] input input9: Unknown key pressed, code: 0x02c1 ...
Fix that by ignoring events generated by ambient light sensor.
This issue was reported on GitHub and resolved with the following merge request:
https://github.com/aymanbagabas/Huawei-WMI/pull/70
I've contacted the mainter of this repo and he gave me the "go ahead" to send this patch to the maling list.
--- drivers/platform/x86/huawei-wmi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/platform/x86/huawei-wmi.c +2 -0
@@ -86,6 +86,8 @@ static const struct key_entry huawei_wmi_keymap[] = { { KE_IGNORE, 0x293, { KEY_KBDILLUMTOGGLE } }, { KE_IGNORE, 0x294, { KEY_KBDILLUMUP } }, { KE_IGNORE, 0x295, { KEY_KBDILLUMUP } }, +// Ignore Ambient Light Sensoring + { KE_KEY, 0x2c1, { KEY_RESERVED } }, { KE_END, 0 } };
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 18/25 spi: spi-qcom-qspi: Add DMA_CHAIN_DONE to ALL_IRQS
In reply to Sasha LevinFrom: Vijaya Krishna Nivarthi <[email protected]>
[ Upstream commit 916a4edf3daed845b1e5d6cf0578a7e43c6f520e ]
Add latest added DMA_CHAIN_DONE irq to QSPI_ALL_IRQS that encompasses all of the qspi IRQs.
--- drivers/spi/spi-qcom-qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-qcom-qspi.c +1 -1
@@ -65,7 +65,7 @@ WR_FIFO_OVERRUN)#define QSPI_ALL_IRQS (QSPI_ERR_IRQS | RESP_FIFO_RDY | \ WR_FIFO_EMPTY | WR_FIFO_FULL | \ - TRANSACTION_DONE) + TRANSACTION_DONE | DMA_CHAIN_DONE)#define PIO_XFER_CTRL 0x0014#define REQUEST_COUNT_MSK 0xffff
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 19/25 drm/amd/display: Exit idle optimizations before attempt to access PHY
In reply to Sasha LevinFrom: Leo Chen <[email protected]>
[ Upstream commit de612738e9771bd66aeb20044486c457c512f684 ]
[Why & How]
DMUB may hang when powering down pixel clocks due to no dprefclk.
It is fixed by exiting idle optimization before the attempt to access PHY.
--- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +3 -0
@@ -1682,10 +1682,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control (edp_link_with_sink, false); }/*resume from S3, no vbios posting, no need to power down again*/ +clk_mgr_exit_optimized_pwr_state (dc, dc->clk_mgr); +power_down_all_hw_blocks (dc);disable_vga_and_power_gate_all_controllers (dc);if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control (edp_link_with_sink, false); +clk_mgr_optimize_pwr_state (dc, dc->clk_mgr); }bios_set_scratch_acc_mode_change (dc->ctx->dc_bios); }
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 20/25 ovl: Always reevaluate the file signature for IMA
In reply to Sasha LevinFrom: Eric Snowberg <[email protected]>
[ Upstream commit 18b44bc5a67275641fb26f2c54ba7eef80ac5950 ]
Commit db1d1e8b9867 ("IMA: use vfs_getattr_nosec to get the i_version") partially closed an IMA integrity issue when directly modifying a file on the lower filesystem. If the overlay file is first opened by a user and later the lower backing file is modified by root, but the extended attribute is NOT updated, the signature validation succeeds with the old original signature.
Update the super_block s_iflags to SB_I_IMA_UNVERIFIABLE_SIGNATURE to force signature reevaluation on every file access until a fine grained solution can be found.
--- fs/overlayfs/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/overlayfs/super.c +1 -1
@@ -2028,7 +2028,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) sb->s_xattr = ovl_xattr_handlers; sb->s_fs_info = ofs; sb->s_flags |=SB_POSIXACL ; - sb->s_iflags |=SB_I_SKIP_SYNC ; + sb->s_iflags |=SB_I_SKIP_SYNC |SB_I_IMA_UNVERIFIABLE_SIGNATURE ; err = -ENOMEM ; root_dentry =ovl_get_root (sb, upperpath.dentry, oe);
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 21/25 ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer()
In reply to Sasha LevinFrom: Minjie Du <[email protected]>
[ Upstream commit 4139f992c49356391fb086c0c8ce51f66c26d623 ]
It is possible for dma_request_chan() to return EPROBE_DEFER, which means acdev->host->dev is not ready yet. At this point dev_err() will have no output. Use dev_err_probe() instead.
--- drivers/ata/pata_arasan_cf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ata/pata_arasan_cf.c +2 -1
@@ -528,7 +528,8 @@ static void data_xfer(struct work_struct *work)/* dma_request_channel may sleep, so calling from process context */ acdev->dma_chan =dma_request_chan (acdev->host->dev,"data" );if (IS_ERR (acdev->dma_chan)) { -dev_err (acdev->host->dev,"Unable to get dma_chan\n" ); +dev_err_probe (acdev->host->dev,PTR_ERR (acdev->dma_chan), +"Unable to get dma_chan\n" ); acdev->dma_chan =NULL ; goto chan_request_fail; }
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 22/25 rbd: make get_lock_owner_info() return a single locker or NULL
In reply to Sasha LevinFrom: Ilya Dryomov <[email protected]>
[ Upstream commit f38cb9d9c2045dad16eead4a2e1aedfddd94603b ]
Make the "num_lockers can be only 0 or 1" assumption explicit and simplify the API by getting rid of output parameters in preparation for calling get_lock_owner_info() twice before blocklisting.
--- drivers/block/rbd.c | 84 +++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 33 deletions(-)
drivers/block/rbd.c +51 -33
@@ -3914,10 +3914,17 @@ static void wake_lock_waiters(struct rbd_device *rbd_dev, int result)list_splice_tail_init (&rbd_dev->acquiring_list, &rbd_dev->running_list); } -static int get_lock_owner_info (struct rbd_device *rbd_dev, -struct ceph_locker **lockers,u32 *num_lockers) +static void free_locker (struct ceph_locker *locker) +{ +if (locker) +ceph_free_lockers (locker,1 ); +} + +static struct ceph_locker *get_lock_owner_info (struct rbd_device *rbd_dev) {struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; +struct ceph_locker *lockers; +u32 num_lockers;u8 lock_type;char *lock_tag;int ret;
@@ -3926,39 +3933,45 @@ static int get_lock_owner_info(struct rbd_device *rbd_dev, ret =ceph_cls_lock_info (osdc, &rbd_dev->header_oid, &rbd_dev->header_oloc,RBD_LOCK_NAME , - &lock_type, &lock_tag, lockers, num_lockers); -if (ret) -return ret; + &lock_type, &lock_tag, &lockers, &num_lockers); +if (ret) { +rbd_warn (rbd_dev,"failed to retrieve lockers: %d" , ret); +return ERR_PTR (ret); + } -if (*num_lockers ==0 ) { +if (num_lockers ==0 ) {dout ("%s rbd_dev %p no lockers detected\n" , __func__, rbd_dev); + lockers =NULL ; goto out; }if (strcmp (lock_tag,RBD_LOCK_TAG )) {rbd_warn (rbd_dev,"locked by external mechanism, tag %s" , lock_tag); - ret = -EBUSY ; - goto out; + goto err_busy; }if (lock_type ==CEPH_CLS_LOCK_SHARED ) {rbd_warn (rbd_dev,"shared lock type detected" ); - ret = -EBUSY ; - goto out; + goto err_busy; } -if (strncmp ((*lockers)[0 ].id.cookie,RBD_LOCK_COOKIE_PREFIX , +WARN_ON (num_lockers !=1 ); +if (strncmp (lockers[0 ].id.cookie,RBD_LOCK_COOKIE_PREFIX ,strlen (RBD_LOCK_COOKIE_PREFIX ))) {rbd_warn (rbd_dev,"locked by external mechanism, cookie %s" , - (*lockers)[0 ].id.cookie); - ret = -EBUSY ; - goto out; + lockers[0 ].id.cookie); + goto err_busy; } out:kfree (lock_tag); -return ret; +return lockers; + +err_busy: +kfree (lock_tag); +ceph_free_lockers (lockers, num_lockers); +return ERR_PTR (-EBUSY ); } static int find_watcher(struct rbd_device *rbd_dev,
@@ -4008,51 +4021,56 @@ static int find_watcher(struct rbd_device *rbd_dev,static int rbd_try_lock (struct rbd_device *rbd_dev) {struct ceph_client *client = rbd_dev->rbd_client->client; -struct ceph_locker *lockers; -u32 num_lockers; +struct ceph_locker *locker;int ret;for (;;) { + locker =NULL ; + ret =rbd_lock (rbd_dev);if (ret != -EBUSY ) -return ret; + goto out;/* determine if the current lock holder is still alive */ - ret =get_lock_owner_info (rbd_dev, &lockers, &num_lockers); -if (ret) -return ret; - -if (num_lockers ==0 ) + locker =get_lock_owner_info (rbd_dev); +if (IS_ERR (locker)) { + ret =PTR_ERR (locker); + locker =NULL ; + goto out; + } +if (!locker) goto again; - ret =find_watcher (rbd_dev, lockers); + ret =find_watcher (rbd_dev, locker);if (ret) goto out;/* request lock or error */ rbd_warn (rbd_dev,"breaking header lock owned by %s%llu" , -ENTITY_NAME (lockers[0 ].id.name)); +ENTITY_NAME (locker->id.name)); ret =ceph_monc_blocklist_add (&client->monc, - &lockers[0 ].info.addr); + &locker->info.addr);if (ret) { -rbd_warn (rbd_dev,"blocklist of %s%llu failed: %d" , -ENTITY_NAME (lockers[0 ].id.name), ret); +rbd_warn (rbd_dev,"failed to blocklist %s%llu: %d" , +ENTITY_NAME (locker->id.name), ret); goto out; } ret =ceph_cls_break_lock (&client->osdc, &rbd_dev->header_oid, &rbd_dev->header_oloc,RBD_LOCK_NAME , - lockers[0 ].id.cookie, - &lockers[0 ].id.name); -if (ret && ret != -ENOENT ) + locker->id.cookie, &locker->id.name); +if (ret && ret != -ENOENT ) { +rbd_warn (rbd_dev,"failed to break header lock: %d" , + ret); goto out; + } again: -ceph_free_lockers (lockers, num_lockers); +free_locker (locker); } out: -ceph_free_lockers (lockers, num_lockers); +free_locker (locker);return ret; }
Signature · 1 line
2.40.1
Re: [PATCH AUTOSEL 5.10 22/25] rbd: make get_lock_owner_info() return a single locker or NULL
Quoted 5 lines · Sasha Levin
From: Ilya Dryomov <[email protected]>
[ Upstream commit
f38cb9d9c2045dad16eead4a2e1aedfddd94603b]
Quoted 7 lines
Make the "
num_lockerscan be only 0 or 1" assumption explicit and simplify the API by getting rid of output parameters in preparation for callingget_lock_owner_info()twice before blocklisting.Signed-off-by Ilya Dryomov <[email protected]>Reviewed-by Dongsheng Yang <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Hi Sasha,
This is a prerequisite patch, it doesn't make sense to backport it without also backporting "rbd: harden get_lock_owner_info() a bit" and "rbd: retrieve and check lock owner twice before blocklisting".
Please drop it.
Thanks,
Ilya
Sasha Levin
maintainerPATCH 23/25 staging: fbtft: ili9341: use macro FBTFT_REGISTER_SPI_DRIVER
In reply to Sasha LevinFrom: Raphael Gallais-Pou <[email protected]>
[ Upstream commit 4912649e1cf0317bf563f91655e04a303cacaf8d ]
Using FBTFT_REGISTER_DRIVER resolves to a NULL struct spi_device_id. This ultimately causes a warning when the module probes. Fixes it.
--- drivers/staging/fbtft/fb_ili9341.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/fbtft/fb_ili9341.c +1 -1
@@ -145,7 +145,7 @@ static struct fbtft_display display = { }, }; -FBTFT_REGISTER_DRIVER (DRVNAME ,"ilitek,ili9341" , &display); +FBTFT_REGISTER_SPI_DRIVER (DRVNAME ,"ilitek" ,"ili9341" , &display);MODULE_ALIAS ("spi:" DRVNAME );MODULE_ALIAS ("platform:" DRVNAME );
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 24/25 security: keys: perform capable check only on privileged operations
In reply to Sasha LevinFrom: Christian Göttsche <[email protected]>
[ Upstream commit 2d7f105edbb3b2be5ffa4d833abbf9b6965e9ce7 ]
If the current task fails the check for the queried capability via capable(CAP_SYS_ADMIN) LSMs like SELinux generate a denial message. Issuing such denial messages unnecessarily can lead to a policy author granting more privileges to a subject than needed to silence them.
Reorder CAP_SYS_ADMIN checks after the check whether the operation is actually privileged.
--- security/keys/keyctl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
security/keys/keyctl.c +8 -3
@@ -980,14 +980,19 @@ long keyctl_chown_key(key_serial_t id, uid_t user, gid_t group) ret = -EACCES ;down_write (&key->sem); -if (!capable (CAP_SYS_ADMIN )) { + { +bool is_privileged_op = false; +/* only the sysadmin can chown a key to some other UID */ if (user != (uid_t) -1 && !uid_eq (key->uid, uid)) - goto error_put; + is_privileged_op = true;/* only the sysadmin can set the key's GID to a group other * than one of those that the current process subscribes to */ if (group != (gid_t) -1 && !gid_eq (gid, key->gid) && !in_group_p (gid)) + is_privileged_op = true; + +if (is_privileged_op && !capable (CAP_SYS_ADMIN )) goto error_put; }
@@ -1088,7 +1093,7 @@ long keyctl_setperm_key(key_serial_t id, key_perm_t perm)down_write (&key->sem);/* if we're not the sysadmin, we can only change a key that we own */ -if (capable (CAP_SYS_ADMIN ) ||uid_eq (key->uid,current_fsuid ())) { +if (uid_eq (key->uid,current_fsuid ()) ||capable (CAP_SYS_ADMIN )) { key->perm = perm;notify_key (key,NOTIFY_KEY_SETATTR ,0 ); ret =0 ;
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 25/25 kprobes: Prohibit probing on CFI preamble symbol
In reply to Sasha LevinFrom: "Masami Hiramatsu (Google)" <[email protected]>
[ Upstream commit de02f2ac5d8cfb311f44f2bf144cc20002f1fbbd ]
Do not allow to probe on "__cfi_" or "__pfx_" started symbol, because those are used for CFI and not executed. Probing it will break the CFI.
--- kernel/kprobes.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
kernel/kprobes.c +13 -1
@@ -1628,6 +1628,17 @@ int __weak arch_check_ftrace_location(struct kprobe *p)return 0 ; } +static bool is_cfi_preamble_symbol (unsigned long addr) +{ +char symbuf[KSYM_NAME_LEN ]; + +if (lookup_symbol_name (addr, symbuf)) +return false; + +return str_has_prefix ("__cfi_" , symbuf) || +str_has_prefix ("__pfx_" , symbuf); +} +static int check_kprobe_address_safe (struct kprobe *p,struct module **probed_mod) {
@@ -1646,7 +1657,8 @@ static int check_kprobe_address_safe(struct kprobe *p,within_kprobe_blacklist ((unsigned long ) p->addr) ||jump_label_text_reserved (p->addr, p->addr) ||static_call_text_reserved (p->addr, p->addr) || - find_bug((unsigned long)p->addr)) { +find_bug ((unsigned long )p->addr) || + is_cfi_preamble_symbol((unsigned long)p->addr)) { ret = -EINVAL; goto out; }
Signature · 1 line
2.40.1