5.10.80-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 301/575 cpuidle: Fix kobject memory leaks in error paths
In reply to Greg Kroah-HartmanFrom: Anel Orazgaliyeva <[email protected]>
[ Upstream commit e5f5a66c9aa9c331da5527c2e3fd9394e7091e01 ]
Commit c343bf1ba5ef ("cpuidle: Fix three reference count leaks") fixes the cleanup of kobjects; however, it removes kfree() calls altogether, leading to memory leaks.
Fix those and also defer the initialization of dev->kobj_dev until after the error check, so that we do not end up with a dangling pointer.
--- drivers/cpuidle/sysfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/cpuidle/sysfs.c +4 -1
@@ -488,6 +488,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device *device) &kdev->kobj, "state%d", i);if (ret) {kobject_put (&kobj->kobj); +kfree (kobj); goto error_state; }cpuidle_add_s2idle_attr_group (kobj);
@@ -619,6 +620,7 @@ static int cpuidle_add_driver_sysfs(struct cpuidle_device *dev) &kdev->kobj, "driver");if (ret) {kobject_put (&kdrv->kobj); +kfree (kdrv);return ret; }
@@ -705,7 +707,6 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev)if (!kdev)return -ENOMEM ; kdev->dev = dev; - dev->kobj_dev = kdev;init_completion (&kdev->kobj_unregister);
@@ -713,9 +714,11 @@ int cpuidle_add_sysfs(struct cpuidle_device *dev) "cpuidle");if (error) {kobject_put (&kdev->kobj); +kfree (kdev);return error; } + dev->kobj_dev = kdev;kobject_uevent (&kdev->kobj,KOBJ_ADD );return 0 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 302/575 media: em28xx: Dont use ops->suspend if it is NULL
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 51fa3b70d27342baf1ea8aaab3e96e5f4f26d5b2 ]
The call to ops->suspend for the dev->dev_next case can currently trigger a call on a null function pointer if ops->suspend is null. Skip over the use of function ops->suspend if it is null.
Addresses-Coverity: ("Dereference after null check")
--- drivers/media/usb/em28xx/em28xx-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/usb/em28xx/em28xx-core.c +3 -2
@@ -1152,8 +1152,9 @@ int em28xx_suspend_extension(struct em28xx *dev)dev_info (&dev->intf->dev,"Suspending extensions\n" );mutex_lock (&em28xx_devlist_mutex);list_for_each_entry (ops, &em28xx_extension_devlist, next) { -if (ops->suspend) - ops->suspend (dev); +if (!ops->suspend) +continue ; + ops->suspend (dev);if (dev->dev_next) ops->suspend (dev->dev_next); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 303/575 ath9k: Fix potential interrupt storm on queue reset
In reply to Greg Kroah-HartmanFrom: Linus Lüssing <[email protected]>
[ Upstream commit 4925642d541278575ad1948c5924d71ffd57ef14 ]
In tests with two Lima boards from 8devices (QCA4531 based) on OpenWrt 19.07 we could force a silent restart of a device with no serial output when we were sending a high amount of UDP traffic (iperf3 at 80 MBit/s in both directions from external hosts, saturating the wifi and causing a load of about 4.5 to 6) and were then triggering an ath9k_queue_reset().
Further debugging showed that the restart was caused by the ath79 watchdog. With disabled watchdog we could observe that the device was constantly going into ath_isr() interrupt handler and was returning early after the ATH_OP_HW_RESET flag test, without clearing any interrupts. Even though ath9k_queue_reset() calls ath9k_hw_kill_interrupts().
With JTAG we could observe the following race condition:
1) ath9k_queue_reset()
...
-> ath9k_hw_kill_interrupts()
-> set_bit(ATH_OP_HW_RESET, &common->op_flags);
...
<- returns
2) ath9k_tasklet()
...
-> ath9k_hw_resume_interrupts()
...
<- returns
3) loops around:
...
handle_int()
-> ath_isr()
...
-> if (test_bit(ATH_OP_HW_RESET,
&common->op_flags))
return IRQ_HANDLED;
x) ath_reset_internal():
=> never reached <=And in ath_isr() we would typically see the following interrupts / interrupt causes:
* status: 0x00111030 or 0x00110030
* async_cause: 2 (AR_INTR_MAC_IPQ)
* sync_cause: 0
So the ath9k_tasklet() reenables the ath9k interrupts through ath9k_hw_resume_interrupts() which ath9k_queue_reset() had just disabled. And ath_isr() then keeps firing because it returns IRQ_HANDLED without actually clearing the interrupt.
To fix this IRQ storm also clear/disable the interrupts again when we are in reset state.
--- drivers/net/wireless/ath/ath9k/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/main.c +3 -1
@@ -533,8 +533,10 @@ irqreturn_t ath_isr(int irq, void *dev)ath9k_debug_sync_cause (sc, sync_cause); status &= ah->imask;/* discard unasked-for bits */ -if (test_bit (ATH_OP_HW_RESET , &common->op_flags)) +if (test_bit (ATH_OP_HW_RESET , &common->op_flags)) { +ath9k_hw_kill_interrupts (sc->sc_ah);return IRQ_HANDLED ; + }/* * If there are no status bits set, then this interrupt was not
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 304/575 PM: EM: Fix inefficient states detection
In reply to Greg Kroah-HartmanFrom: Vincent Donnefort <[email protected]>
[ Upstream commit aa1a43262ad5df010768f69530fa179ff81651d3 ]
Currently, a debug message is printed if an inefficient state is detected in the Energy Model. Unfortunately, it won't detect if the first state is inefficient or if two successive states are. Fix this behavior.
--- kernel/power/energy_model.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
kernel/power/energy_model.c +8 -15
@@ -94,8 +94,7 @@ static void em_debug_remove_pd(struct device *dev) {}static int em_create_perf_table (struct device *dev,struct em_perf_domain *pd,int nr_states,struct em_data_callback *cb) { -unsigned long opp_eff, prev_opp_eff =ULONG_MAX ; -unsigned long power, freq, prev_freq =0 ; +unsigned long power, freq, prev_freq =0 , prev_cost =ULONG_MAX ;struct em_perf_state *table;int i, ret;u64 fmax;
@@ -140,27 +139,21 @@ static int em_create_perf_table(struct device *dev, struct em_perf_domain *pd, table[i].power = power; table[i].frequency = prev_freq = freq; - -/* -* The hertz/watts efficiency ratio should decrease as the -* frequency grows on sane platforms. But this isn't always -* true in practice so warn the user if a higher OPP is more -* power efficient than a lower one. -*/ - opp_eff = freq / power; -if (opp_eff >= prev_opp_eff) -dev_dbg (dev,"EM: hertz/watts ratio non-monotonically decreasing: em_perf_state %d >= em_perf_state%d\n" , - i, i -1 ); - prev_opp_eff = opp_eff; }/* Compute the cost of each performance state. */ fmax = (u64 ) table[nr_states -1 ].frequency; -for (i =0 ; i < nr_states; i++) { +for (i = nr_states -1 ; i >=0 ; i--) {unsigned long power_res =em_scale_power (table[i].power); table[i].cost =div64_u64 (fmax * power_res, table[i].frequency); +if (table[i].cost >= prev_cost) { +dev_dbg (dev,"EM: OPP:%lu is inefficient\n" , + table[i].frequency); + }else { + prev_cost = table[i].cost; + } } pd->table = table;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 305/575 EDAC/amd64: Handle three rank interleaving mode
In reply to Greg Kroah-HartmanFrom: Yazen Ghannam <[email protected]>
[ Upstream commit 9f4873fb6af7966de8fcbd95c36b61351c1c4b1f ]
AMD Rome systems and later support interleaving between three identical ranks within a channel.
Check for this mode by counting the number of enabled chip selects and comparing their masks. If there are exactly three enabled chip selects and their masks are identical, then three rank interleaving is enabled.
The size of a rank is determined from its mask value. However, three rank interleaving doesn't follow the method of swapping an interleave bit with the most significant bit. Rather, the interleave bit is flipped and the most significant bit remains the same. There is only a single interleave bit in this case.
Account for this when determining the chip select size by keeping the most significant bit at its original value and ignoring any zero bits. This will return a full bitmask in [MSB:1].
--- drivers/edac/amd64_edac.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/edac/amd64_edac.c +21 -1
@@ -786,12 +786,14 @@ static void debug_dump_dramcfg_low(struct amd64_pvt *pvt, u32 dclr, int chan)#define CS_ODD_PRIMARY BIT(1)#define CS_EVEN_SECONDARY BIT(2)#define CS_ODD_SECONDARY BIT(3) +#define CS_3R_INTERLEAVE BIT(4)#define CS_EVEN (CS_EVEN_PRIMARY | CS_EVEN_SECONDARY)#define CS_ODD (CS_ODD_PRIMARY | CS_ODD_SECONDARY)static int f17_get_cs_mode (int dimm,u8 ctrl,struct amd64_pvt *pvt) { +u8 base, count =0 ;int cs_mode =0 ;if (csrow_enabled (2 * dimm, ctrl, pvt))
@@ -804,6 +806,20 @@ static int f17_get_cs_mode(int dimm, u8 ctrl, struct amd64_pvt *pvt)if (csrow_sec_enabled (2 * dimm +1 , ctrl, pvt)) cs_mode |=CS_ODD_SECONDARY ; +/* +* 3 Rank inteleaving support. +* There should be only three bases enabled and their two masks should +* be equal. +*/ +for_each_chip_select (base, ctrl, pvt) + count +=csrow_enabled (base, ctrl, pvt); + +if (count ==3 && + pvt->csels[ctrl].csmasks[0 ] == pvt->csels[ctrl].csmasks[1 ]) { +edac_dbg (1 ,"3R interleaving in use.\n" ); + cs_mode |=CS_3R_INTERLEAVE ; + } +return cs_mode; }
@@ -1612,10 +1628,14 @@ static int f17_addr_mask_to_cs_size(struct amd64_pvt *pvt, u8 umc,* * The MSB is the number of bits in the full mask because BIT[0] is * always 0. +* +* In the special 3 Rank interleaving case, a single bit is flipped +* without swapping with the most significant bit. This can be handled +* by keeping the MSB where it is and ignoring the single zero bit. */ msb =fls (addr_mask_orig) -1 ; weight =hweight_long (addr_mask_orig); - num_zero_bits = msb - weight; + num_zero_bits = msb - weight - !!(cs_mode &CS_3R_INTERLEAVE );/* Take the number of zero bits off from the top of the mask. */ addr_mask_deinterleaved =GENMASK_ULL (msb - num_zero_bits,1 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 306/575 rcu: Always inline rcu_dynticks_task*_{enter,exit}()
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 7663ad9a5dbcc27f3090e6bfd192c7e59222709f ]
RCU managed to grow a few noinstr violations:
vmlinux.o: warning: objtool: rcu_dynticks_eqs_enter()+0x0: call to rcu_dynticks_task_trace_enter() leaves .noinstr.text section vmlinux.o: warning: objtool: rcu_dynticks_eqs_exit()+0xe: call to rcu_dynticks_task_trace_exit() leaves .noinstr.text section
Fix them by adding __always_inline to the relevant trivial functions.
Also replace the noinstr with __always_inline for the existing rcu_dynticks_task_*() functions since noinstr would force noinline them, even when empty, which seems silly.
--- kernel/rcu/tree_plugin.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/rcu/tree_plugin.h +4 -4
@@ -2573,7 +2573,7 @@ static void rcu_bind_gp_kthread(void) }/* Record the current task on dyntick-idle entry. */ -static void noinstr rcu_dynticks_task_enter(void) +static __always_inline void rcu_dynticks_task_enter(void) {#if defined(CONFIG_TASKS_RCU ) && defined(CONFIG_NO_HZ_FULL )WRITE_ONCE (current->rcu_tasks_idle_cpu,smp_processor_id ());
@@ -2581,7 +2581,7 @@ static void noinstr rcu_dynticks_task_enter(void) }/* Record no current task on dyntick-idle exit. */ -static void noinstr rcu_dynticks_task_exit(void) +static __always_inline void rcu_dynticks_task_exit(void) {#if defined(CONFIG_TASKS_RCU ) && defined(CONFIG_NO_HZ_FULL )WRITE_ONCE (current->rcu_tasks_idle_cpu,-1 );
@@ -2589,7 +2589,7 @@ static void noinstr rcu_dynticks_task_exit(void) }/* Turn on heavyweight RCU tasks trace readers on idle/user entry. */ -static void rcu_dynticks_task_trace_enter (void ) +static __always_inline void rcu_dynticks_task_trace_enter(void) {#ifdef CONFIG_TASKS_TRACE_RCU if (IS_ENABLED (CONFIG_TASKS_TRACE_RCU_READ_MB ))
@@ -2598,7 +2598,7 @@ static void rcu_dynticks_task_trace_enter(void) }/* Turn off heavyweight RCU tasks trace readers on idle/user exit. */ -static void rcu_dynticks_task_trace_exit (void ) +static __always_inline void rcu_dynticks_task_trace_exit(void) {#ifdef CONFIG_TASKS_TRACE_RCU if (IS_ENABLED (CONFIG_TASKS_TRACE_RCU_READ_MB ))
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 307/575 netfilter: nft_dynset: relax superfluous check on set updates
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 7b1394892de8d95748d05e3ee41e85edb4abbfa1 ]
Relax this condition to make add and update commands idempotent for sets with no timeout. The eval function already checks if the set element timeout is available and updates it if the update command is used.
--- net/netfilter/nft_dynset.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
net/netfilter/nft_dynset.c +1 -10
@@ -141,17 +141,8 @@ static int nft_dynset_init(const struct nft_ctx *ctx,return -EBUSY ; priv->op =ntohl (nla_get_be32 (tb[NFTA_DYNSET_OP ])); -switch (priv->op) { -case NFT_DYNSET_OP_ADD : -case NFT_DYNSET_OP_DELETE : -break ; -case NFT_DYNSET_OP_UPDATE : -if (!(set->flags &NFT_SET_TIMEOUT )) -return -EOPNOTSUPP ; -break ; -default : +if (priv->op >NFT_DYNSET_OP_DELETE )return -EOPNOTSUPP ; - } timeout =0 ;if (tb[NFTA_DYNSET_TIMEOUT ] !=NULL ) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 308/575 media: dvb-frontends: mn88443x: Handle errors of clk_prepare_enable()
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 69a10678e2fba3d182e78ea041f2d1b1a6058764 ]
mn88443x_cmn_power_on() did not handle possible errors of clk_prepare_enable() and always finished successfully so that its caller mn88443x_probe() did not care about failed preparing/enabling of clocks as well.
Add missed error handling in both mn88443x_cmn_power_on() and mn88443x_probe(). This required to change the return value of the former from "void" to "int".
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/dvb-frontends/mn88443x.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/media/dvb-frontends/mn88443x.c +15 -3
@@ -204,11 +204,18 @@ struct mn88443x_priv {struct regmap *regmap_t; }; -static void mn88443x_cmn_power_on (struct mn88443x_priv *chip) +static int mn88443x_cmn_power_on (struct mn88443x_priv *chip) { +struct device *dev = &chip->client_s->dev;struct regmap *r_t = chip->regmap_t; +int ret; -clk_prepare_enable (chip->mclk); + ret =clk_prepare_enable (chip->mclk); +if (ret) { +dev_err (dev,"Failed to prepare and enable mclk: %d\n" , + ret); +return ret; + }gpiod_set_value_cansleep (chip->reset_gpio,1 );usleep_range (100 ,1000 );
@@ -222,6 +229,8 @@ static void mn88443x_cmn_power_on(struct mn88443x_priv *chip) }else {regmap_write (r_t,HIZSET3 ,0x8f ); } + +return 0 ; }static void mn88443x_cmn_power_off (struct mn88443x_priv *chip)
@@ -738,7 +747,10 @@ static int mn88443x_probe(struct i2c_client *client, chip->fe.demodulator_priv = chip;i2c_set_clientdata (client, chip); -mn88443x_cmn_power_on (chip); + ret =mn88443x_cmn_power_on (chip); +if (ret) + goto err_i2c_t; +mn88443x_s_sleep (chip);mn88443x_t_sleep (chip);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 309/575 crypto: qat - detect PFVF collision after ACK
In reply to Greg Kroah-HartmanFrom: Giovanni Cabiddu <[email protected]>
[ Upstream commit 9b768e8a3909ac1ab39ed44a3933716da7761a6f ]
Detect a PFVF collision between the local and the remote function by checking if the message on the PFVF CSR has been overwritten. This is done after the remote function confirms that the message has been received, by clearing the interrupt bit, or the maximum number of attempts (ADF_IOV_MSG_ACK_MAX_RETRY) to check the CSR has been exceeded.
--- drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/crypto/qat/qat_common/adf_pf2vf_msg.c +7 -0
@@ -150,6 +150,13 @@ static int __adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr) val =ADF_CSR_RD (pmisc_bar_addr, pf2vf_offset); }while ((val & int_bit) && (count++ <ADF_IOV_MSG_ACK_MAX_RETRY )); +if (val != msg) { +dev_dbg (&GET_DEV (accel_dev), +"Collision - PFVF CSR overwritten by remote function\n" ); + ret = -EIO ; + goto out; + } +if (val & int_bit) {dev_dbg (&GET_DEV (accel_dev),"ACK not received from remote\n" ); val &= ~int_bit;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 310/575 crypto: qat - disregard spurious PFVF interrupts
In reply to Greg Kroah-HartmanFrom: Giovanni Cabiddu <[email protected]>
[ Upstream commit 18fcba469ba5359c1de7e3fb16f7b9e8cd1b8e02 ]
Upon receiving a PFVF message, check if the interrupt bit is set in the message. If it is not, that means that the interrupt was probably triggered by a collision. In this case, disregard the message and re-enable the interrupts.
--- drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 6 ++++++ drivers/crypto/qat/qat_common/adf_vf_isr.c | 6 ++++++ 2 files changed, 12 insertions(+)
drivers/crypto/qat/qat_common/adf_pf2vf_msg.c +6 -0
@@ -205,6 +205,11 @@ void adf_vf2pf_req_hndl(struct adf_accel_vf_info *vf_info)/* Read message from the VF */ msg =ADF_CSR_RD (pmisc_addr, hw_data->get_pf2vf_offset (vf_nr)); +if (!(msg &ADF_VF2PF_INT )) { +dev_info (&GET_DEV (accel_dev), +"Spurious VF2PF interrupt, msg %X. Ignored\n" , msg); + goto out; + }/* To ACK, clear the VF2PFINT bit */ msg &= ~ADF_VF2PF_INT ;
@@ -288,6 +293,7 @@ void adf_vf2pf_req_hndl(struct adf_accel_vf_info *vf_info)if (resp &&adf_iov_putmsg (accel_dev, resp, vf_nr))dev_err (&GET_DEV (accel_dev),"Failed to send response to VF\n" ); +out:/* re-enable interrupt on PF from this VF */ adf_enable_vf2pf_interrupts (accel_dev, (1 << vf_nr));return ;
drivers/crypto/qat/qat_common/adf_vf_isr.c +6 -0
@@ -79,6 +79,11 @@ static void adf_pf2vf_bh_handler(void *data)/* Read the message from PF */ msg =ADF_CSR_RD (pmisc_bar_addr, hw_data->get_pf2vf_offset (0 )); +if (!(msg &ADF_PF2VF_INT )) { +dev_info (&GET_DEV (accel_dev), +"Spurious PF2VF interrupt, msg %X. Ignored\n" , msg); + goto out; + }if (!(msg &ADF_PF2VF_MSGORIGIN_SYSTEM ))/* Ignore legacy non-system (non-kernel) PF2VF messages */
@@ -127,6 +132,7 @@ static void adf_pf2vf_bh_handler(void *data) msg &= ~ADF_PF2VF_INT ;ADF_CSR_WR (pmisc_bar_addr, hw_data->get_pf2vf_offset (0 ), msg); +out:/* Re-enable PF2VF interrupts */ adf_enable_pf2vf_interrupts (accel_dev);return ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 311/575 hwrng: mtk - Force runtime pm ops for sleep ops
In reply to Greg Kroah-HartmanFrom: Markus Schneider-Pargmann <[email protected]>
[ Upstream commit b6f5f0c8f72d348b2d07b20d7b680ef13a7ffe98 ]
Currently mtk_rng_runtime_suspend/resume is called for both runtime pm and system sleep operations.
This is wrong as these should only be runtime ops as the name already suggests. Currently freezing the system will lead to a call to mtk_rng_runtime_suspend even if the device currently isn't active. This leads to a clock warning because it is disabled/unprepared although it isn't enabled/prepared currently.
This patch fixes this by only setting the runtime pm ops and forces to call the runtime pm ops from the system sleep ops as well if active but not otherwise.
--- drivers/char/hw_random/mtk-rng.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/char/hw_random/mtk-rng.c +7 -2
@@ -166,8 +166,13 @@ static int mtk_rng_runtime_resume(struct device *dev)return mtk_rng_init (&priv->rng); } -static UNIVERSAL_DEV_PM_OPS(mtk_rng_pm_ops, mtk_rng_runtime_suspend, - mtk_rng_runtime_resume, NULL); +static const struct dev_pm_ops mtk_rng_pm_ops = { + SET_RUNTIME_PM_OPS(mtk_rng_runtime_suspend, + mtk_rng_runtime_resume, NULL) +SET_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, + pm_runtime_force_resume) +}; +#define MTK_RNG_PM_OPS (&mtk_rng_pm_ops)#else /* CONFIG_PM */ #define MTK_RNG_PM_OPS NULL
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 312/575 b43legacy: fix a lower bounds test
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit c1c8380b0320ab757e60ed90efc8b1992a943256 ]
The problem is that "channel" is an unsigned int, when it's less 5 the value of "channel - 5" is not a negative number as one would expect but is very high positive value instead.
This means that "start" becomes a very high positive value. The result of that is that we never enter the "for (i = start; i <= end; i++) {" loop. Instead of storing the result from b43legacy_radio_aci_detect() it just uses zero.
--- drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/b43legacy/radio.c +1 -1
@@ -283,7 +283,7 @@ u8 b43legacy_radio_aci_scan(struct b43legacy_wldev *dev) & 0x7FFF);b43legacy_set_all_gains (dev,3 ,8 ,1 ); - start = (channel -5 >0 ) ? channel -5 :1 ; + start = (channel >5 ) ? channel -5 :1 ; end = (channel +5 <14 ) ? channel +5 :13 ;for (i = start; i <= end; i++) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 313/575 b43: fix a lower bounds test
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 9b793db5fca44d01f72d3564a168171acf7c4076 ]
The problem is that "channel" is an unsigned int, when it's less 5 the value of "channel - 5" is not a negative number as one would expect but is very high positive value instead.
This means that "start" becomes a very high positive value. The result of that is that we never enter the "for (i = start; i <= end; i++) {" loop. Instead of storing the result from b43legacy_radio_aci_detect() it just uses zero.
--- drivers/net/wireless/broadcom/b43/phy_g.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/b43/phy_g.c +1 -1
@@ -2297,7 +2297,7 @@ static u8 b43_gphy_aci_scan(struct b43_wldev *dev)b43_phy_mask (dev,B43_PHY_G_CRS ,0x7FFF );b43_set_all_gains (dev,3 ,8 ,1 ); - start = (channel -5 >0 ) ? channel -5 :1 ; + start = (channel >5 ) ? channel -5 :1 ; end = (channel +5 <14 ) ? channel +5 :13 ;for (i = start; i <= end; i++) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 314/575 gve: Recover from queue stall due to missed IRQ
In reply to Greg Kroah-HartmanFrom: John Fraker <[email protected]>
[ Upstream commit 87a7f321bb6a45e54b7d6c90d032ee5636a6ad97 ]
Don't always reset the driver on a TX timeout. Attempt to recover by kicking the queue in case an IRQ was missed.
--- drivers/net/ethernet/google/gve/gve.h | 4 +- drivers/net/ethernet/google/gve/gve_adminq.h | 1 + drivers/net/ethernet/google/gve/gve_main.c | 48 +++++++++++++++++++- 3 files changed, 51 insertions(+), 2 deletions(-)
drivers/net/ethernet/google/gve/gve.h +3 -1
@@ -28,7 +28,7 @@#define GVE_MIN_MSIX 3/* Numbers of gve tx/rx stats in stats report. */ -#define GVE_TX_STATS_REPORT_NUM 5 +#define GVE_TX_STATS_REPORT_NUM 6#define GVE_RX_STATS_REPORT_NUM 2/* Interval to schedule a stats report update, 20000ms. */
@@ -147,7 +147,9 @@ struct gve_tx_ring {u32 q_num____cacheline_aligned ;/* queue idx */ u32 stop_queue;/* count of queue stops */ u32 wake_queue;/* count of queue wakes */ +u32 queue_timeout;/* count of queue timeouts */ u32 ntfy_id;/* notification block index */ +u32 last_kick_msec;/* Last time the queue was kicked */ dma_addr_t bus;/* dma address of the descr ring */ dma_addr_t q_resources_bus;/* dma address of the queue resources */ struct u64_stats_sync statss;/* sync stats for 32bit archs */
drivers/net/ethernet/google/gve/gve_adminq.h +1 -0
@@ -212,6 +212,7 @@ enum gve_stat_names {TX_LAST_COMPLETION_PROCESSED =5 ,RX_NEXT_EXPECTED_SEQUENCE =6 ,RX_BUFFERS_POSTED =7 , +TX_TIMEOUT_CNT =8 ,// stats from NIC RX_QUEUE_DROP_CNT =65 , RX_NO_BUFFERS_POSTED = 66,
drivers/net/ethernet/google/gve/gve_main.c +47 -1
68 lines not on this page · raw message
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 315/575 mmc: sdhci-omap: Fix NULL pointer exception if regulator is not configured
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 8e0e7bd38b1ec7f9e5d18725ad41828be4e09859 ]
If sdhci-omap is configured for an unused device instance and the device is not set as disabled, we can get a NULL pointer dereference:
Unable to handle kernel NULL pointer dereference at virtual address
00000045
...
(regulator_set_voltage) from [<c07d7008>] (mmc_regulator_set_ocr+0x44/0xd0) (mmc_regulator_set_ocr) from [<c07e2d80>] (sdhci_set_ios+0xa4/0x490) (sdhci_set_ios) from [<c07ea690>] (sdhci_omap_set_ios+0x124/0x160) (sdhci_omap_set_ios) from [<c07c8e94>] (mmc_power_up.part.0+0x3c/0x154) (mmc_power_up.part.0) from [<c07c9d20>] (mmc_start_host+0x88/0x9c) (mmc_start_host) from [<c07cad34>] (mmc_add_host+0x58/0x7c) (mmc_add_host) from [<c07e2574>] (__sdhci_add_host+0xf0/0x22c) (__sdhci_add_host) from [<c07eaf68>] (sdhci_omap_probe+0x318/0x72c) (sdhci_omap_probe) from [<c06a39d8>] (platform_probe+0x58/0xb8)
AFAIK we are not seeing this with the devices configured in the mainline kernel but this can cause issues for folks bringing up their boards.
--- drivers/mmc/host/sdhci-omap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-omap.c +2 -1
@@ -682,7 +682,8 @@ static void sdhci_omap_set_power(struct sdhci_host *host, unsigned char mode, {struct mmc_host *mmc = host->mmc; -mmc_regulator_set_ocr (mmc, mmc->supply.vmmc, vdd); +if (!IS_ERR (mmc->supply.vmmc)) +mmc_regulator_set_ocr (mmc, mmc->supply.vmmc, vdd); }static int sdhci_omap_enable_dma (struct sdhci_host *host)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 316/575 mmc: sdhci-omap: Fix context restore
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit d806e334d0390502cd2a820ad33d65d7f9bba618 ]
We need to restore context in a specified order with HCTL set in two phases. This is similar to what omap_hsmmc_context_restore() is doing. Otherwise SDIO can stop working on resume.
And for PM runtime and SDIO cards, we need to also save SYSCTL, IE and ISE.
This should not be a problem currently, and these patches can be applied whenever suitable.
--- drivers/mmc/host/sdhci-omap.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-omap.c +14 -1
@@ -62,6 +62,8 @@#define SDHCI_OMAP_IE 0x234#define INT_CC_EN BIT(0) +#define SDHCI_OMAP_ISE 0x238 +#define SDHCI_OMAP_AC12 0x23c#define AC12_V1V8_SIGEN BIT(19)#define AC12_SCLK_SEL BIT(23)
@@ -113,6 +115,8 @@ struct sdhci_omap_host {u32 hctl;u32 sysctl;u32 capa; +u32 ie; +u32 ise; };static void sdhci_omap_start_clock (struct sdhci_omap_host *omap_host);
@@ -1246,14 +1250,23 @@ static void sdhci_omap_context_save(struct sdhci_omap_host *omap_host) { omap_host->con =sdhci_omap_readl (omap_host,SDHCI_OMAP_CON ); omap_host->hctl =sdhci_omap_readl (omap_host,SDHCI_OMAP_HCTL ); + omap_host->sysctl =sdhci_omap_readl (omap_host,SDHCI_OMAP_SYSCTL ); omap_host->capa =sdhci_omap_readl (omap_host,SDHCI_OMAP_CAPA ); + omap_host->ie =sdhci_omap_readl (omap_host,SDHCI_OMAP_IE ); + omap_host->ise =sdhci_omap_readl (omap_host,SDHCI_OMAP_ISE ); } +/* Order matters here, HCTL must be restored in two phases */ static void sdhci_omap_context_restore (struct sdhci_omap_host *omap_host) { -sdhci_omap_writel (omap_host,SDHCI_OMAP_CON , omap_host->con);sdhci_omap_writel (omap_host,SDHCI_OMAP_HCTL , omap_host->hctl);sdhci_omap_writel (omap_host,SDHCI_OMAP_CAPA , omap_host->capa); +sdhci_omap_writel (omap_host,SDHCI_OMAP_HCTL , omap_host->hctl); + +sdhci_omap_writel (omap_host,SDHCI_OMAP_SYSCTL , omap_host->sysctl); +sdhci_omap_writel (omap_host,SDHCI_OMAP_CON , omap_host->con); +sdhci_omap_writel (omap_host,SDHCI_OMAP_IE , omap_host->ie); +sdhci_omap_writel (omap_host,SDHCI_OMAP_ISE , omap_host->ise); }static int __maybe_unused sdhci_omap_suspend (struct device *dev)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 317/575 memstick: avoid out-of-range warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 4853396f03c3019eccf5cd113e464231e9ddf0b3 ]
clang-14 complains about a sanity check that always passes when the page size is 64KB or larger:
drivers/memstick/core/ms_block.c:1739:21: error: result of comparison of constant 65536 with expression of type 'unsigned short' is always false [-Werror,-Wtautological-constant-out-of-range-compare]
if (msb->page_size > PAGE_SIZE) {
~~~~~~~~~~~~~~ ^ ~~~~~~~~~This is fine, it will still work on all architectures, so just shut up that warning with a cast.
--- drivers/memstick/core/ms_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memstick/core/ms_block.c +1 -1
@@ -1727,7 +1727,7 @@ static int msb_init_card(struct memstick_dev *card) msb->pages_in_block = boot_block->attr.block_size *2 ; msb->block_size = msb->page_size * msb->pages_in_block; -if (msb->page_size >PAGE_SIZE ) { +if ((size_t )msb->page_size >PAGE_SIZE ) {/* this isn't supported by linux at all, anyway*/ dbg ("device page %d size isn't supported" , msb->page_size);return -EINVAL ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 318/575 memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit beae4a6258e64af609ad5995cc6b6056eb0d898e ]
The "msh" pointer is device managed, meaning that memstick_alloc_host() calls device_initialize() on it. That means that it can't be free using kfree() but must instead be freed with memstick_free_host(). Otherwise it leads to a tiny memory leak of device resources.
--- drivers/memstick/host/jmb38x_ms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memstick/host/jmb38x_ms.c +1 -1
@@ -882,7 +882,7 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)iounmap (host->addr); err_out_free: -kfree (msh); +memstick_free_host (msh);return NULL ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 319/575 net, neigh: Fix NTF_EXT_LEARNED in combination with NTF_USE
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
[ Upstream commit e4400bbf5b15750e1b59bf4722d18d99be60c69f ]
The NTF_EXT_LEARNED neigh flag is usually propagated back to user space upon dump of the neighbor table. However, when used in combination with NTF_USE flag this is not the case despite exempting the entry from the garbage collector. This results in inconsistent state since entries are typically marked in neigh->flags with NTF_EXT_LEARNED, but here they are not. Fix it by propagating the creation flag to ___neigh_create().
Before fix:
# ./ip/ip n replace 192.168.178.30 dev enp5s0 use extern_learn # ./ip/ip n 192.168.178.30 dev enp5s0 lladdr f4:8c:50:5e:71:9a REACHABLE [...]
After fix:
# ./ip/ip n replace 192.168.178.30 dev enp5s0 use extern_learn # ./ip/ip n 192.168.178.30 dev enp5s0 lladdr f4:8c:50:5e:71:9a extern_learn REACHABLE [...]
--- net/core/neighbour.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
net/core/neighbour.c +14 -12
@@ -380,7 +380,7 @@ EXPORT_SYMBOL(neigh_ifdown);static struct neighbour *neigh_alloc (struct neigh_table *tbl,struct net_device *dev, -bool exempt_from_gc) +u8 flags,bool exempt_from_gc) {struct neighbour *n =NULL ;unsigned long now = jiffies;
@@ -413,6 +413,7 @@ do_alloc: n->updated = n->used = now; n->nud_state =NUD_NONE ; n->output = neigh_blackhole; + n->flags = flags;seqlock_init (&n->hh.hh_lock); n->parms =neigh_parms_clone (&tbl->parms);timer_setup (&n->timer, neigh_timer_handler,0 );
@@ -576,19 +577,18 @@ struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net, }EXPORT_SYMBOL (neigh_lookup_nodev); -static struct neighbour *___neigh_create (struct neigh_table *tbl, -const void *pkey, -struct net_device *dev, -bool exempt_from_gc,bool want_ref) +static struct neighbour * +___neigh_create (struct neigh_table *tbl,const void *pkey, +struct net_device *dev,u8 flags, +bool exempt_from_gc,bool want_ref) { -struct neighbour *n1, *rc, *n =neigh_alloc (tbl, dev, exempt_from_gc); -u32 hash_val; -unsigned int key_len = tbl->key_len; -int error; +u32 hash_val, key_len = tbl->key_len; +struct neighbour *n1, *rc, *n;struct neigh_hash_table *nht; +int error; + n =neigh_alloc (tbl, dev, flags, exempt_from_gc);trace_neigh_create (tbl, dev, pkey, n, exempt_from_gc); -if (!n) { rc =ERR_PTR (-ENOBUFS ); goto out;
@@ -675,7 +675,7 @@ out_neigh_release:struct neighbour *__neigh_create (struct neigh_table *tbl,const void *pkey,struct net_device *dev,bool want_ref) { -return ___neigh_create (tbl, pkey, dev, false, want_ref); +return ___neigh_create (tbl, pkey, dev,0 , false, want_ref); }EXPORT_SYMBOL (__neigh_create);
@@ -1950,7 +1950,9 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, exempt_from_gc = ndm->ndm_state &NUD_PERMANENT || ndm->ndm_flags &NTF_EXT_LEARNED ; - neigh =___neigh_create (tbl, dst, dev, exempt_from_gc, true); + neigh =___neigh_create (tbl, dst, dev, + ndm->ndm_flags &NTF_EXT_LEARNED , + exempt_from_gc, true);if (IS_ERR (neigh)) { err =PTR_ERR (neigh); goto out;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 320/575 hwmon: Fix possible memleak in __hwmon_device_register()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ada61aa0b1184a8fda1a89a340c7d6cc4e59aee5 ]
I got memory leak as follows when doing fault injection test:
unreferenced object 0xffff888102740438 (size 8):
comm "27", pid 859, jiffies 4295031351 (age 143.992s) hex dump (first 8 bytes):
68 77 6d 6f 6e 30 00 00 hwmon0..
backtrace:
[<00000000544b5996>] __kmalloc_track_caller+0x1a6/0x300
[<00000000df0d62b9>] kvasprintf+0xad/0x140
[<00000000d3d2a3da>] kvasprintf_const+0x62/0x190
[<000000005f8f0f29>] kobject_set_name_vargs+0x56/0x140
[<00000000b739e4b9>] dev_set_name+0xb0/0xe0
[<0000000095b69c25>] __hwmon_device_register+0xf19/0x1e50 [hwmon]
[<00000000a7e65b52>] hwmon_device_register_with_info+0xcb/0x110 [hwmon]
[<000000006f181e86>] devm_hwmon_device_register_with_info+0x85/0x100 [hwmon]
[<0000000081bdc567>] tmp421_probe+0x2d2/0x465 [tmp421]
[<00000000502cc3f8>] i2c_device_probe+0x4e1/0xbb0
[<00000000f90bda3b>] really_probe+0x285/0xc30
[<000000007eac7b77>] __driver_probe_device+0x35f/0x4f0
[<000000004953d43d>] driver_probe_device+0x4f/0x140
[<000000002ada2d41>] __device_attach_driver+0x24c/0x330
[<00000000b3977977>] bus_for_each_drv+0x15d/0x1e0
[<000000005bf2a8e3>] __device_attach+0x267/0x410When device_register() returns an error, the name allocated in dev_set_name() will be leaked, the put_device() should be used instead of calling hwmon_dev_release() to give up the device reference, then the name will be freed in kobject_cleanup().
--- drivers/hwmon/hwmon.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hwmon/hwmon.c +4 -2
@@ -760,8 +760,10 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,dev_set_drvdata (hdev, drvdata);dev_set_name (hdev,HWMON_ID_FORMAT , id); err =device_register (hdev); -if (err) - goto free_hwmon; +if (err) { +put_device (hdev); + goto ida_remove; + }INIT_LIST_HEAD (&hwdev->tzdata);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 321/575 hwmon: (pmbus/lm25066) Let compiler determine outer dimension of lm25066_coeff
In reply to Greg Kroah-HartmanFrom: Zev Weiss <[email protected]>
[ Upstream commit b7931a7b0e0df4d2a25fedd895ad32c746b77bc1 ]
Maintaining this manually is error prone (there are currently only five chips supported, not six); gcc can do it for us automatically.
--- drivers/hwmon/pmbus/lm25066.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/pmbus/lm25066.c +1 -1
@@ -51,7 +51,7 @@ struct __coeff {#define PSC_CURRENT_IN_L (PSC_NUM_CLASSES)#define PSC_POWER_L (PSC_NUM_CLASSES + 1) -static struct __coeff lm25066_coeff[6 ][PSC_NUM_CLASSES +2 ] = { +static struct __coeff lm25066_coeff[][PSC_NUM_CLASSES +2 ] = { [lm25056] = { [PSC_VOLTAGE_IN ] = { .m =16296 ,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 322/575 ath10k: fix max antenna gain unit
In reply to Greg Kroah-HartmanFrom: Sven Eckelmann <[email protected]>
[ Upstream commit 0a491167fe0cf9f26062462de2a8688b96125d48 ]
Most of the txpower for the ath10k firmware is stored as twicepower (0.5 dB steps). This isn't the case for max_antenna_gain - which is still expected by the firmware as dB.
The firmware is converting it from dB to the internal (twicepower) representation when it calculates the limits of a channel. This can be seen in tpc_stats when configuring "12" as max_antenna_gain. Instead of the expected 12 (6 dB), the tpc_stats shows 24 (12 dB).
Tested on QCA9888 and IPQ4019 with firmware 10.4-3.5.3-00057.
--- drivers/net/wireless/ath/ath10k/mac.c | 6 +++--- drivers/net/wireless/ath/ath10k/wmi.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +3 -3
@@ -1041,7 +1041,7 @@ static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id) arg.channel.min_power =0 ; arg.channel.max_power = channel->max_power *2 ; arg.channel.max_reg_power = channel->max_reg_power *2 ; - arg.channel.max_antenna_gain = channel->max_antenna_gain *2 ; + arg.channel.max_antenna_gain = channel->max_antenna_gain;reinit_completion (&ar->vdev_setup_done);reinit_completion (&ar->vdev_delete_done);
@@ -1487,7 +1487,7 @@ static int ath10k_vdev_start_restart(struct ath10k_vif *arvif, arg.channel.min_power =0 ; arg.channel.max_power = chandef->chan->max_power *2 ; arg.channel.max_reg_power = chandef->chan->max_reg_power *2 ; - arg.channel.max_antenna_gain = chandef->chan->max_antenna_gain *2 ; + arg.channel.max_antenna_gain = chandef->chan->max_antenna_gain;if (arvif->vdev_type ==WMI_VDEV_TYPE_AP ) { arg.ssid = arvif->u.ap.ssid;
@@ -3258,7 +3258,7 @@ static int ath10k_update_channel_list(struct ath10k *ar) ch->min_power =0 ; ch->max_power = channel->max_power *2 ; ch->max_reg_power = channel->max_reg_power *2 ; - ch->max_antenna_gain = channel->max_antenna_gain *2 ; + ch->max_antenna_gain = channel->max_antenna_gain; ch->reg_class_id =0 ;/* FIXME */ /* FIXME: why use only legacy modes, why not any
drivers/net/wireless/ath/ath10k/wmi.h +3 -0
@@ -2066,7 +2066,9 @@ struct wmi_channel {union {__le32 reginfo1;struct { +/* note: power unit is 1 dBm */ u8 antenna_max; +/* note: power unit is 0.5 dBm */ u8 max_tx_power; } __packed; } __packed;
@@ -2086,6 +2088,7 @@ struct wmi_channel_arg {u32 min_power;u32 max_power;u32 max_reg_power; +/* note: power unit is 1 dBm */ u32 max_antenna_gain;u32 reg_class_id;enum wmi_phy_mode mode;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 323/575 kernel/sched: Fix sched_fork() access an invalid sched_task_group
In reply to Greg Kroah-HartmanFrom: Zhang Qiao <[email protected]>
[ Upstream commit 4ef0c5c6b5ba1f38f0ea1cedad0cad722f00c14a ]
There is a small race between copy_process() and sched_fork() where child->sched_task_group point to an already freed pointer.
parent doing fork() | someone moving the parent
| to another cgroup
-------------------------------+-------------------------------
copy_process()
+ dup_task_struct()<1>
parent move to another cgroup, and free the old cgroup. <2>
+ sched_fork()
+ __set_task_cpu()<3>
+ task_fork_fair()
+ sched_slice()<4>
In the worst case, this bug can lead to "use-after-free" and cause panic as shown above:
(1) parent copy its sched_task_group to child at <1>;
(2) someone move the parent to another cgroup and free the old
cgroup at <2>;
(3) the sched_task_group and cfs_rq that belong to the old cgroup will be accessed at <3> and <4>, which cause a panic:
[] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [] PGD 8000001fa0a86067 P4D 8000001fa0a86067 PUD 2029955067 PMD 0 [] Oops: 0000 [#1] SMP PTI
[] CPU: 7 PID: 648398 Comm: ebizzy Kdump: loaded Tainted: G OE --------- - - 4.18.0.x86_64+ #1
[] RIP: 0010:sched_slice+0x84/0xc0
[] Call Trace:
[] task_fork_fair+0x81/0x120 [] sched_fork+0x132/0x240 [] copy_process.part.5+0x675/0x20e0 [] ? __handle_mm_fault+0x63f/0x690 [] _do_fork+0xcd/0x3b0 [] do_syscall_64+0x5d/0x1d0 [] entry_SYSCALL_64_after_hwframe+0x65/0xca
[] RIP: 0033:0x7f04418cd7e1
Between cgroup_can_fork() and cgroup_post_fork(), the cgroup membership and thus sched_task_group can't change. So update child's sched_task_group at sched_post_fork() and move task_fork() and __set_task_cpu() (where accees the sched_task_group) from sched_fork() to sched_post_fork().
--- include/linux/sched/task.h | 3 ++- kernel/fork.c | 2 +- kernel/sched/core.c | 43 +++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 23 deletions(-)
include/linux/sched/task.h +2 -1
@@ -55,7 +55,8 @@ extern asmlinkage void schedule_tail(struct task_struct *prev);extern void init_idle (struct task_struct *idle,int cpu);extern int sched_fork (unsigned long clone_flags,struct task_struct *p); -extern void sched_post_fork (struct task_struct *p); +extern void sched_post_fork (struct task_struct *p, +struct kernel_clone_args *kargs);extern void sched_dead (struct task_struct *p);void __noreturn do_task_dead (void );
kernel/fork.c +1 -1
@@ -2310,7 +2310,7 @@ static __latent_entropy struct task_struct *copy_process(write_unlock_irq (&tasklist_lock);proc_fork_connector (p); -sched_post_fork (p); +sched_post_fork (p, args);cgroup_post_fork (p, args);perf_event_fork (p);
kernel/sched/core.c +22 -21
62 lines not on this page · raw message
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 324/575 tcp: switch orphan_count to bare per-cpu counters
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 19757cebf0c5016a1f36f7fe9810a9f0b33c0832 ]
Use of percpu_counter structure to track count of orphaned sockets is causing problems on modern hosts with 256 cpus or more.
Stefan Bach reported a serious spinlock contention in real workloads, that I was able to reproduce with a netfilter rule dropping incoming FIN packets.
53.56% server [kernel.kallsyms] [k] queued_spin_lock_slowpath
|
---queued_spin_lock_slowpath
|
--53.51%--_raw_spin_lock_irqsave
|
--53.51%--__percpu_counter_sum
tcp_check_oom
|
|--39.03%--__tcp_close
| tcp_close
| inet_release
| inet6_release
| sock_close
| __fput
| ____fput
| task_work_run
| exit_to_usermode_loop
| do_syscall_64
| entry_SYSCALL_64_after_hwframe
| __GI___libc_close
|
--14.48%--tcp_out_of_resources
tcp_write_timeout
tcp_retransmit_timer
tcp_write_timer_handler
tcp_write_timer
call_timer_fn
expire_timers
__run_timers
run_timer_softirq
__softirqentry_text_startAs explained in commit cf86a086a180 ("net/dst: use a smaller percpu_counter batch for dst entries accounting"), default batch size is too big for the default value of tcp_max_orphans (262144).
But even if we reduce batch sizes, there would still be cases where the estimated count of orphans is beyond the limit, and where tcp_too_many_orphans() has to call the expensive percpu_counter_sum_positive().
One solution is to use plain per-cpu counters, and have a timer to periodically refresh this cache.
Updating this cache every 100ms seems about right, tcp pressure state is not radically changing over shorter periods.
percpu_counter was nice 15 years ago while hosts had less than 16 cpus, not anymore by current standards.
v2: Fix the build issue for CONFIG_CRYPTO_DEV_CHELSIO_TLS=m,
reported by kernel test robot <[email protected]> Remove unused socket argument from tcp_too_many_orphans()
--- .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- .../chelsio/inline_crypto/chtls/chtls_cm.h | 2 +- include/net/inet_connection_sock.h | 2 +- include/net/sock.h | 2 +- include/net/tcp.h | 17 ++------- net/dccp/dccp.h | 2 +- net/dccp/proto.c | 14 ++----- net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/proc.c | 2 +- net/ipv4/tcp.c | 38 ++++++++++++++++--- 11 files changed, 49 insertions(+), 38 deletions(-)
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +1 -1
@@ -870,7 +870,7 @@ static void do_abort_syn_rcv(struct sock *child, struct sock *parent)* created only after 3 way handshake is done. */ sock_orphan (child); -percpu_counter_inc ((child)->sk_prot->orphan_count); +INC_ORPHAN_COUNT (child);chtls_release_resources (child);chtls_conn_done (child); }else {
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h +1 -1
@@ -95,7 +95,7 @@ struct deferred_skb_cb {#define WSCALE_OK (tp) ((tp)->rx_opt.wscale_ok)#define TSTAMP_OK (tp) ((tp)->rx_opt.tstamp_ok)#define SACK_OK (tp) ((tp)->rx_opt.sack_ok) -#define INC_ORPHAN_COUNT (sk) percpu_counter_inc((sk)->sk_prot->orphan_count) +#define INC_ORPHAN_COUNT (sk) this_cpu_inc(*(sk)->sk_prot->orphan_count)/* TLS SKB */ #define skb_ulp_tls_inline (skb) (ULP_SKB_CB(skb)->ulp.tls.ofld)
include/net/inet_connection_sock.h +1 -1
@@ -291,7 +291,7 @@ static inline void inet_csk_prepare_for_destroy_sock(struct sock *sk) {/* The below has to be done to allow calling inet_csk_destroy_sock */ sock_set_flag (sk,SOCK_DEAD ); -percpu_counter_inc (sk->sk_prot->orphan_count); +this_cpu_inc (*sk->sk_prot->orphan_count); }void inet_csk_destroy_sock (struct sock *sk);
include/net/sock.h +1 -1
@@ -1214,7 +1214,7 @@ struct proto {unsigned int useroffset;/* Usercopy region offset */ unsigned int usersize;/* Usercopy region size */ -struct percpu_counter *orphan_count; +unsigned int __percpu *orphan_count;struct request_sock_ops *rsk_prot;struct timewait_sock_ops *twsk_prot;
include/net/tcp.h +3 -14
@@ -48,7 +48,9 @@extern struct inet_hashinfo tcp_hashinfo; -extern struct percpu_counter tcp_orphan_count; +DECLARE_PER_CPU(unsigned int, tcp_orphan_count); +int tcp_orphan_count_sum (void ); +void tcp_time_wait (struct sock *sk,int state,int timeo);#define MAX_TCP_HEADER L1_CACHE_ALIGN(128 + MAX_HEADER)
@@ -290,19 +292,6 @@ static inline bool tcp_out_of_memory(struct sock *sk)void sk_forced_mem_schedule (struct sock *sk,int size); -static inline bool tcp_too_many_orphans (struct sock *sk,int shift) -{ -struct percpu_counter *ocp = sk->sk_prot->orphan_count; -int orphans =percpu_counter_read_positive (ocp); - -if (orphans << shift > sysctl_tcp_max_orphans) { - orphans =percpu_counter_sum_positive (ocp); -if (orphans << shift > sysctl_tcp_max_orphans) -return true; - } -return false; -} -bool tcp_check_oom (struct sock *sk,int shift);
net/dccp/dccp.h +1 -1
@@ -48,7 +48,7 @@ extern bool dccp_debug;extern struct inet_hashinfo dccp_hashinfo; -extern struct percpu_counter dccp_orphan_count; +DECLARE_PER_CPU(unsigned int, dccp_orphan_count);void dccp_time_wait (struct sock *sk,int state,int timeo);
net/dccp/proto.c +4 -10
@@ -42,8 +42,8 @@ DEFINE_SNMP_STAT(struct dccp_mib, dccp_statistics) __read_mostly;EXPORT_SYMBOL_GPL (dccp_statistics); -struct percpu_counter dccp_orphan_count; -EXPORT_SYMBOL_GPL (dccp_orphan_count); +DEFINE_PER_CPU(unsigned int, dccp_orphan_count); +EXPORT_PER_CPU_SYMBOL_GPL (dccp_orphan_count);struct inet_hashinfo dccp_hashinfo;EXPORT_SYMBOL_GPL (dccp_hashinfo);
@@ -1055,7 +1055,7 @@ adjudge_to_death:bh_lock_sock (sk);WARN_ON (sock_owned_by_user (sk)); -percpu_counter_inc (sk->sk_prot->orphan_count); +this_cpu_inc (dccp_orphan_count);/* Have we already been destroyed by a softirq or backlog? */ if (state !=DCCP_CLOSED && sk->sk_state ==DCCP_CLOSED )
@@ -1115,13 +1115,10 @@ static int __init dccp_init(void)BUILD_BUG_ON (sizeof (struct dccp_skb_cb ) > sizeof_field(struct sk_buff, cb)); - rc =percpu_counter_init (&dccp_orphan_count,0 ,GFP_KERNEL ); -if (rc) - goto out_fail;inet_hashinfo_init (&dccp_hashinfo); rc =inet_hashinfo2_init_mod (&dccp_hashinfo);if (rc) - goto out_free_percpu; + goto out_fail; rc = -ENOBUFS ; dccp_hashinfo.bind_bucket_cachep = kmem_cache_create("dccp_bind_bucket",
@@ -1226,8 +1223,6 @@ out_free_bind_bucket_cachep:kmem_cache_destroy (dccp_hashinfo.bind_bucket_cachep); out_free_hashinfo2:inet_hashinfo2_free_mod (&dccp_hashinfo); -out_free_percpu: -percpu_counter_destroy (&dccp_orphan_count); out_fail: dccp_hashinfo.bhash =NULL ; dccp_hashinfo.ehash =NULL ;
@@ -1250,7 +1245,6 @@ static void __exit dccp_fini(void)dccp_ackvec_exit ();dccp_sysctl_exit ();inet_hashinfo2_free_mod (&dccp_hashinfo); -percpu_counter_destroy (&dccp_orphan_count); }module_init (dccp_init);
net/ipv4/inet_connection_sock.c +2 -2
@@ -892,7 +892,7 @@ void inet_csk_destroy_sock(struct sock *sk)sk_refcnt_debug_release (sk); -percpu_counter_dec (sk->sk_prot->orphan_count); +this_cpu_dec (*sk->sk_prot->orphan_count);sock_put (sk); }
@@ -951,7 +951,7 @@ static void inet_child_forget(struct sock *sk, struct request_sock *req,sock_orphan (child); -percpu_counter_inc (sk->sk_prot->orphan_count); +this_cpu_inc (*sk->sk_prot->orphan_count);if (sk->sk_protocol ==IPPROTO_TCP &&tcp_rsk (req)->tfo_listener) {BUG_ON (rcu_access_pointer (tcp_sk (child)->fastopen_rsk) != req);
net/ipv4/inet_hashtables.c +1 -1
@@ -598,7 +598,7 @@ bool inet_ehash_nolisten(struct sock *sk, struct sock *osk, bool *found_dup_sk)if (ok) {sock_prot_inuse_add (sock_net (sk), sk->sk_prot,1 ); }else { -percpu_counter_inc (sk->sk_prot->orphan_count); +this_cpu_inc (*sk->sk_prot->orphan_count);inet_sk_set_state (sk,TCP_CLOSE );sock_set_flag (sk,SOCK_DEAD );inet_csk_destroy_sock (sk);
net/ipv4/proc.c +1 -1
@@ -53,7 +53,7 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)struct net *net = seq->private;int orphans, sockets; - orphans =percpu_counter_sum_positive (&tcp_orphan_count); + orphans =tcp_orphan_count_sum (); sockets =proto_sockets_allocated_sum_positive (&tcp_prot);socket_seq_show (seq);
net/ipv4/tcp.c +33 -5
@@ -280,8 +280,8 @@#include <asm/ioctls.h> #include <net/busy_poll.h> -struct percpu_counter tcp_orphan_count; -EXPORT_SYMBOL_GPL (tcp_orphan_count); +DEFINE_PER_CPU(unsigned int, tcp_orphan_count); +EXPORT_PER_CPU_SYMBOL_GPL (tcp_orphan_count);long sysctl_tcp_mem[3 ]__read_mostly ;EXPORT_SYMBOL (sysctl_tcp_mem);
@@ -2394,11 +2394,36 @@ void tcp_shutdown(struct sock *sk, int how) }EXPORT_SYMBOL (tcp_shutdown); +int tcp_orphan_count_sum (void ) +{ +int i, total =0 ; + +for_each_possible_cpu (i) + total +=per_cpu (tcp_orphan_count, i); + +return max (total,0 ); +} + +static int tcp_orphan_cache; +static struct timer_list tcp_orphan_timer; +#define TCP_ORPHAN_TIMER_PERIOD msecs_to_jiffies(100) + +static void tcp_orphan_update (struct timer_list *unused) +{ +WRITE_ONCE (tcp_orphan_cache,tcp_orphan_count_sum ()); +mod_timer (&tcp_orphan_timer, jiffies +TCP_ORPHAN_TIMER_PERIOD ); +} + +static bool tcp_too_many_orphans (int shift) +{ +return READ_ONCE (tcp_orphan_cache) << shift > sysctl_tcp_max_orphans; +} +bool tcp_check_oom (struct sock *sk,int shift) {bool too_many_orphans, out_of_socket_memory; - too_many_orphans =tcp_too_many_orphans (sk, shift); + too_many_orphans =tcp_too_many_orphans (shift); out_of_socket_memory =tcp_out_of_memory (sk);if (too_many_orphans)
@@ -2508,7 +2533,7 @@ adjudge_to_death:/* remove backlog if any, without releasing ownership. */ __release_sock (sk); -percpu_counter_inc (sk->sk_prot->orphan_count); +this_cpu_inc (tcp_orphan_count);/* Have we already been destroyed by a softirq or backlog? */ if (state !=TCP_CLOSE && sk->sk_state ==TCP_CLOSE )
@@ -4145,7 +4170,10 @@ void __init tcp_init(void) sizeof_field(struct sk_buff, cb));percpu_counter_init (&tcp_sockets_allocated,0 ,GFP_KERNEL ); -percpu_counter_init (&tcp_orphan_count,0 ,GFP_KERNEL ); + +timer_setup (&tcp_orphan_timer, tcp_orphan_update,TIMER_DEFERRABLE ); +mod_timer (&tcp_orphan_timer, jiffies +TCP_ORPHAN_TIMER_PERIOD ); +inet_hashinfo_init (&tcp_hashinfo); inet_hashinfo2_init(&tcp_hashinfo, "tcp_listen_portaddr_hash", thash_entries, 21, /* one slot per 2 MB*/
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 325/575 drm/msm: potential error pointer dereference in init()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b6816441a14bbe356ba8590de79cfea2de6a085c ]
The msm_iommu_new() returns error pointers on failure so check for that to avoid an Oops.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +4 -0
@@ -846,6 +846,10 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms)return 0 ; mmu =msm_iommu_new (dpu_kms->dev->dev, domain); +if (IS_ERR (mmu)) { +iommu_domain_free (domain); +return PTR_ERR (mmu); + } aspace =msm_gem_address_space_create (mmu,"dpu1" ,0x1000 ,0x100000000 -0x1000 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 326/575 drm/msm: uninitialized variable in msm_gem_import()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 2203bd0e5c12ffc53ffdd4fbd7b12d6ba27e0424 ]
The msm_gem_new_impl() function cleans up after itself so there is no need to call drm_gem_object_put(). Conceptually, it does not make sense to call a kref_put() function until after the reference counting has been initialized which happens immediately after this call in the drm_gem_(private_)object_init() functions.
In the msm_gem_import() function the "obj" pointer is uninitialized, so it will lead to a crash.
--- drivers/gpu/drm/msm/msm_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +2 -2
@@ -1061,7 +1061,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, ret =msm_gem_new_impl (dev, size, flags, &obj);if (ret) - goto fail; +return ERR_PTR (ret); msm_obj =to_msm_bo (obj);
@@ -1149,7 +1149,7 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, ret =msm_gem_new_impl (dev, size,MSM_BO_WC , &obj);if (ret) - goto fail; +return ERR_PTR (ret);drm_gem_private_object_init (dev, obj, size);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 327/575 net: stream: dont purge sk_error_queue in sk_stream_kill_queues()
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 24bcbe1cc69fa52dc4f7b5b2456678ed464724d8 ]
sk_stream_kill_queues() can be called on close when there are still outstanding skbs to transmit. Those skbs may try to queue notifications to the error queue (e.g. timestamps). If sk_stream_kill_queues() purges the queue without taking its lock the queue may get corrupted, and skbs leaked.
This shows up as a warning about an rmem leak:
WARNING: CPU: 24 PID: 0 at net/ipv4/af_inet.c:154 inet_sock_destruct+0x...
The leak is always a multiple of 0x300 bytes (the value is in %rax on my builds, so RAX: 0000000000000300). 0x300 is truesize of an empty sk_buff. Indeed if we dump the socket state at the time of the warning the sk_error_queue is often (but not always) corrupted. The ->next pointer points back at the list head, but not the ->prev pointer. Indeed we can find the leaked skb by scanning the kernel memory for something that looks like an skb with ->sk = socket in question, and ->truesize = 0x300. The contents of ->cb[] of the skb confirms the suspicion that it is indeed a timestamp notification (as generated in __skb_complete_tx_timestamp()).
Removing purging of sk_error_queue should be okay, since inet_sock_destruct() does it again once all socket refs are gone. Eric suggests this may cause sockets that go thru disconnect() to maintain notifications from the previous incarnations of the socket, but that should be okay since the race was there anyway, and disconnect() is not exactly dependable.
Thanks to Jonathan Lemon and Omar Sandoval for help at various stages of tracing the issue.
--- net/core/stream.c | 3 --- 1 file changed, 3 deletions(-)
net/core/stream.c +0 -3
@@ -195,9 +195,6 @@ void sk_stream_kill_queues(struct sock *sk)/* First the read buffer. */ __skb_queue_purge (&sk->sk_receive_queue); -/* Next, the error queue. */ -__skb_queue_purge (&sk->sk_error_queue); -/* Next, the write queue. */ WARN_ON (!skb_queue_empty (&sk->sk_write_queue));
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 328/575 media: ir_toy: assignment to be16 should be of correct type
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
[ Upstream commit febfe985fc2ea052a363f6525ff624b8efd5273c ]
commit f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit") removed a cpu_to_be16() cast, which causes a sparse warning.
--- drivers/media/rc/ir_toy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ir_toy.c +1 -1
@@ -310,7 +310,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count) buf[i] =cpu_to_be16 (v); } - buf[count] =0xffff ; + buf[count] =cpu_to_be16 (0xffff ); irtoy->tx_buf = buf; irtoy->tx_len = size;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 329/575 mmc: mxs-mmc: disable regulator on error and in the remove function
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit ce5f6c2c9b0fcb4094f8e162cfd37fb4294204f7 ]
The 'reg_vmmc' regulator is enabled in the probe. It is never disabled. Neither in the error handling path of the probe nor in the remove function.
Register a devm_action to disable it when needed.
--- drivers/mmc/host/mxs-mmc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/mmc/host/mxs-mmc.c +10 -0
@@ -565,6 +565,11 @@ static const struct of_device_id mxs_mmc_dt_ids[] = { };MODULE_DEVICE_TABLE (of, mxs_mmc_dt_ids); +static void mxs_mmc_regulator_disable (void *regulator) +{ +regulator_disable (regulator); +} +static int mxs_mmc_probe (struct platform_device *pdev) { const struct of_device_id *of_id =
@@ -606,6 +611,11 @@ static int mxs_mmc_probe(struct platform_device *pdev) "Failed to enable vmmc regulator: %d\n", ret); goto out_mmc_free; } + + ret =devm_add_action_or_reset (&pdev->dev, mxs_mmc_regulator_disable, + reg_vmmc); +if (ret) + goto out_mmc_free; } ssp->clk =devm_clk_get (&pdev->dev,NULL );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 330/575 block: ataflop: fix breakage introduced at blk-mq refactoring
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
[ Upstream commit 86d46fdaa12ae5befc16b8d73fc85a3ca0399ea6 ]
Refactoring of the Atari floppy driver when converting to blk-mq has broken the state machine in not-so-subtle ways:
finish_fdc() must be called when operations on the floppy device have completed. This is crucial in order to relase the ST-DMA lock, which protects against concurrent access to the ST-DMA controller by other drivers (some DMA related, most just related to device register access - broken beyond compare, I know).
When rewriting the driver's old do_request() function, the fact that finish_fdc() was called only when all queued requests had completed appears to have been overlooked. Instead, the new request function calls finish_fdc() immediately after the last request has been queued. finish_fdc() executes a dummy seek after most requests, and this overwrites the state machine's interrupt hander that was set up to wait for completion of the read/write request just prior. To make matters worse, finish_fdc() is called before device interrupts are re-enabled, making certain that the read/write interupt is missed.
Shifting the finish_fdc() call into the read/write request completion handler ensures the driver waits for the request to actually complete. With a queue depth of 2, we won't see long request sequences, so calling finish_fdc() unconditionally just adds a little overhead for the dummy seeks, and keeps the code simple.
While we're at it, kill ataflop_commit_rqs() which does nothing but run finish_fdc() unconditionally, again likely wiping out an in-flight request.
--- drivers/block/ataflop.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/block/ataflop.c +3 -15
@@ -653,9 +653,6 @@ static inline void copy_buffer(void *from, void *to) *p2++ = *p1++; } - - -/* General Interrupt Handling */ static void (*FloppyIRQHandler)(int status ) =NULL ;
@@ -1225,6 +1222,7 @@ static void fd_rwsec_done1(int status) }else {/* all sectors finished */ +finish_fdc ();fd_end_request_cur (BLK_STS_OK ); }return ;
@@ -1472,15 +1470,6 @@ static void setup_req_params( int drive ) ReqTrack, ReqSector, (unsigned long)ReqData )); } -static void ataflop_commit_rqs (struct blk_mq_hw_ctx *hctx) -{ -spin_lock_irq (&ataflop_lock); -atari_disable_irq (IRQ_MFP_FDC ); -finish_fdc (); -atari_enable_irq (IRQ_MFP_FDC ); -spin_unlock_irq (&ataflop_lock); -} -static blk_status_t ataflop_queue_rq (struct blk_mq_hw_ctx *hctx,const struct blk_mq_queue_data *bd) {
@@ -1488,6 +1477,8 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,int drive = floppy - unit;int type = floppy->type; +DPRINT (("Queue request: drive %d type %d last %d\n" , drive, type, bd->last)); +spin_lock_irq (&ataflop_lock);if (fd_request) {spin_unlock_irq (&ataflop_lock);
@@ -1547,8 +1538,6 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,setup_req_params ( drive );do_fd_action ( drive ); -if (bd->last) -finish_fdc ();atari_enable_irq (IRQ_MFP_FDC ); out:
@@ -1959,7 +1948,6 @@ static const struct block_device_operations floppy_fops = {static const struct blk_mq_ops ataflop_mq_ops = { .queue_rq = ataflop_queue_rq, - .commit_rqs = ataflop_commit_rqs, };static struct kobject *floppy_find (dev_t dev,int *part,void *data)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 331/575 platform/x86: thinkpad_acpi: Fix bitwise vs. logical warning
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit fd96e35ea7b95f1e216277805be89d66e4ae962d ]
A new warning in clang points out a use of bitwise OR with boolean expressions in this driver:
drivers/platform/x86/thinkpad_acpi.c:9061:11: error: use of bitwise '|' with boolean operands [-Werror,-Wbitwise-instead-of-logical]
else if ((strlencmp(cmd, "level disengaged") == 0) |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
||drivers/platform/x86/thinkpad_acpi.c:9061:11: note: cast one or both operands to int to silence this warning 1 error generated.
This should clearly be a logical OR so change it to fix the warning.
--- drivers/platform/x86/thinkpad_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/thinkpad_acpi.c +1 -1
@@ -9097,7 +9097,7 @@ static int fan_write_cmd_level(const char *cmd, int *rc)if (strlencmp (cmd,"level auto" ) ==0 ) level =TP_EC_FAN_AUTO ; -else if ((strlencmp (cmd,"level disengaged" ) ==0 ) | +else if ((strlencmp (cmd,"level disengaged" ) ==0 ) || (strlencmp (cmd,"level full-speed" ) ==0 )) level =TP_EC_FAN_FULLSPEED ;else if (sscanf (cmd,"level %d" , &level) !=1 )
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 332/575 mt76: mt7615: fix endianness warning in mt7615_mac_write_txwi
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit d81bfb41e30c42531536c5d2baa4d275a8309715 ]
Fix the following sparse warning in mt7615_mac_write_txwi routine:drivers/net/wireless/mediatek/mt76/mt7615/mac.c:758:17:
warning: incorrect type in assignment
expected restricted __le32 [usertype]
got unsigned long
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +9 -6
@@ -672,12 +672,15 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,if (info->flags &IEEE80211_TX_CTL_NO_ACK ) txwi[3 ] |=cpu_to_le32 (MT_TXD3_NO_ACK ); - txwi[7 ] =FIELD_PREP (MT_TXD7_TYPE , fc_type) | -FIELD_PREP (MT_TXD7_SUB_TYPE , fc_stype) | -FIELD_PREP (MT_TXD7_SPE_IDX ,0x18 ); -if (!is_mmio) - txwi[8 ] =FIELD_PREP (MT_TXD8_L_TYPE , fc_type) | -FIELD_PREP (MT_TXD8_L_SUB_TYPE , fc_stype); + val =FIELD_PREP (MT_TXD7_TYPE , fc_type) | +FIELD_PREP (MT_TXD7_SUB_TYPE , fc_stype) | +FIELD_PREP (MT_TXD7_SPE_IDX ,0x18 ); + txwi[7 ] =cpu_to_le32 (val); +if (!is_mmio) { + val =FIELD_PREP (MT_TXD8_L_TYPE , fc_type) | +FIELD_PREP (MT_TXD8_L_SUB_TYPE , fc_stype); + txwi[8 ] =cpu_to_le32 (val); + }return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 333/575 mt76: mt76x02: fix endianness warnings in mt76x02_mac.c
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit c33edef520213feccebc22c9474c685b9fb60611 ]
Fix the following sparse warning in mt76x02_mac_write_txwi and mt76x02_mac_tx_rate_val routines:drivers/net/wireless/mediatek/mt76/mt76x02_mac.c:237:19:
warning: restricted __le16 degrades to intege
warning: cast from restricted __le16drivers/net/wireless/mediatek/mt76/mt76x02_mac.c:383:28:
warning: incorrect type in assignment (different base types) expected restricted __le16 [usertype] rate
got unsigned long
--- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +7 -6
@@ -176,7 +176,7 @@ void mt76x02_mac_wcid_set_drop(struct mt76x02_dev *dev, u8 idx, bool drop)mt76_wr (dev,MT_WCID_DROP (idx), (val & ~bit) | (bit * drop)); } -static __le16 +static u16 mt76x02_mac_tx_rate_val (struct mt76x02_dev *dev,const struct ieee80211_tx_rate *rate,u8 *nss_val) {
@@ -222,14 +222,14 @@ mt76x02_mac_tx_rate_val(struct mt76x02_dev *dev, rateval |=MT_RXWI_RATE_SGI ; *nss_val = nss; -return cpu_to_le16 (rateval); +return rateval; }void mt76x02_mac_wcid_set_rate (struct mt76x02_dev *dev,struct mt76_wcid *wcid,const struct ieee80211_tx_rate *rate) {s8 max_txpwr_adj =mt76x02_tx_get_max_txpwr_adj (dev, rate); -__le16 rateval; +u16 rateval;u32 tx_info;s8 nss;
@@ -342,7 +342,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,struct ieee80211_key_conf *key = info->control.hw_key;u32 wcid_tx_info;u16 rate_ht_mask =FIELD_PREP (MT_RXWI_RATE_PHY ,BIT (1 ) |BIT (2 )); -u16 txwi_flags =0 ; +u16 txwi_flags =0 , rateval;u8 nss;s8 txpwr_adj, max_txpwr_adj;u8 ccmp_pn[8 ], nstreams = dev->chainmask &0xf ;
@@ -380,14 +380,15 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,if (wcid && (rate->idx <0 || !rate->count)) { wcid_tx_info = wcid->tx_info; - txwi->rate =FIELD_GET (MT_WCID_TX_INFO_RATE , wcid_tx_info); + rateval =FIELD_GET (MT_WCID_TX_INFO_RATE , wcid_tx_info); max_txpwr_adj =FIELD_GET (MT_WCID_TX_INFO_TXPWR_ADJ , wcid_tx_info); nss =FIELD_GET (MT_WCID_TX_INFO_NSS , wcid_tx_info); }else { - txwi->rate =mt76x02_mac_tx_rate_val (dev, rate, &nss); + rateval =mt76x02_mac_tx_rate_val (dev, rate, &nss); max_txpwr_adj =mt76x02_tx_get_max_txpwr_adj (dev, rate); } + txwi->rate =cpu_to_le16 (rateval); txpwr_adj =mt76x02_tx_get_txpwr_adj (dev, dev->txpower_conf, max_txpwr_adj);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 334/575 mt76: mt7915: fix possible infinite loop release semaphore
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit e500c9470e26be66eb2bc6de773ae9091149118a ]
Fix possible infinite loop in mt7915_load_patch if mt7915_mcu_patch_sem_ctrl always returns an error.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -2648,7 +2648,7 @@ out:default : ret = -EAGAIN ;dev_err (dev->mt76.dev,"Failed to release patch semaphore\n" ); - goto out; +break ; }release_firmware (fw);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 335/575 mt76: mt7915: fix sta_rec_wtbl tag len
In reply to Greg Kroah-HartmanFrom: Shayne Chen <[email protected]>
[ Upstream commit afa0370f3a3a64af6d368da0bedd72ab2a026cd0 ]
Fix tag len error for sta_rec_wtbl, which causes fw parsing error for the tags placed behind it.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -667,7 +667,7 @@ mt7915_mcu_alloc_wtbl_req(struct mt7915_dev *dev, struct mt7915_sta *msta, }if (sta_hdr) - sta_hdr->len =cpu_to_le16 (sizeof (hdr)); +le16_add_cpu (&sta_hdr->len,sizeof (hdr));return skb_put_data (nskb, &hdr,sizeof (hdr)); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 336/575 mt76: mt7915: fix muar_idx in mt7915_mcu_alloc_sta_req()
In reply to Greg Kroah-HartmanFrom: Shayne Chen <[email protected]>
[ Upstream commit 161cc13912d3c3e8857001988dfba39be842454a ]
For broadcast/multicast wcid, the muar_idx should be 0xe.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +1 -1
@@ -631,7 +631,7 @@ mt7915_mcu_alloc_sta_req(struct mt7915_dev *dev, struct mt7915_vif *mvif, .bss_idx = mvif->idx, .wlan_idx_lo = msta ? to_wcid_lo(msta->wcid.idx) : 0, .wlan_idx_hi = msta ? to_wcid_hi(msta->wcid.idx) : 0, - .muar_idx = msta ? mvif->omac_idx : 0, + .muar_idx = msta && msta->wcid.sta ? mvif->omac_idx : 0xe, .is_tlv_append = 1, };struct sk_buff *skb;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 337/575 rsi: stop thread firstly in rsi_91x_init() error handling
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 515e7184bdf0a3ebf1757cc77fb046b4fe282189 ]
When fail to init coex module, free 'common' and 'adapter' directly, but common->tx_thread which will access 'common' and 'adapter' is running at the same time. That will trigger the UAF bug.
==================================================================
BUG: KASAN: use-after-free in rsi_tx_scheduler_thread+0x50f/0x520 [rsi_91x] Read of size 8 at addr ffff8880076dc000 by task Tx-Thread/124777 CPU: 0 PID: 124777 Comm: Tx-Thread Not tainted 5.15.0-rc5+ #19 Call Trace: dump_stack_lvl+0xe2/0x152 print_address_description.constprop.0+0x21/0x140 ? rsi_tx_scheduler_thread+0x50f/0x520 kasan_report.cold+0x7f/0x11b ? rsi_tx_scheduler_thread+0x50f/0x520 rsi_tx_scheduler_thread+0x50f/0x520
...
Freed by task 111873: kasan_save_stack+0x1b/0x40 kasan_set_track+0x1c/0x30 kasan_set_free_info+0x20/0x30 __kasan_slab_free+0x109/0x140 kfree+0x117/0x4c0 rsi_91x_init+0x741/0x8a0 [rsi_91x] rsi_probe+0x9f/0x1750 [rsi_usb]
Stop thread before free 'common' and 'adapter' to fix it.
--- drivers/net/wireless/rsi/rsi_91x_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/rsi/rsi_91x_main.c +1 -0
@@ -369,6 +369,7 @@ struct rsi_hw *rsi_91x_init(u16 oper_mode)if (common->coex_mode >1 ) {if (rsi_coex_attach (common)) {rsi_dbg (ERR_ZONE ,"Failed to init coex module\n" ); +rsi_kill_thread (&common->tx_thread); goto err; } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 338/575 mwifiex: Send DELBA requests according to spec
In reply to Greg Kroah-HartmanFrom: Jonas Dreßler <[email protected]>
[ Upstream commit cc8a8bc37466f79b24d972555237f3d591150602 ]
While looking at on-air packets using Wireshark, I noticed we're never setting the initiator bit when sending DELBA requests to the AP: While we set the bit on our del_ba_param_set bitmask, we forget to actually copy that bitmask over to the command struct, which means we never actually set the initiator bit.
Fix that and copy the bitmask over to the host_cmd_ds_11n_delba command struct.
--- drivers/net/wireless/marvell/mwifiex/11n.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/marvell/mwifiex/11n.c +3 -2
@@ -657,14 +657,15 @@ int mwifiex_send_delba(struct mwifiex_private *priv, int tid, u8 *peer_mac,uint16_t del_ba_param_set;memset (&delba,0 ,sizeof (delba)); - delba.del_ba_param_set =cpu_to_le16 (tid <<DELBA_TID_POS ); - del_ba_param_set =le16_to_cpu (delba.del_ba_param_set); + del_ba_param_set = tid <<DELBA_TID_POS ; +if (initiator) del_ba_param_set |=IEEE80211_DELBA_PARAM_INITIATOR_MASK ;else del_ba_param_set &= ~IEEE80211_DELBA_PARAM_INITIATOR_MASK ; + delba.del_ba_param_set =cpu_to_le16 (del_ba_param_set);memcpy (&delba.peer_mac_addr, peer_mac,ETH_ALEN );/* We don't wait for the response of this command */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 339/575 net: enetc: unmap DMA in enetc_send_cmd()
In reply to Greg Kroah-HartmanFrom: Tim Gardner <[email protected]>
[ Upstream commit cd4bc63de774eee95e9bac26a565cd80e0fca421 ]
Coverity complains of a possible dereference of a null return value.
5. returned_null: kzalloc returns NULL. [show details]
6. var_assigned: Assigning: si_data = NULL return value from kzalloc.
488 si_data = kzalloc(data_size, __GFP_DMA | GFP_KERNEL);
489 cbd.length = cpu_to_le16(data_size);
490
491 dma = dma_map_single(&priv->si->pdev->dev, si_data,
492 data_size, DMA_FROM_DEVICE);
While this kzalloc() is unlikely to fail, I did notice that the function returned without unmapping si_data.
Fix this by refactoring the error paths and checking for kzalloc() failure.
--- .../net/ethernet/freescale/enetc/enetc_qos.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_qos.c +11 -7
@@ -486,14 +486,16 @@ static int enetc_streamid_hw_set(struct enetc_ndev_priv *priv, data_size =sizeof (struct streamid_data ); si_data =kzalloc (data_size, __GFP_DMA |GFP_KERNEL ); +if (!si_data) +return -ENOMEM ; cbd.length =cpu_to_le16 (data_size); dma =dma_map_single (&priv->si->pdev->dev, si_data, data_size,DMA_FROM_DEVICE );if (dma_mapping_error (&priv->si->pdev->dev, dma)) {netdev_err (priv->si->ndev,"DMA mapping failed!\n" ); -kfree (si_data); -return -ENOMEM ; + err = -ENOMEM ; + goto out; } cbd.addr[0 ] =lower_32_bits (dma);
@@ -513,12 +515,10 @@ static int enetc_streamid_hw_set(struct enetc_ndev_priv *priv, err =enetc_send_cmd (priv->si, &cbd);if (err) -return -EINVAL ; + goto out; -if (!enable) { -kfree (si_data); -return 0 ; - } +if (!enable) + goto out;/* Enable the entry overwrite again incase space flushed by hardware */ memset (&cbd,0 ,sizeof (cbd));
@@ -563,6 +563,10 @@ static int enetc_streamid_hw_set(struct enetc_ndev_priv *priv, } err =enetc_send_cmd (priv->si, &cbd); +out: +if (!dma_mapping_error (&priv->si->pdev->dev, dma)) +dma_unmap_single (&priv->si->pdev->dev, dma, data_size,DMA_FROM_DEVICE ); +kfree (si_data);return err;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 340/575 phy: micrel: ksz8041nl: do not use power down mode
In reply to Greg Kroah-HartmanFrom: Stefan Agner <[email protected]>
[ Upstream commit 2641b62d2fab52648e34cdc6994b2eacde2d27c1 ]
Some Micrel KSZ8041NL PHY chips exhibit continuous RX errors after using the power down mode bit (0.11). If the PHY is taken out of power down mode in a certain temperature range, the PHY enters a weird state which leads to continuously reporting RX errors. In that state, the MAC is not able to receive or send any Ethernet frames and the activity LED is constantly blinking. Since Linux is using the suspend callback when the interface is taken down, ending up in that state can easily happen during a normal startup.
Micrel confirmed the issue in errata DS80000700A [*], caused by abnormal clock recovery when using power down mode. Even the latest revision (A4, Revision ID 0x1513) seems to suffer that problem, and according to the errata is not going to be fixed.
Remove the suspend/resume callback to avoid using the power down mode completely.
[*] https://ww1.microchip.com/downloads/en/DeviceDoc/80000700A.pdf
--- drivers/net/phy/micrel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/phy/micrel.c +3 -2
@@ -1216,8 +1216,9 @@ static struct phy_driver ksphy_driver[] = { .get_sset_count = kszphy_get_sset_count, .get_strings = kszphy_get_strings, .get_stats = kszphy_get_stats, - .suspend = genphy_suspend, - .resume = genphy_resume, +/* No suspend/resume callbacks because of errata DS80000700A, +* receiver error following software power down. +*/ }, { .phy_id = PHY_ID_KSZ8041RNLI, .phy_id_mask = MICREL_PHY_ID_MASK,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 341/575 nvme-rdma: fix error code in nvme_rdma_setup_ctrl
In reply to Greg Kroah-HartmanFrom: Max Gurtovoy <[email protected]>
[ Upstream commit 09748122009aed7bfaa7acc33c10c083a4758322 ]
In case that icdoff is not zero or mandatory keyed sgls are not supported by the NVMe/RDMA target, we'll go to error flow but we'll return 0 to the caller. Fix it by returning an appropriate error code.
--- drivers/nvme/host/rdma.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/rdma.c +2 -0
@@ -1103,11 +1103,13 @@ static int nvme_rdma_setup_ctrl(struct nvme_rdma_ctrl *ctrl, bool new)return ret;if (ctrl->ctrl.icdoff) { + ret = -EOPNOTSUPP ;dev_err (ctrl->ctrl.device,"icdoff is not supported!\n" ); goto destroy_admin; }if (!(ctrl->ctrl.sgls & (1 <<2 ))) { + ret = -EOPNOTSUPP ;dev_err (ctrl->ctrl.device,"Mandatory keyed sgls are not supported!\n" ); goto destroy_admin;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 342/575 PM: hibernate: fix sparse warnings
In reply to Greg Kroah-HartmanFrom: Anders Roxell <[email protected]>
[ Upstream commit 01de5fcd8b1ac0ca28d2bb0921226a54fdd62684 ]
When building the kernel with sparse enabled 'C=1' the following warnings shows up:
kernel/power/swap.c:390:29: warning: incorrect type in assignment (different base types)kernel/power/swap.c:390:29: expected int retkernel/power/swap.c:390:29: got restricted blk_status_t
This is due to function hib_wait_io() returns a 'blk_status_t' which is a bitwise u8. Commit 5416da01ff6e ("PM: hibernate: Remove blk_status_to_errno in hib_wait_io") seemed to have mixed up the return type. However, the 4e4cbee93d56 ("block: switch bios to blk_status_t") actually broke the behaviour by returning the wrong type.
Rework so function hib_wait_io() returns a 'int' instead of 'blk_status_t' and make sure to call function blk_status_to_errno(hb->error)' when returning from function hib_wait_io() a int gets returned.
--- kernel/power/swap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/swap.c +1 -1
@@ -299,7 +299,7 @@ static int hib_submit_io(int op, int op_flags, pgoff_t page_off, void *addr,return error; } -static blk_status_t hib_wait_io (struct hib_bio_batch *hb) +static int hib_wait_io (struct hib_bio_batch *hb) {/* * We are relying on the behavior of blk_plug that a thread with
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 343/575 clocksource/drivers/timer-ti-dm: Select TIMER_OF
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit eda9a4f7af6ee47e9e131f20e4f8a41a97379293 ]
When building OMAP_DM_TIMER without TIMER_OF, there are orphan sections due to the use of TIMER_OF_DELCARE() without CONFIG_TIMER_OF. Select CONFIG_TIMER_OF when enaling OMAP_DM_TIMER:
arm-linux-gnueabi-ld: warning: orphan section __timer_of_table' from drivers/clocksource/timer-ti-dm-systimer.o' being placed in section `__timer_of_table'
--- drivers/clocksource/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/clocksource/Kconfig +1 -0
@@ -24,6 +24,7 @@ config I8253_LOCK config OMAP_DM_TIMER bool + select TIMER_OF config CLKBLD_I8253 def_bool y if CLKSRC_I8253 || CLKEVT_I8253 || I8253_LOCK
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 344/575 x86/sev: Fix stack type check in vc_switch_off_ist()
In reply to Greg Kroah-HartmanFrom: Joerg Roedel <[email protected]>
[ Upstream commit 5681981fb788281b09a4ea14d310d30b2bd89132 ]
The value of STACK_TYPE_EXCEPTION_LAST points to the last _valid_ exception stack. Reflect that in the check done in the vc_switch_off_ist() function.
--- arch/x86/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/traps.c +1 -1
@@ -701,7 +701,7 @@ asmlinkage __visible noinstr struct pt_regs *vc_switch_off_ist(struct pt_regs *r stack = (unsigned long *)sp;if (!get_stack_info_noinstr (stack, current, &info) || info.type ==STACK_TYPE_ENTRY || - info.type >=STACK_TYPE_EXCEPTION_LAST ) + info.type >STACK_TYPE_EXCEPTION_LAST ) sp =__this_cpu_ist_top_va (VC2 ); sync:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 345/575 drm/msm: Fix potential NULL dereference in DPU SSPP
In reply to Greg Kroah-HartmanFrom: Jessica Zhang <[email protected]>
[ Upstream commit 8bf71a5719b6cc5b6ba358096081e5d50ea23ab6 ]
Move initialization of sblk in _sspp_subblk_offset() after NULL check to avoid potential NULL pointer dereference.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +5 -3
@@ -138,11 +138,13 @@ static int _sspp_subblk_offset(struct dpu_hw_pipe *ctx, u32 *idx) {int rc =0 ; -const struct dpu_sspp_sub_blks *sblk = ctx->cap->sblk; +const struct dpu_sspp_sub_blks *sblk; -if (!ctx) +if (!ctx || !ctx->cap || !ctx->cap->sblk)return -EINVAL ; + sblk = ctx->cap->sblk; +switch (s_id) {case DPU_SSPP_SRC : *idx = sblk->src_blk.base;
@@ -419,7 +421,7 @@ static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_pipe *ctx, (void )pe;if (_sspp_subblk_offset (ctx,DPU_SSPP_SCALER_QSEED3 , &idx) || !sspp - || !scaler3_cfg || !ctx || !ctx->cap || !ctx->cap->sblk) + || !scaler3_cfg)return ; dpu_hw_setup_scaler3(&ctx->hw, scaler3_cfg, idx,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 346/575 smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 0934ad42bb2c5df90a1b9de690f93de735b622fe ]
syzbot is reporting UAF at cipso_v4_doi_search() [1], for smk_cipso_doi() is calling kfree() without removing from the cipso_v4_doi_list list after netlbl_cfg_cipsov4_map_add() returned an error. We need to use netlbl_cfg_cipsov4_del() in order to remove from the list and wait for RCU grace period before kfree().
--- security/smack/smackfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/smack/smackfs.c +1 -1
@@ -712,7 +712,7 @@ static void smk_cipso_doi(void)if (rc !=0 ) {printk (KERN_WARNING "%s:%d map add rc = %d\n" , __func__, __LINE__, rc); -kfree (doip); +netlbl_cfg_cipsov4_del (doip->doi, &nai);return ; } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 347/575 KVM: selftests: Add operand to vmsave/vmload/vmrun in svm.c
In reply to Greg Kroah-HartmanFrom: Ricardo Koller <[email protected]>
[ Upstream commit 47bc726fe8d1910872dc3d7e7ec70f8b9e6043b7 ]
Building the KVM selftests with LLVM's integrated assembler fails with:
$ CFLAGS=-fintegrated-as make -C tools/testing/selftests/kvm CC=clang
lib/x86_64/svm.c:77:16: error: too few operands for instruction
asm volatile ("vmsave\n\t" : : "a" (vmcb_gpa) : "memory");
^
<inline asm>:1:2: note: instantiated into assembly here
vmsave
^
lib/x86_64/svm.c:134:3: error: too few operands for instruction
"vmload\n\t"
^
<inline asm>:1:2: note: instantiated into assembly here
vmload
^
This is because LLVM IAS does not currently support calling vmsave,
vmload, or vmload without an explicit %rax operand.Add an explicit operand to vmsave, vmload, and vmrum in svm.c. Fixing this was suggested by Sean Christopherson.
Tested: building without this error in clang 11. The following patch (not queued yet) needs to be applied to solve the other remaining error:
"selftests: kvm: remove reassignment of non-absolute variables".
Message-Id: <[email protected]>
--- tools/testing/selftests/kvm/lib/x86_64/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/lib/x86_64/svm.c +4 -4
@@ -74,7 +74,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rwrmsr (MSR_VM_HSAVE_PA , svm->save_area_gpa);memset (vmcb,0 ,sizeof (*vmcb)); - asmvolatile ("vmsave\n\t" : :"a" (vmcb_gpa) :"memory" ); + asmvolatile ("vmsave %0\n\t" : :"a" (vmcb_gpa) :"memory" );vmcb_set_seg (&save->es,get_es (),0 ,-1U , data_seg_attr);vmcb_set_seg (&save->cs,get_cs (),0 ,-1U , code_seg_attr);vmcb_set_seg (&save->ss,get_ss (),0 ,-1U , data_seg_attr);
@@ -131,19 +131,19 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rvoid run_guest (struct vmcb *vmcb,uint64_t vmcb_gpa) { asmvolatile ( -"vmload\n\t" +"vmload %[vmcb_gpa]\n\t" "mov rflags, %%r15\n\t" // rflags "mov %%r15, 0x170(%[vmcb])\n\t" "mov guest_regs, %%r15\n\t" // rax "mov %%r15, 0x1f8(%[vmcb])\n\t" LOAD_GPR_C -"vmrun\n\t" +"vmrun %[vmcb_gpa]\n\t" SAVE_GPR_C "mov 0x170(%[vmcb]), %%r15\n\t" // rflags "mov %%r15, rflags\n\t" "mov 0x1f8(%[vmcb]), %%r15\n\t" // rax "mov %%r15, guest_regs\n\t" -"vmsave\n\t" +"vmsave %[vmcb_gpa]\n\t" : : [vmcb]"r" (vmcb), [vmcb_gpa]"a" (vmcb_gpa) :"r15" ,"memory" ); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 348/575 KVM: selftests: Fix nested SVM tests when built with clang
In reply to Greg Kroah-HartmanFrom: Jim Mattson <[email protected]>
[ Upstream commit ed290e1c20da19fa100a3e0f421aa31b65984960 ]
Though gcc conveniently compiles a simple memset to "rep stos," clang prefers to call the libc version of memset. If a test is dynamically linked, the libc memset isn't available in L1 (nor is the PLT or the GOT, for that matter). Even if the test is statically linked, the libc memset may choose to use some CPU features, like AVX, which may not be enabled in L1. Note that __builtin_memset doesn't solve the problem, because (a) the compiler is free to call memset anyway, and (b) __builtin_memset may also choose to use features like AVX, which may not be available in L1.
To avoid a myriad of problems, use an explicit "rep stos" to clear the VMCB in generic_svm_setup(), which is called both from L0 and L1.
Message-Id: <[email protected]>
--- tools/testing/selftests/kvm/lib/x86_64/svm.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/x86_64/svm.c +13 -1
@@ -57,6 +57,18 @@ static void vmcb_set_seg(struct vmcb_seg *seg, u16 selector, seg->base = base; } +/* +* Avoid using memset to clear the vmcb, since libc may not be +* available in L1 (and, even if it is, features that libc memset may +* want to use, like AVX, may not be enabled). +*/ +static void clear_vmcb (struct vmcb *vmcb) +{ +int n =sizeof (*vmcb) /sizeof (u32); + + asmvolatile ("rep stosl" :"+c" (n),"+D" (vmcb) :"a" (0 ) :"memory" ); +} +void generic_svm_setup (struct svm_test_data *svm,void *guest_rip,void *guest_rsp) {struct vmcb *vmcb = svm->vmcb;
@@ -73,7 +85,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rwrmsr (MSR_EFER , efer |EFER_SVME );wrmsr (MSR_VM_HSAVE_PA , svm->save_area_gpa); -memset (vmcb,0 ,sizeof (*vmcb)); +clear_vmcb (vmcb); asmvolatile ("vmsave %0\n\t" : :"a" (vmcb_gpa) :"memory" );vmcb_set_seg (&save->es,get_es (),0 ,-1U , data_seg_attr);vmcb_set_seg (&save->cs,get_cs (),0 ,-1U , code_seg_attr);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 349/575 bpftool: Avoid leaking the JSON writer prepared for program metadata
In reply to Greg Kroah-HartmanFrom: Quentin Monnet <[email protected]>
[ Upstream commit e89ef634f81c9d90e1824ab183721f3b361472e6 ]
Bpftool creates a new JSON object for writing program metadata in plain text mode, regardless of metadata being present or not. Then this writer is freed if any metadata has been found and printed, but it leaks otherwise. We cannot destroy the object unconditionally, because the destructor prints an undesirable line break. Instead, make sure the writer is created only after we have found program metadata to print.
Found with valgrind.
--- tools/bpf/bpftool/prog.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
tools/bpf/bpftool/prog.c +9 -7
@@ -304,18 +304,12 @@ static void show_prog_metadata(int fd, __u32 num_maps)if (printed_header)jsonw_end_object (json_wtr); }else { -json_writer_t *btf_wtr =jsonw_new (stdout); +json_writer_t *btf_wtr;struct btf_dumper d = { .btf = btf, - .jw = btf_wtr, .is_plain_text = true, }; -if (!btf_wtr) { -p_err ("jsonw alloc failed" ); - goto out_free; - } -for (i =0 ; i < vlen; i++, vsi++) { t_var =btf__type_by_id (btf, vsi->type); name =btf__name_by_offset (btf, t_var->name_off);
@@ -325,6 +319,14 @@ static void show_prog_metadata(int fd, __u32 num_maps)if (!printed_header) {printf ("\tmetadata:" ); + + btf_wtr =jsonw_new (stdout); +if (!btf_wtr) { +p_err ("jsonw alloc failed" ); + goto out_free; + } + d.jw = btf_wtr, + printed_header = true; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 350/575 libbpf: Fix BTF data layout checks and allow empty BTF
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit d8123624506cd62730c9cd9c7672c698e462703d ]
Make data section layout checks stricter, disallowing overlap of types and strings data.
Additionally, allow BTFs with no type data. There is nothing inherently wrong with having BTF with no types (put potentially with some strings). This could be a situation with kernel module BTFs, if module doesn't introduce any new type information.
Also fix invalid offset alignment check for btf->hdr->type_off.
--- tools/lib/bpf/btf.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
tools/lib/bpf/btf.c +6 -10
@@ -215,22 +215,18 @@ static int btf_parse_hdr(struct btf *btf)return -EINVAL ; } -if (meta_left < hdr->type_off) { -pr_debug ("Invalid BTF type section offset:%u\n" , hdr->type_off); +if (meta_left < hdr->str_off + hdr->str_len) { +pr_debug ("Invalid BTF total size:%u\n" , btf->raw_size);return -EINVAL ; } -if (meta_left < hdr->str_off) { -pr_debug ("Invalid BTF string section offset:%u\n" , hdr->str_off); +if (hdr->type_off + hdr->type_len > hdr->str_off) { +pr_debug ("Invalid BTF data sections layout: type data at %u + %u, strings data at %u + %u\n" , + hdr->type_off, hdr->type_len, hdr->str_off, hdr->str_len);return -EINVAL ; } -if (hdr->type_off >= hdr->str_off) { -pr_debug ("BTF type section offset >= string section offset. No type?\n" ); -return -EINVAL ; - } - -if (hdr->type_off &0x02 ) { +if (hdr->type_off %4 ) {pr_debug ("BTF type section is not aligned to 4 bytes\n" );return -EINVAL ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 351/575 libbpf: Allow loading empty BTFs
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit b8d52264df85ec12f370c0a8b28d0ac59a05877a ]
Empty BTFs do come up (e.g., simple kernel modules with no new types and strings, compared to the vmlinux BTF) and there is nothing technically wrong with them. So remove unnecessary check preventing loading empty BTFs.
--- tools/lib/bpf/btf.c | 5 ----- 1 file changed, 5 deletions(-)
tools/lib/bpf/btf.c +0 -5
@@ -210,11 +210,6 @@ static int btf_parse_hdr(struct btf *btf) } meta_left = btf->raw_size -sizeof (*hdr); -if (!meta_left) { -pr_debug ("BTF has no data\n" ); -return -EINVAL ; - } -if (meta_left < hdr->str_off + hdr->str_len) {pr_debug ("Invalid BTF total size:%u\n" , btf->raw_size);return -EINVAL ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 352/575 libbpf: Fix overflow in BTF sanity checks
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 5245dafe3d49efba4d3285cf27ee1cc1eeafafc6 ]
btf_header's str_off+str_len or type_off+type_len can overflow as they are u32s. This will lead to bypassing the sanity checks during BTF parsing, resulting in crashes afterwards. Fix by using 64-bit signed integers for comparison.
--- tools/lib/bpf/btf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/btf.c +2 -2
@@ -210,12 +210,12 @@ static int btf_parse_hdr(struct btf *btf) } meta_left = btf->raw_size -sizeof (*hdr); -if (meta_left < hdr->str_off + hdr->str_len) { +if (meta_left < (long long )hdr->str_off + hdr->str_len) {pr_debug ("Invalid BTF total size:%u\n" , btf->raw_size);return -EINVAL ; } -if (hdr->type_off + hdr->type_len > hdr->str_off) { +if ((long long )hdr->type_off + hdr->type_len > hdr->str_off) {pr_debug ("Invalid BTF data sections layout: type data at %u + %u, strings data at %u + %u\n" , hdr->type_off, hdr->type_len, hdr->str_off, hdr->str_len);return -EINVAL ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 353/575 libbpf: Fix BTF header parsing checks
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit c825f5fee19caf301d9821cd79abaa734322de26 ]
Original code assumed fixed and correct BTF header length. That's not always the case, though, so fix this bug with a proper additional check. And use actual header length instead of sizeof(struct btf_header) in sanity checks.
--- tools/lib/bpf/btf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/lib/bpf/btf.c +9 -3
@@ -205,13 +205,19 @@ static int btf_parse_hdr(struct btf *btf) }btf_bswap_hdr (hdr); }else if (hdr->magic !=BTF_MAGIC ) { -pr_debug ("Invalid BTF magic:%x\n" , hdr->magic); +pr_debug ("Invalid BTF magic: %x\n" , hdr->magic);return -EINVAL ; } - meta_left = btf->raw_size -sizeof (*hdr); +if (btf->raw_size < hdr->hdr_len) { +pr_debug ("BTF header len %u larger than data size %u\n" , + hdr->hdr_len, btf->raw_size); +return -EINVAL ; + } + + meta_left = btf->raw_size - hdr->hdr_len;if (meta_left < (long long )hdr->str_off + hdr->str_len) { -pr_debug ("Invalid BTF total size:%u\n" , btf->raw_size); +pr_debug ("Invalid BTF total size: %u\n" , btf->raw_size);return -EINVAL ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 354/575 s390/gmap: dont unconditionally call pte_unmap_unlock() in __gmap_zap()
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
[ Upstream commit b159f94c86b43cf7e73e654bc527255b1f4eafc4 ]
... otherwise we will try unlocking a spinlock that was never locked via a garbage pointer.
At the time we reach this code path, we usually successfully looked up a PGSTE already; however, evil user space could have manipulated the VMA layout in the meantime and triggered removal of the page table.
--- arch/s390/mm/gmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/s390/mm/gmap.c +3 -2
@@ -684,9 +684,10 @@ void __gmap_zap(struct gmap *gmap, unsigned long gaddr) vmaddr |= gaddr & ~PMD_MASK ;/* Get pointer to the page table entry */ ptep =get_locked_pte (gmap->mm, vmaddr, &ptl); -if (likely (ptep)) +if (likely (ptep)) {ptep_zap_unused (gmap->mm, vmaddr, ptep,0 ); -pte_unmap_unlock (ptep, ptl); +pte_unmap_unlock (ptep, ptl); + } } }EXPORT_SYMBOL_GPL (__gmap_zap);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 355/575 KVM: s390: pv: avoid double free of sida page
In reply to Greg Kroah-HartmanFrom: Claudio Imbrenda <[email protected]>
[ Upstream commit d4074324b07a94a1fca476d452dfbb3a4e7bf656 ]
If kvm_s390_pv_destroy_cpu is called more than once, we risk calling free_page on a random page, since the sidad field is aliased with the gbea, which is not guaranteed to be zero.
This can happen, for example, if userspace calls the KVM_PV_DISABLE IOCTL, and it fails, and then userspace calls the same IOCTL again. This scenario is only possible if KVM has some serious bug or if the hardware is broken.
The solution is to simply return successfully immediately if the vCPU was already non secure.
Message-Id: <[email protected]>
--- arch/s390/kvm/pv.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
arch/s390/kvm/pv.c +9 -10
@@ -16,18 +16,17 @@int kvm_s390_pv_destroy_cpu (struct kvm_vcpu *vcpu,u16 *rc,u16 *rrc) { -int cc =0 ; +int cc; -if (kvm_s390_pv_cpu_get_handle (vcpu)) { - cc =uv_cmd_nodata (kvm_s390_pv_cpu_get_handle (vcpu), -UVC_CMD_DESTROY_SEC_CPU , rc, rrc); +if (!kvm_s390_pv_cpu_get_handle (vcpu)) +return 0 ; + + cc =uv_cmd_nodata (kvm_s390_pv_cpu_get_handle (vcpu),UVC_CMD_DESTROY_SEC_CPU , rc, rrc); + +KVM_UV_EVENT (vcpu->kvm,3 ,"PROTVIRT DESTROY VCPU %d: rc %x rrc %x" , + vcpu->vcpu_id, *rc, *rrc); +WARN_ONCE (cc,"protvirt destroy cpu failed rc %x rrc %x" , *rc, *rrc); -KVM_UV_EVENT (vcpu->kvm,3 , -"PROTVIRT DESTROY VCPU %d: rc %x rrc %x" , - vcpu->vcpu_id, *rc, *rrc); -WARN_ONCE (cc,"protvirt destroy cpu failed rc %x rrc %x" , - *rc, *rrc); - }/* Intended memory leak for something that should never happen. */ if (!cc) free_pages(vcpu->arch.pv.stor_base,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 356/575 KVM: s390: pv: avoid stalls for kvm_s390_pv_init_vm
In reply to Greg Kroah-HartmanFrom: Claudio Imbrenda <[email protected]>
[ Upstream commit 1e2aa46de526a5adafe580bca4c25856bb06f09e ]
When the system is heavily overcommitted, kvm_s390_pv_init_vm might generate stall notifications.
Fix this by using uv_call_sched instead of just uv_call. This is ok because we are not holding spinlocks.
Message-Id: <[email protected]>
--- arch/s390/kvm/pv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kvm/pv.c +1 -1
@@ -190,7 +190,7 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc) uvcb.conf_base_stor_origin = (u64 )kvm->arch.pv.stor_base; uvcb.conf_virt_stor_origin = (u64 )kvm->arch.pv.stor_var; - cc =uv_call (0 , (u64)&uvcb); + cc =uv_call_sched (0 , (u64)&uvcb); *rc = uvcb.header.rc; *rrc = uvcb.header.rrc; KVM_UV_EVENT(kvm, 3, "PROTVIRT CREATE VM: handle %llx len %llx rc %x rrc %x",
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 357/575 irq: mips: avoid nested irq_enter()
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit c65b52d02f6c1a06ddb20cba175ad49eccd6410d ]
As bcm6345_l1_irq_handle() is a chained irqchip handler, it will be invoked within the context of the root irqchip handler, which must have entered IRQ context already.
When bcm6345_l1_irq_handle() calls arch/mips's do_IRQ() , this will nest another call to irq_enter(), and the resulting nested increment to rcu_data.dynticks_nmi_nesting will cause rcu_is_cpu_rrupt_from_idle() to fail to identify wakeups from idle, resulting in failure to preempt, and RCU stalls.
Chained irqchip handlers must invoke IRQ handlers by way of thee core irqchip code, i.e. generic_handle_irq() or generic_handle_domain_irq() and should not call do_IRQ(), which is intended only for root irqchip handlers.
Fix bcm6345_l1_irq_handle() by calling generic_handle_irq() directly.
--- drivers/irqchip/irq-bcm6345-l1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-bcm6345-l1.c +1 -1
@@ -140,7 +140,7 @@ static void bcm6345_l1_irq_handle(struct irq_desc *desc)for_each_set_bit (hwirq, &pending,IRQS_PER_WORD ) { irq =irq_linear_revmap (intc->domain, base + hwirq);if (irq) -do_IRQ (irq); +generic_handle_irq (irq);else spurious_interrupt (); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 358/575 ataflop: use a separate gendisk for each media format
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit bf9c0538e485b591a2ee02d9adb8a99db4be5a2a ]
The Atari floppy driver usually autodetects the media when used with the ormal /dev/fd? devices, which also are the only nodes created by udev. But it also supports various aliases that force a given media format. That is currently supported using the blk_register_region framework which finds the floppy gendisk even for a 'mismatched' dev_t. The problem with this (besides the code complexity) is that it creates multiple struct block_device instances for the whole device of a single gendisk, which can lead to interesting issues in code not aware of that fact.
To fix this just create a separate gendisk for each of the aliases if they are accessed.
--- drivers/block/ataflop.c | 135 +++++++++++++++++++++++++--------------- 1 file changed, 86 insertions(+), 49 deletions(-)
drivers/block/ataflop.c +86 -49
@@ -297,7 +297,7 @@ static struct atari_floppy_struct {unsigned int wpstat;/* current state of WP signal (for disk change detection) */ int flags;/* flags */ -struct gendisk *disk; +struct gendisk *disk[NUM_DISK_MINORS ];int ref;int type;struct blk_mq_tag_set tag_set;
@@ -720,12 +720,16 @@ static void fd_error( void )static int do_format (int drive,int type,struct atari_format_descr *desc) { -struct request_queue *q = unit[drive].disk->queue; +struct request_queue *q;unsigned char *p;int sect, nsect;unsigned long flags;int ret; +if (type) + type--; + + q = unit[drive].disk[type]->queue;blk_mq_freeze_queue (q);blk_mq_quiesce_queue (q);
@@ -735,7 +739,7 @@ static int do_format(int drive, int type, struct atari_format_descr *desc)local_irq_restore (flags);if (type) { -if (--type >=NUM_DISK_MINORS || +if (type >=NUM_DISK_MINORS || minor2disktype[type].drive_types > DriveType) { ret = -EINVAL ; goto out;
@@ -1151,7 +1155,7 @@ static void fd_rwsec_done1(int status)if (SUDT [-1 ].blocks > ReqBlock) {/* try another disk type */ SUDT --; -set_capacity (unit[SelectedDrive].disk, +set_capacity (unit[SelectedDrive].disk[0 ],SUDT ->blocks); }else Probing =0 ;
@@ -1166,7 +1170,7 @@ static void fd_rwsec_done1(int status)/* record not found, but not probing. Maybe stretch wrong ? Restart probing */ if (SUD .autoprobe) {SUDT = atari_disk_type + StartDiskType[DriveType]; -set_capacity (unit[SelectedDrive].disk, +set_capacity (unit[SelectedDrive].disk[0 ],SUDT ->blocks); Probing =1 ; }
@@ -1506,7 +1510,7 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,if (!UDT ) { Probing =1 ;UDT = atari_disk_type + StartDiskType[DriveType]; -set_capacity (floppy->disk,UDT ->blocks); +set_capacity (bd->rq->rq_disk,UDT ->blocks);UD .autoprobe =1 ; } }
@@ -1524,7 +1528,7 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx, } type = minor2disktype[type].index;UDT = &atari_disk_type[type]; -set_capacity (floppy->disk,UDT ->blocks); +set_capacity (bd->rq->rq_disk,UDT ->blocks);UD .autoprobe =0 ; }
@@ -1647,7 +1651,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,printk (KERN_INFO "floppy%d: setting %s %p!\n" , drive, dtp->name, dtp);UDT = dtp; -set_capacity (floppy->disk,UDT ->blocks); +set_capacity (disk,UDT ->blocks);if (cmd ==FDDEFPRM ) {/* save settings as permanent default type */
@@ -1691,7 +1695,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,return -EINVAL ;UDT = dtp; -set_capacity (floppy->disk,UDT ->blocks); +set_capacity (disk,UDT ->blocks);return 0 ;case FDMSGON :
@@ -1714,7 +1718,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,UDT =NULL ;/* MSch: invalidate default_params */ default_params[drive].blocks =0 ; -set_capacity (floppy->disk,MAX_DISK_SIZE *2 ); +set_capacity (disk,MAX_DISK_SIZE *2 ); fallthrough;case FDFMTEND :case FDFLUSH :
@@ -1950,14 +1954,50 @@ static const struct blk_mq_ops ataflop_mq_ops = { .queue_rq = ataflop_queue_rq, }; -static struct kobject *floppy_find (dev_t dev,int *part,void *data) +static int ataflop_alloc_disk (unsigned int drive,unsigned int type) { -int drive = *part &3 ; -int type = *part >>2 ; +struct gendisk *disk; +int ret; + + disk =alloc_disk (1 ); +if (!disk) +return -ENOMEM ; + + disk->queue =blk_mq_init_queue (&unit[drive].tag_set); +if (IS_ERR (disk->queue)) { + ret =PTR_ERR (disk->queue); + disk->queue =NULL ; +put_disk (disk); +return ret; + } + + disk->major =FLOPPY_MAJOR ; + disk->first_minor = drive + (type <<2 ); +sprintf (disk->disk_name,"fd%d" , drive); + disk->fops = &floppy_fops; + disk->events =DISK_EVENT_MEDIA_CHANGE ; + disk->private_data = &unit[drive]; +set_capacity (disk,MAX_DISK_SIZE *2 ); + + unit[drive].disk[type] = disk; +return 0 ; +} + +static DEFINE_MUTEX (ataflop_probe_lock); + +static void ataflop_probe (dev_t dev) +{ +int drive =MINOR (dev) &3 ; +int type =MINOR (dev) >>2 ; +if (drive >=FD_MAX_UNITS || type >NUM_DISK_MINORS ) -return NULL ; - *part =0 ; -return get_disk_and_module (unit[drive].disk); +return ; +mutex_lock (&ataflop_probe_lock); +if (!unit[drive].disk[type]) { +if (ataflop_alloc_disk (drive, type) ==0 ) +add_disk (unit[drive].disk[type]); + } +mutex_unlock (&ataflop_probe_lock); }static int __init atari_floppy_init (void )
@@ -1969,23 +2009,26 @@ static int __init atari_floppy_init (void)/* Amiga, Mac, ... don't have Atari-compatible floppy :-) */ return -ENODEV ; -if (register_blkdev (FLOPPY_MAJOR ,"fd" )) -return -EBUSY ; +mutex_lock (&ataflop_probe_lock); + ret =__register_blkdev (FLOPPY_MAJOR ,"fd" , ataflop_probe); +if (ret) + goto out_unlock;for (i =0 ; i <FD_MAX_UNITS ; i++) { - unit[i].disk =alloc_disk (1 ); -if (!unit[i].disk) { - ret = -ENOMEM ; +memset (&unit[i].tag_set,0 ,sizeof (unit[i].tag_set)); + unit[i].tag_set.ops = &ataflop_mq_ops; + unit[i].tag_set.nr_hw_queues =1 ; + unit[i].tag_set.nr_maps =1 ; + unit[i].tag_set.queue_depth =2 ; + unit[i].tag_set.numa_node =NUMA_NO_NODE ; + unit[i].tag_set.flags =BLK_MQ_F_SHOULD_MERGE ; + ret =blk_mq_alloc_tag_set (&unit[i].tag_set); +if (ret) goto err; - } - unit[i].disk->queue =blk_mq_init_sq_queue (&unit[i].tag_set, - &ataflop_mq_ops,2 , -BLK_MQ_F_SHOULD_MERGE ); -if (IS_ERR (unit[i].disk->queue)) { -put_disk (unit[i].disk); - ret =PTR_ERR (unit[i].disk->queue); - unit[i].disk->queue =NULL ; + ret =ataflop_alloc_disk (i,0 ); +if (ret) { +blk_mq_free_tag_set (&unit[i].tag_set); goto err; } }
@@ -2015,19 +2058,9 @@ static int __init atari_floppy_init (void)for (i =0 ; i <FD_MAX_UNITS ; i++) { unit[i].track =-1 ; unit[i].flags =0 ; - unit[i].disk->major =FLOPPY_MAJOR ; - unit[i].disk->first_minor = i; -sprintf (unit[i].disk->disk_name,"fd%d" , i); - unit[i].disk->fops = &floppy_fops; - unit[i].disk->events =DISK_EVENT_MEDIA_CHANGE ; - unit[i].disk->private_data = &unit[i]; -set_capacity (unit[i].disk,MAX_DISK_SIZE *2 ); -add_disk (unit[i].disk); +add_disk (unit[i].disk[0 ]); } -blk_register_region (MKDEV (FLOPPY_MAJOR ,0 ),256 ,THIS_MODULE , - floppy_find,NULL ,NULL ); -printk (KERN_INFO "Atari floppy driver: max. %cD, %strack buffering\n" , DriveType ==0 ?'D' : DriveType ==1 ?'H' :'E' , UseTrackbuffer ?"" :"no " );
@@ -2037,14 +2070,14 @@ static int __init atari_floppy_init (void) err:while (--i >=0 ) { -struct gendisk *disk = unit[i].disk; - -blk_cleanup_queue (disk->queue); +blk_cleanup_queue (unit[i].disk[0 ]->queue); +put_disk (unit[i].disk[0 ]);blk_mq_free_tag_set (&unit[i].tag_set); -put_disk (unit[i].disk); }unregister_blkdev (FLOPPY_MAJOR ,"fd" ); +out_unlock: +mutex_unlock (&ataflop_probe_lock);return ret; }
@@ -2089,13 +2122,17 @@ __setup("floppy=", atari_floppy_setup); static void __exit atari_floppy_exit(void) { -int i; -blk_unregister_region (MKDEV (FLOPPY_MAJOR ,0 ),256 ); +int i, type; +for (i =0 ; i <FD_MAX_UNITS ; i++) { -del_gendisk (unit[i].disk); -blk_cleanup_queue (unit[i].disk->queue); +for (type =0 ; type <NUM_DISK_MINORS ; type++) { +if (!unit[i].disk[type]) +continue ; +del_gendisk (unit[i].disk[type]); +blk_cleanup_queue (unit[i].disk[type]->queue); +put_disk (unit[i].disk[type]); + }blk_mq_free_tag_set (&unit[i].tag_set); -put_disk (unit[i].disk); }unregister_blkdev (FLOPPY_MAJOR ,"fd" );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 359/575 ataflop: potential out of bounds in do_format()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 1ffec389a6431782a8a28805830b6fae9bf00af1 ]
The function uses "type" as an array index:
q = unit[drive].disk[type]->queue;
Unfortunately the bounds check on "type" isn't done until later in the function. Fix this by moving the bounds check to the start.
--- drivers/block/ataflop.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/block/ataflop.c +5 -6
@@ -726,8 +726,12 @@ static int do_format(int drive, int type, struct atari_format_descr *desc)unsigned long flags;int ret; -if (type) +if (type) { type--; +if (type >=NUM_DISK_MINORS || + minor2disktype[type].drive_types > DriveType) +return -EINVAL ; + } q = unit[drive].disk[type]->queue;blk_mq_freeze_queue (q);
@@ -739,11 +743,6 @@ static int do_format(int drive, int type, struct atari_format_descr *desc)local_irq_restore (flags);if (type) { -if (type >=NUM_DISK_MINORS || - minor2disktype[type].drive_types > DriveType) { - ret = -EINVAL ; - goto out; - } type = minor2disktype[type].index;UDT = &atari_disk_type[type]; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 360/575 block: ataflop: more blk-mq refactoring fixes
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
[ Upstream commit d28e4dff085c5a87025c9a0a85fb798bd8e9ca17 ]
As it turns out, my earlier patch in commit 86d46fdaa12a (block:
ataflop: fix breakage introduced at blk-mq refactoring) was incomplete. This patch fixes any remaining issues found during more testing and code review.
Requests exceeding 4 k are handled in 4k segments but __blk_mq_end_request() is never called on these (still sectors outstanding on the request). With redo_fd_request() removed, there is no provision to kick off processing of the next segment, causing requests exceeding 4k to hang. (By setting /sys/block/fd0/queue/max_sectors_k <= 4 as workaround, this behaviour can be avoided).
Instead of reintroducing redo_fd_request(), requeue the remainder of the request by calling blk_mq_requeue_request() on incomplete requests (i.e. when blk_update_request() still returns true), and rely on the block layer to queue the residual as new request.
Both error handling and formatting needs to release the ST-DMA lock, so call finish_fdc() on these (this was previously handled by redo_fd_request()). finish_fdc() may be called legitimately without the ST-DMA lock held - make sure we only release the lock if we actually held it. In a similar way, early exit due to errors in ataflop_queue_rq() must release the lock.
After minor errors, fd_error sets up to recalibrate the drive but never re-runs the current operation (another task handled by redo_fd_request() before). Call do_fd_action() to get the next steps (seek, retry read/write) underway.
--- drivers/block/ataflop.c | 45 +++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-)
drivers/block/ataflop.c +39 -6
@@ -456,10 +456,20 @@ static DEFINE_TIMER(fd_timer, check_change);static void fd_end_request_cur (blk_status_t err) { +DPRINT (("fd_end_request_cur(), bytes %d of %d\n" , +blk_rq_cur_bytes (fd_request), +blk_rq_bytes (fd_request))); +if (!blk_update_request (fd_request, err,blk_rq_cur_bytes (fd_request))) { +DPRINT (("calling __blk_mq_end_request()\n" ));__blk_mq_end_request (fd_request, err); fd_request =NULL ; + }else { +/* requeue rest of request */ +DPRINT (("calling blk_mq_requeue_request()\n" )); +blk_mq_requeue_request (fd_request, true); + fd_request =NULL ; } }
@@ -697,12 +707,21 @@ static void fd_error( void )if (fd_request->error_count >=MAX_ERRORS ) {printk (KERN_ERR "fd%d: too many errors.\n" , SelectedDrive );fd_end_request_cur (BLK_STS_IOERR ); +finish_fdc (); +return ; }else if (fd_request->error_count ==RECALIBRATE_ERRORS ) {printk (KERN_WARNING "fd%d: recalibrating\n" , SelectedDrive );if (SelectedDrive !=-1 )SUD .track =-1 ; } +/* need to re-run request to recalibrate */ +atari_disable_irq (IRQ_MFP_FDC ); + +setup_req_params ( SelectedDrive ); +do_fd_action ( SelectedDrive ); + +atari_enable_irq (IRQ_MFP_FDC ); }
@@ -729,8 +748,10 @@ static int do_format(int drive, int type, struct atari_format_descr *desc)if (type) { type--;if (type >=NUM_DISK_MINORS || - minor2disktype[type].drive_types > DriveType) + minor2disktype[type].drive_types > DriveType) { +finish_fdc ();return -EINVAL ; + } } q = unit[drive].disk[type]->queue;
@@ -748,6 +769,7 @@ static int do_format(int drive, int type, struct atari_format_descr *desc) }if (!UDT || desc->track >=UDT ->blocks/UDT ->spt/2 || desc->head >=2 ) { +finish_fdc (); ret = -EINVAL ; goto out; }
@@ -788,6 +810,7 @@ static int do_format(int drive, int type, struct atari_format_descr *desc)wait_for_completion (&format_wait); +finish_fdc (); ret = FormatError ? -EIO :0 ; out:blk_mq_unquiesce_queue (q);
@@ -822,6 +845,7 @@ static void do_fd_action( int drive )else {/* all sectors finished */ fd_end_request_cur (BLK_STS_OK ); +finish_fdc ();return ; } }
@@ -1225,8 +1249,8 @@ static void fd_rwsec_done1(int status) }else {/* all sectors finished */ -finish_fdc ();fd_end_request_cur (BLK_STS_OK ); +finish_fdc (); }return ;
@@ -1348,7 +1372,7 @@ static void fd_times_out(struct timer_list *unused)static void finish_fdc (void ) { -if (!NeedSeek) { +if (!NeedSeek || !stdma_is_locked_by (floppy_irq)) {finish_fdc_done (0 ); }else {
@@ -1383,7 +1407,8 @@ static void finish_fdc_done( int dummy )start_motor_off_timer ();local_irq_save (flags); -stdma_release (); +if (stdma_is_locked_by (floppy_irq)) +stdma_release ();local_irq_restore (flags);DPRINT (("finish_fdc() finished\n" ));
@@ -1480,7 +1505,9 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,int drive = floppy - unit;int type = floppy->type; -DPRINT (("Queue request: drive %d type %d last %d\n" , drive, type, bd->last)); +DPRINT (("Queue request: drive %d type %d sectors %d of %d last %d\n" , + drive, type,blk_rq_cur_sectors (bd->rq), +blk_rq_sectors (bd->rq), bd->last));spin_lock_irq (&ataflop_lock);if (fd_request) {
@@ -1502,6 +1529,7 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,/* drive not connected */ printk (KERN_ERR "Unknown Device: fd%d\n" , drive );fd_end_request_cur (BLK_STS_IOERR ); +stdma_release (); goto out; }
@@ -1518,11 +1546,13 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,if (--type >=NUM_DISK_MINORS ) {printk (KERN_WARNING "fd%d: invalid disk format" , drive );fd_end_request_cur (BLK_STS_IOERR ); +stdma_release (); goto out; }if (minor2disktype[type].drive_types > DriveType) {printk (KERN_WARNING "fd%d: unsupported disk format" , drive );fd_end_request_cur (BLK_STS_IOERR ); +stdma_release (); goto out; } type = minor2disktype[type].index;
@@ -1623,6 +1653,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,/* what if type > 0 here? Overwrite specified entry ? */ if (type) {/* refuse to re-set a predefined type for now */ +finish_fdc ();return -EINVAL ; }
@@ -1690,8 +1721,10 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,/* sanity check */ if (setprm.track != dtp->blocks/dtp->spt/2 || - setprm.head !=2 ) + setprm.head !=2 ) { +finish_fdc ();return -EINVAL ; + }UDT = dtp;set_capacity (disk,UDT ->blocks);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 361/575 tpm: fix Atmel TPM crash caused by too frequent queries
In reply to Greg Kroah-HartmanFrom: Hao Wu <[email protected]>
[ Upstream commit 79ca6f74dae067681a779fd573c2eb59649989bc ]
The Atmel TPM 1.2 chips crash with error tpm_try_transmit: send(): error -62 since kernel 4.14. It is observed from the kernel log after running tpm_sealdata -z. The error thrown from the command is as follows
``` $ tpm_sealdata -z Tspi_Key_LoadKey failed: 0x00001087 - layer=tddl, code=0087 (135), I/O error ```
The issue was reproduced with the following Atmel TPM chip:
``` $ tpm_version T0 TPM 1.2 Version Info: Chip Version: 1.2.66.1 Spec Level: 2 Errata Revision: 3 TPM Vendor ID: ATML TPM Version: 01010000 Manufacturer Info: 41544d4c ```
The root cause of the issue is due to the TPM calls to msleep() were replaced with usleep_range() [1], which reduces the actual timeout. Via experiments, it is observed that the original msleep(5) actually sleeps for 15ms. Because of a known timeout issue in Atmel TPM 1.2 chip, the shorter timeout than 15ms can cause the error described above.
A few further changes in kernel 4.16 [2] and 4.18 [3, 4] further reduced the timeout to less than 1ms. With experiments, the problematic timeout in the latest kernel is the one for wait_for_tpm_stat.
To fix it, the patch reverts the timeout of wait_for_tpm_stat to 15ms for all Atmel TPM 1.2 chips, but leave it untouched for Ateml TPM 2.0 chip, and chips from other vendors.
As explained above, the chosen 15ms timeout is
the actual timeout before this issue introduced,
thus the old value is used here.
Particularly, TPM_ATML_TIMEOUT_WAIT_STAT_MIN is set to 14700us, TPM_ATML_TIMEOUT_WAIT_STAT_MIN is set to 15000us according to the existing TPM_TIMEOUT_RANGE_US (300us).
The fixed has been tested in the system with the affected Atmel chip with no issues observed after boot up.
[1] 9f3fc7bcddcb tpm: replace msleep() with usleep_range() in TPM 1.2/2.0 generic drivers
[2] cf151a9a44d5 tpm: reduce tpm polling delay in tpm_tis_core
[3] 59f5a6b07f64 tpm: reduce poll sleep time in tpm_transmit()
[4] 424eaf910c32 tpm: reduce polling time to usecs for even finer granularity
--- drivers/char/tpm/tpm_tis_core.c | 26 ++++++++++++++++++-------- drivers/char/tpm/tpm_tis_core.h | 4 ++++ include/linux/tpm.h | 1 + 3 files changed, 23 insertions(+), 8 deletions(-)
drivers/char/tpm/tpm_tis_core.c +18 -8
@@ -48,6 +48,7 @@ static int wait_for_tpm_stat(struct tpm_chip *chip, u8 mask, unsigned long timeout, wait_queue_head_t *queue, bool check_cancel) { + struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);unsigned long stop;long rc;u8 status;
@@ -80,8 +81,8 @@ again: } }else { do { - usleep_range(TPM_TIMEOUT_USECS_MIN, - TPM_TIMEOUT_USECS_MAX); + usleep_range(priv->timeout_min, + priv->timeout_max); status = chip->ops->status(chip); if ((status & mask) == mask) return 0;
@@ -945,7 +946,22 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, chip->timeout_b =msecs_to_jiffies (TIS_TIMEOUT_B_MAX ); chip->timeout_c =msecs_to_jiffies (TIS_TIMEOUT_C_MAX ); chip->timeout_d =msecs_to_jiffies (TIS_TIMEOUT_D_MAX ); + priv->timeout_min =TPM_TIMEOUT_USECS_MIN ; + priv->timeout_max =TPM_TIMEOUT_USECS_MAX ; priv->phy_ops = phy_ops; + + rc =tpm_tis_read32 (priv,TPM_DID_VID (0 ), &vendor); +if (rc <0 ) + goto out_err; + + priv->manufacturer_id = vendor; + +if (priv->manufacturer_id ==TPM_VID_ATML && + !(chip->flags &TPM_CHIP_FLAG_TPM2 )) { + priv->timeout_min =TIS_TIMEOUT_MIN_ATML ; + priv->timeout_max =TIS_TIMEOUT_MAX_ATML ; + } +dev_set_drvdata (&chip->dev, priv);if (is_bsw ()) {
@@ -988,12 +1004,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,if (rc) goto out_err; - rc =tpm_tis_read32 (priv,TPM_DID_VID (0 ), &vendor); -if (rc <0 ) - goto out_err; - - priv->manufacturer_id = vendor; - rc =tpm_tis_read8 (priv,TPM_RID (0 ), &rid);if (rc <0 ) goto out_err;
drivers/char/tpm/tpm_tis_core.h +4 -0
@@ -54,6 +54,8 @@ enum tis_defaults {TIS_MEM_LEN =0x5000 ,TIS_SHORT_TIMEOUT =750 ,/* ms */ TIS_LONG_TIMEOUT =2000 ,/* 2 sec */ +TIS_TIMEOUT_MIN_ATML =14700 ,/* usecs */ + TIS_TIMEOUT_MAX_ATML = 15000, /* usecs */ };/* Some timeout values are needed before it is known whether the chip is
@@ -98,6 +100,8 @@ struct tpm_tis_data {wait_queue_head_t read_queue;const struct tpm_tis_phy_ops *phy_ops;unsigned short rng_quality; +unsigned int timeout_min;/* usecs */ +unsigned int timeout_max;/* usecs */ };struct tpm_tis_phy_ops {
include/linux/tpm.h +1 -0
@@ -262,6 +262,7 @@ enum tpm2_cc_attrs {#define TPM_VID_INTEL 0x8086#define TPM_VID_WINBOND 0x1050#define TPM_VID_STM 0x104A +#define TPM_VID_ATML 0x1114enum tpm_chip_flags {TPM_CHIP_FLAG_TPM2 =BIT (1 ),
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 362/575 tpm_tis_spi: Add missing SPI ID
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit 7eba41fe8c7bb01ff3d4b757bd622375792bc720 ]
In commit c46ed2281bbe ("tpm_tis_spi: add missing SPI device ID entries") we added SPI IDs for all the DT aliases to handle the fact that we always use SPI modaliases to load modules even when probed via DT however the mentioned commit missed that the SPI and OF device ID entries did not match and were different and so DT nodes with compatible "tcg,tpm_tis-spi" will not match. Add an extra ID for tpm_tis-spi rather than just fix the existing one since what's currently there is going to be better for anyone actually using SPI IDs to instantiate.
--- drivers/char/tpm/tpm_tis_spi_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/char/tpm/tpm_tis_spi_main.c +1 -0
@@ -263,6 +263,7 @@ static const struct spi_device_id tpm_tis_spi_id[] = { { "st33htpm-spi", (unsigned long)tpm_tis_spi_probe }, { "slb9670", (unsigned long)tpm_tis_spi_probe }, { "tpm_tis_spi", (unsigned long)tpm_tis_spi_probe }, + { "tpm_tis-spi", (unsigned long)tpm_tis_spi_probe }, { "cr50", (unsigned long)cr50_spi_probe }, {} };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 363/575 libbpf: Fix endianness detection in BPF_CORE_READ_BITFIELD_PROBED()
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 45f2bebc8079788f62f22d9e8b2819afb1789d7b ]
__BYTE_ORDER is supposed to be defined by a libc, and __BYTE_ORDER__ - by a compiler. bpf_core_read.h checks __BYTE_ORDER == __LITTLE_ENDIAN, which is true if neither are defined, leading to incorrect behavior on big-endian hosts if libc headers are not included, which is often the case.
--- tools/lib/bpf/bpf_core_read.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/bpf_core_read.h +1 -1
@@ -40,7 +40,7 @@ enum bpf_enum_value_kind {#define __CORE_RELO (src, field, info) \ __builtin_preserve_field_info((src)->field, BPF_FIELD_##info) -#if __BYTE_ORDER == __LITTLE_ENDIAN +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__#define __CORE_BITFIELD_PROBE_READ (dst, src, fld) \ bpf_probe_read_kernel( \ (void *)dst, \
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 364/575 tcp: dont free a FIN sk_buff in tcp_remove_empty_skb()
In reply to Greg Kroah-HartmanFrom: Jon Maxwell <[email protected]>
[ Upstream commit cf12e6f9124629b18a6182deefc0315f0a73a199 ]
v1: Implement a more general statement as recommended by Eric Dumazet. The sequence number will be advanced, so this check will fix the FIN case and other cases.
A customer reported sockets stuck in the CLOSING state. A Vmcore revealed that the write_queue was not empty as determined by tcp_write_queue_empty() but the sk_buff containing the FIN flag had been freed and the socket was zombied in that state. Corresponding pcaps show no FIN from the Linux kernel on the wire.
Some instrumentation was added to the kernel and it was found that there is a timing window where tcp_sendmsg() can run after tcp_send_fin().
tcp_sendmsg() will hit an error, for example:
1269 ▹ if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))↩
1270 ▹ ▹ goto do_error;↩
tcp_remove_empty_skb() will then free the FIN sk_buff as "skb->len == 0". The TCP socket is now wedged in the FIN-WAIT-1 state because the FIN is never sent.
If the other side sends a FIN packet the socket will transition to CLOSING and remain that way until the system is rebooted.
Fix this by checking for the FIN flag in the sk_buff and don't free it if that is the case. Testing confirmed that fixed the issue.
--- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp.c +1 -1
@@ -956,7 +956,7 @@ int tcp_send_mss(struct sock *sk, int *size_goal, int flags)*/ static void tcp_remove_empty_skb (struct sock *sk,struct sk_buff *skb) { -if (skb && !skb->len) { +if (skb &&TCP_SKB_CB (skb)->seq ==TCP_SKB_CB (skb)->end_seq) {tcp_unlink_write_queue (skb, sk);if (tcp_write_queue_empty (sk))tcp_chrono_stop (sk,TCP_CHRONO_BUSY );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 365/575 spi: spi-rpc-if: Check return value of rpcif_sw_init()
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 0b0a281ed7001d4c4f4c47bdc84680c4997761ca ]
rpcif_sw_init() can fail so make sure we check the return value of it and on error exit rpcif_spi_probe() callback with error code.
--- drivers/spi/spi-rpc-if.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-rpc-if.c +3 -1
@@ -139,7 +139,9 @@ static int rpcif_spi_probe(struct platform_device *pdev)return -ENOMEM ; rpc =spi_controller_get_devdata (ctlr); -rpcif_sw_init (rpc, parent); + error =rpcif_sw_init (rpc, parent); +if (error) +return error;platform_set_drvdata (pdev, ctlr);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 366/575 samples/kretprobes: Fix return value if register_kretprobe() failed
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit f76fbbbb5061fe14824ba5807c44bd7400a6b4e1 ]
Use the actual return value instead of always -1 if register_kretprobe() failed.
E.g. without this patch:
# insmod samples/kprobes/kretprobe_example.ko func=no_such_func insmod: ERROR: could not insert module samples/kprobes/kretprobe_example.ko: Operation not permitted
With this patch:
# insmod samples/kprobes/kretprobe_example.ko func=no_such_func insmod: ERROR: could not insert module samples/kprobes/kretprobe_example.ko: Unknown symbol in module
--- samples/kprobes/kretprobe_example.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/kprobes/kretprobe_example.c +1 -1
@@ -86,7 +86,7 @@ static int __init kretprobe_init(void) ret =register_kretprobe (&my_kretprobe);if (ret <0 ) {pr_err ("register_kretprobe failed, returned %d\n" , ret); -return -1 ; +return ret; }pr_info ("Planted return probe at %s: %p\n" , my_kretprobe.kp.symbol_name, my_kretprobe.kp.addr);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 367/575 KVM: s390: Fix handle_sske page fault handling
In reply to Greg Kroah-HartmanFrom: Janis Schoetterl-Glausch <[email protected]>
[ Upstream commit 85f517b29418158d3e6e90c3f0fc01b306d2f1a1 ]
If handle_sske cannot set the storage key, because there is no page table entry or no present large page entry, it calls fixup_user_fault.
However, currently, if the call succeeds, handle_sske returns -EAGAIN, without having set the storage key.
Instead, retry by continue'ing the loop without incrementing the address.
The same issue in handle_pfmf was fixed bya11bdb1a6b78 ("KVM: s390: Fix pfmf and conditional skey emulation").
--- arch/s390/kvm/priv.c | 2 ++ 1 file changed, 2 insertions(+)
arch/s390/kvm/priv.c +2 -0
@@ -397,6 +397,8 @@ static int handle_sske(struct kvm_vcpu *vcpu)mmap_read_unlock (current->mm);if (rc == -EFAULT )return kvm_s390_inject_program_int (vcpu,PGM_ADDRESSING ); +if (rc == -EAGAIN ) +continue ;if (rc <0 )return rc; start +=PAGE_SIZE ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 368/575 libertas_tf: Fix possible memory leak in probe and disconnect
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit d549107305b4634c81223a853701c06bcf657bc3 ]
I got memory leak as follows when doing fault injection test:
unreferenced object 0xffff88810a2ddc00 (size 512):
comm "kworker/6:1", pid 176, jiffies 4295009893 (age 757.220s) hex dump (first 32 bytes):
00 50 05 18 81 88 ff ff 00 00 00 00 00 00 00 00 .P..............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8167939c>] slab_post_alloc_hook+0x9c/0x490
[<ffffffff8167f627>] kmem_cache_alloc_trace+0x1f7/0x470
[<ffffffffa02a1530>] if_usb_probe+0x60/0x37c [libertas_tf_usb]
[<ffffffffa022668a>] usb_probe_interface+0x1aa/0x3c0 [usbcore]
[<ffffffff82b59630>] really_probe+0x190/0x480
[<ffffffff82b59a19>] __driver_probe_device+0xf9/0x180
[<ffffffff82b59af3>] driver_probe_device+0x53/0x130
[<ffffffff82b5a075>] __device_attach_driver+0x105/0x130
[<ffffffff82b55949>] bus_for_each_drv+0x129/0x190
[<ffffffff82b593c9>] __device_attach+0x1c9/0x270
[<ffffffff82b5a250>] device_initial_probe+0x20/0x30
[<ffffffff82b579c2>] bus_probe_device+0x142/0x160
[<ffffffff82b52e49>] device_add+0x829/0x1300
[<ffffffffa02229b1>] usb_set_configuration+0xb01/0xcc0 [usbcore]
[<ffffffffa0235c4e>] usb_generic_driver_probe+0x6e/0x90 [usbcore]
[<ffffffffa022641f>] usb_probe_device+0x6f/0x130 [usbcore]cardp is missing being freed in the error handling path of the probe and the path of the disconnect, which will cause memory leak.
This patch adds the missing kfree().
--- drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/marvell/libertas_tf/if_usb.c +2 -0
@@ -230,6 +230,7 @@ static int if_usb_probe(struct usb_interface *intf, dealloc:if_usb_free (cardp); +kfree (cardp); error:lbtf_deb_leave (LBTF_DEB_MAIN );return -ENOMEM ;
@@ -254,6 +255,7 @@ static void if_usb_disconnect(struct usb_interface *intf)/* Unlink and free urb */ if_usb_free (cardp); +kfree (cardp);usb_set_intfdata (intf,NULL );usb_put_dev (interface_to_usbdev (intf));
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 369/575 libertas: Fix possible memory leak in probe and disconnect
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 9692151e2fe7a326bafe99836fd1f20a2cc3a049 ]
I got memory leak as follows when doing fault injection test:
unreferenced object 0xffff88812c7d7400 (size 512):
comm "kworker/6:1", pid 176, jiffies 4295003332 (age 822.830s) hex dump (first 32 bytes):
00 68 1e 04 81 88 ff ff 01 00 00 00 00 00 00 00 .h..............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8167939c>] slab_post_alloc_hook+0x9c/0x490
[<ffffffff8167f627>] kmem_cache_alloc_trace+0x1f7/0x470
[<ffffffffa02c9873>] if_usb_probe+0x63/0x446 [usb8xxx]
[<ffffffffa022668a>] usb_probe_interface+0x1aa/0x3c0 [usbcore]
[<ffffffff82b59630>] really_probe+0x190/0x480
[<ffffffff82b59a19>] __driver_probe_device+0xf9/0x180
[<ffffffff82b59af3>] driver_probe_device+0x53/0x130
[<ffffffff82b5a075>] __device_attach_driver+0x105/0x130
[<ffffffff82b55949>] bus_for_each_drv+0x129/0x190
[<ffffffff82b593c9>] __device_attach+0x1c9/0x270
[<ffffffff82b5a250>] device_initial_probe+0x20/0x30
[<ffffffff82b579c2>] bus_probe_device+0x142/0x160
[<ffffffff82b52e49>] device_add+0x829/0x1300
[<ffffffffa02229b1>] usb_set_configuration+0xb01/0xcc0 [usbcore]
[<ffffffffa0235c4e>] usb_generic_driver_probe+0x6e/0x90 [usbcore]
[<ffffffffa022641f>] usb_probe_device+0x6f/0x130 [usbcore]cardp is missing being freed in the error handling path of the probe and the path of the disconnect, which will cause memory leak.
This patch adds the missing kfree().
--- drivers/net/wireless/marvell/libertas/if_usb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/marvell/libertas/if_usb.c +2 -0
@@ -292,6 +292,7 @@ err_add_card:if_usb_reset_device (cardp); dealloc:if_usb_free (cardp); +kfree (cardp); error:return r;
@@ -316,6 +317,7 @@ static void if_usb_disconnect(struct usb_interface *intf)/* Unlink and free urb */ if_usb_free (cardp); +kfree (cardp);usb_set_intfdata (intf,NULL );usb_put_dev (interface_to_usbdev (intf));
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 370/575 wcn36xx: add proper DMA memory barriers in rx path
In reply to Greg Kroah-HartmanFrom: Benjamin Li <[email protected]>
[ Upstream commit 9bfe38e064af5decba2ffce66a2958ab8b10eaa4 ]
This is essentially exactly following the dma_wmb()/dma_rmb() usage instructions in Documentation/memory-barriers.txt.
The theoretical races here are:
1. DXE (the DMA Transfer Engine in the Wi-Fi subsystem) seeing the dxe->ctrl & WCN36xx_DXE_CTRL_VLD write before the dxe->dst_addr_l write, thus performing DMA into the wrong address.
2. CPU reading dxe->dst_addr_l before DXE unsets dxe->ctrl & WCN36xx_DXE_CTRL_VLD. This should generally be harmless since DXE doesn't write dxe->dst_addr_l (no risk of freeing the wrong skb).
--- drivers/net/wireless/ath/wcn36xx/dxe.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wcn36xx/dxe.c +11 -1
@@ -606,6 +606,10 @@ static int wcn36xx_rx_handle_packets(struct wcn36xx *wcn, dxe = ctl->desc;while (!(READ_ONCE (dxe->ctrl) & WCN36xx_DXE_CTRL_VLD)) { +/* do not read until we own DMA descriptor */ +dma_rmb (); + +/* read/modify DMA descriptor */ skb = ctl->skb; dma_addr = dxe->dst_addr_l; ret =wcn36xx_dxe_fill_skb (wcn->dev, ctl,GFP_ATOMIC );
@@ -616,9 +620,15 @@ static int wcn36xx_rx_handle_packets(struct wcn36xx *wcn,dma_unmap_single (wcn->dev, dma_addr,WCN36XX_PKT_SIZE ,DMA_FROM_DEVICE );wcn36xx_rx_skb (wcn, skb); - }/* else keep old skb not submitted and use it for rx DMA */ + } +/* else keep old skb not submitted and reuse it for rx DMA +* (dropping the packet that it contained) +*/ +/* flush descriptor changes before re-marking as valid */ +dma_wmb (); dxe->ctrl = ctrl; + ctl = ctl->next; dxe = ctl->desc; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 371/575 wcn36xx: Fix discarded frames due to wrong sequence number
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
[ Upstream commit 113f304dbc1627c6ec9d5329d839964095768980 ]
The firmware is offering features such as ARP offload, for which firmware crafts its own (QoS)packets without waking up the host. Point is that the sequence numbers generated by the firmware are not in sync with the host mac80211 layer and can cause packets such as firmware ARP reponses to be dropped by the AP (too old SN).
To fix this we need to let the firmware manages the sequence numbers by its own (except for QoS null frames). There is a SN counter for each QoS queue and one global/baseline counter for Non-QoS.
--- drivers/net/wireless/ath/wcn36xx/txrx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/wcn36xx/txrx.c +7 -2
@@ -344,8 +344,6 @@ static void wcn36xx_set_tx_pdu(struct wcn36xx_tx_bd *bd, bd->pdu.mpdu_header_off; bd->pdu.mpdu_len = len; bd->pdu.tid = tid; -/* Use seq number generated by mac80211 */ - bd->pdu.bd_ssn =WCN36XX_TXBD_SSN_FILL_HOST ; } static inline struct wcn36xx_vif *get_vif_by_addr(struct wcn36xx *wcn,
@@ -442,6 +440,9 @@ static void wcn36xx_set_tx_data(struct wcn36xx_tx_bd *bd, tid =ieee80211_get_tid (hdr);/* TID->QID is one-to-one mapping */ bd->queue_id = tid; + bd->pdu.bd_ssn =WCN36XX_TXBD_SSN_FILL_DPU_QOS ; + }else { + bd->pdu.bd_ssn =WCN36XX_TXBD_SSN_FILL_DPU_NON_QOS ; } if (info->flags & IEEE80211_TX_INTFL_DONT_ENCRYPT ||
@@ -453,6 +454,8 @@ static void wcn36xx_set_tx_data(struct wcn36xx_tx_bd *bd,/* Don't use a regular queue for null packet (no ampdu) */ bd->queue_id =WCN36XX_TX_U_WQ_ID ; bd->bd_rate =WCN36XX_BD_RATE_CTRL ; +if (ieee80211_is_qos_nullfunc (hdr->frame_control)) + bd->pdu.bd_ssn =WCN36XX_TXBD_SSN_FILL_HOST ; }if (bcast) {
@@ -512,6 +515,8 @@ static void wcn36xx_set_tx_mgmt(struct wcn36xx_tx_bd *bd, bd->queue_id =WCN36XX_TX_U_WQ_ID ; *vif_priv = __vif_priv; + bd->pdu.bd_ssn =WCN36XX_TXBD_SSN_FILL_DPU_NON_QOS ; + wcn36xx_set_tx_pdu(bd, ieee80211_is_data_qos(hdr->frame_control) ? sizeof(struct ieee80211_qos_hdr) :
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 372/575 drm/amdgpu/gmc6: fix DMA mask from 44 to 40 bits
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 403475be6d8b122c3e6b8a47e075926d7299e5ef ]
The DMA mask on SI parts is 40 bits not 44. Copy paste typo.
--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2 -2
@@ -842,12 +842,12 @@ static int gmc_v6_0_sw_init(void *handle) adev->gmc.mc_mask =0xffffffffffULL ; - r =dma_set_mask_and_coherent (adev->dev,DMA_BIT_MASK (44 )); + r =dma_set_mask_and_coherent (adev->dev,DMA_BIT_MASK (40 ));if (r) {dev_warn (adev->dev,"No suitable DMA available.\n" );return r; } - adev->need_swiotlb =drm_need_swiotlb (44 ); + adev->need_swiotlb =drm_need_swiotlb (40 ); r =gmc_v6_0_init_microcode (adev);if (r) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 373/575 selftests: bpf: Convert sk_lookup ctx access tests to PROG_TEST_RUN
In reply to Greg Kroah-HartmanFrom: Lorenz Bauer <[email protected]>
[ Upstream commit 509b2937bce90089fd2785db9f27951a3d850c34 ]
Convert the selftests for sk_lookup narrow context access to use PROG_TEST_RUN instead of creating actual sockets. This ensures that ctx is populated correctly when using PROG_TEST_RUN.
Assert concrete values since we now control remote_ip and remote_port.
--- .../selftests/bpf/prog_tests/sk_lookup.c | 83 +++++++++++++++---- .../selftests/bpf/progs/test_sk_lookup.c | 62 +++++++++----- 2 files changed, 109 insertions(+), 36 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +68 -15
@@ -241,6 +241,48 @@ fail:return -1 ; } +static __u64 socket_cookie (int fd) +{ +__u64 cookie; +socklen_t cookie_len =sizeof (cookie); + +if (CHECK (getsockopt (fd,SOL_SOCKET ,SO_COOKIE , &cookie, &cookie_len) <0 , +"getsockopt(SO_COOKIE)" ,"%s\n" ,strerror (errno))) +return 0 ; +return cookie; +} + +static int fill_sk_lookup_ctx (struct bpf_sk_lookup *ctx,const char *local_ip,__u16 local_port, +const char *remote_ip,__u16 remote_port) +{ +void *local, *remote; +int err; + +memset (ctx,0 ,sizeof (*ctx)); + ctx->local_port = local_port; + ctx->remote_port =htons (remote_port); + +if (is_ipv6 (local_ip)) { + ctx->family =AF_INET6 ; + local = &ctx->local_ip6[0 ]; + remote = &ctx->remote_ip6[0 ]; + }else { + ctx->family =AF_INET ; + local = &ctx->local_ip4; + remote = &ctx->remote_ip4; + } + + err =inet_pton (ctx->family, local_ip, local); +if (CHECK (err !=1 ,"inet_pton" ,"local_ip failed\n" )) +return 1 ; + + err =inet_pton (ctx->family, remote_ip, remote); +if (CHECK (err !=1 ,"inet_pton" ,"remote_ip failed\n" )) +return 1 ; + +return 0 ; +} +static int send_byte (int fd) {ssize_t n;
@@ -1009,18 +1051,27 @@ static void test_drop_on_reuseport(struct test_sk_lookup *skel)static void run_sk_assign (struct test_sk_lookup *skel,struct bpf_program *lookup_prog, -const char *listen_ip,const char *connect_ip) +const char *remote_ip,const char *local_ip) { -int client_fd, peer_fd, server_fds[MAX_SERVERS ] = {-1 }; -struct bpf_link *lookup_link; +int server_fds[MAX_SERVERS ] = {-1 }; +struct bpf_sk_lookup ctx; +__u64 server_cookie;int i, err; - lookup_link =attach_lookup_prog (lookup_prog); -if (!lookup_link) +DECLARE_LIBBPF_OPTS (bpf_test_run_opts, opts, + .ctx_in = &ctx, + .ctx_size_in = sizeof(ctx), + .ctx_out = &ctx, + .ctx_size_out = sizeof(ctx), + ); + +if (fill_sk_lookup_ctx (&ctx, local_ip,EXT_PORT , remote_ip,INT_PORT ))return ; + ctx.protocol =IPPROTO_TCP ; +for (i =0 ; i <ARRAY_SIZE (server_fds); i++) { - server_fds[i] =make_server (SOCK_STREAM , listen_ip,0 ,NULL ); + server_fds[i] =make_server (SOCK_STREAM , local_ip,0 ,NULL );if (server_fds[i] <0 ) goto close_servers;
@@ -1030,23 +1081,25 @@ static void run_sk_assign(struct test_sk_lookup *skel, goto close_servers; } - client_fd =make_client (SOCK_STREAM , connect_ip,EXT_PORT ); -if (client_fd <0 ) + server_cookie =socket_cookie (server_fds[SERVER_B ]); +if (!server_cookie) +return ; + + err =bpf_prog_test_run_opts (bpf_program__fd (lookup_prog), &opts); +if (CHECK (err,"test_run" ,"failed with error %d\n" , errno)) + goto close_servers; + +if (CHECK (ctx.cookie ==0 ,"ctx.cookie" ,"no socket selected\n" )) goto close_servers; - peer_fd =accept (server_fds[SERVER_B ],NULL ,NULL ); -if (CHECK (peer_fd <0 ,"accept" ,"failed\n" )) - goto close_client; +CHECK (ctx.cookie != server_cookie,"ctx.cookie" , +"selected sk %llu instead of %llu\n" , ctx.cookie, server_cookie); -close (peer_fd); -close_client: -close (client_fd); close_servers:for (i =0 ; i <ARRAY_SIZE (server_fds); i++) {if (server_fds[i] !=-1 )close (server_fds[i]); } -bpf_link__destroy (lookup_link); } static void run_sk_assign_v4(struct test_sk_lookup *skel,
tools/testing/selftests/bpf/progs/test_sk_lookup.c +41 -21
89 lines not on this page · raw message
Signature · 1 line
2.33.0
Re: [PATCH 5.10 373/575] selftests: bpf: Convert sk_lookup ctx access tests to PROG_TEST_RUN
Hi Greg.
We found a compile error when building tools/testing/selftests/bpf/ on 5.10.
tools/testing/selftests/bpf/prog_tests/sk_lookup.c:1092:15: error: 'struct bpf_sk_lookup' has no member named 'cookie'
1092 | if (CHECK(ctx.cookie == 0, "ctx.cookie", "no socket selected\n"))
It requires 7c32e8f8bc33 ("bpf: Add PROG_TEST_RUN support for sk_lookup programs") from upstream.
Maybe the left patches of this patchset are needed for 5.10 LTS?
https://lore.kernel.org/bpf/[email protected]/
Thanks.
Greg KH
maintainerRe: [PATCH 5.10 373/575] selftests: bpf: Convert sk_lookup ctx access tests to PROG_TEST_RUN
Quoted 11 lines · Tianchen Ding
Hi Greg.
We found a compile error when building
tools/testing/selftests/bpf/on 5.10.
tools/testing/selftests/bpf/prog_tests/sk_lookup.c:1092:15: error: 'structbpf_sk_lookup' has no member named 'cookie'
1092 | if (CHECK(ctx.cookie == 0, "ctx.cookie", "no socket selected\n"))It requires
7c32e8f8bc33("bpf: AddPROG_TEST_RUNsupport forsk_lookupprograms") from upstream.Maybe the left patches of this patchset are needed for 5.10 LTS?
https://lore.kernel.org/bpf/[email protected]/
If so, please submit them with the git commit ids so that I can fix this up.
thanks,
greg k-h
Re: [PATCH 5.10 373/575] selftests: bpf: Convert sk_lookup ctx access tests to PROG_TEST_RUN
Quoted 13 lines · Greg KH
Quoted 11 lines · Tianchen Ding
Hi Greg.
We found a compile error when building
tools/testing/selftests/bpf/on 5.10.
tools/testing/selftests/bpf/prog_tests/sk_lookup.c:1092:15: error: 'structbpf_sk_lookup' has no member named 'cookie'
1092 | if (CHECK(ctx.cookie == 0, "ctx.cookie", "no socket selected\n"))It requires
7c32e8f8bc33("bpf: AddPROG_TEST_RUNsupport forsk_lookupprograms") from upstream.Maybe the left patches of this patchset are needed for 5.10 LTS?
https://lore.kernel.org/bpf/[email protected]/
Quoted 6 lines
If so, please submit them with the git commit ids so that I can fix this up.
thanks,
greg k-h
These 2 commits from upstream are necessary for bpf selftests build pass on 5.10.y:607b9cc92bd7208338d714a22b8082fe83bcb177 bpf: Consolidate shared test timing code 7c32e8f8bc33a5f4b113a630857e46634e3e143b bpf: Add PROG_TEST_RUN support for sk_lookup programs
This commit does not impact building stage, but can avoid a test case failure (by skipping it):b4f894633fa14d7d46ba7676f950b90a401504bb selftests: bpf: Don't run sk_lookup in verifier tests
Thanks.
Re: [PATCH 5.10 373/575] selftests: bpf: Convert sk_lookup ctx access tests to PROG_TEST_RUN
Quoted 21 lines · Tianchen Ding
Quoted 13 lines · Greg KH
Quoted 11 lines · Tianchen Ding
Hi Greg.
We found a compile error when building
tools/testing/selftests/bpf/on 5.10.
tools/testing/selftests/bpf/prog_tests/sk_lookup.c:1092:15: error: 'structbpf_sk_lookup' has no member named 'cookie' 1092 | if (CHECK(ctx.cookie == 0, "ctx.cookie", "no socket selected\n"))It requires
7c32e8f8bc33("bpf: AddPROG_TEST_RUNsupport forsk_lookupprograms") from upstream.Maybe the left patches of this patchset are needed for 5.10 LTS?
https://lore.kernel.org/bpf/[email protected]/Quoted 6 lines
If so, please submit them with the git commit ids so that I can fix this up.
thanks,
greg k-h
Quoted 8 lines
These 2 commits from upstream are necessary for bpf selftests build pass on 5.10.y:
607b9cc92bd7208338d714a22b8082fe83bcb177bpf: Consolidate shared test timing code7c32e8f8bc33a5f4b113a630857e46634e3e143bbpf: AddPROG_TEST_RUNsupport forsk_lookupprogramsThis commit does not impact building stage, but can avoid a test case failure (by skipping it):
b4f894633fa14d7d46ba7676f950b90a401504bbselftests: bpf: Don't runsk_lookupin verifier testsThanks.
Or should I submit complete patches?
Greg KH
maintainerRe: [PATCH 5.10 373/575] selftests: bpf: Convert sk_lookup ctx access tests to PROG_TEST_RUN
Quoted 26 lines · Tianchen Ding
Quoted 25 lines · Tianchen Ding
Quoted 13 lines · Greg KH
Quoted 11 lines · Tianchen Ding
Hi Greg.
We found a compile error when building
tools/testing/selftests/bpf/on 5.10.
tools/testing/selftests/bpf/prog_tests/sk_lookup.c:1092:15: error: 'structbpf_sk_lookup' has no member named 'cookie' 1092 | if (CHECK(ctx.cookie == 0, "ctx.cookie", "no socket selected\n"))It requires
7c32e8f8bc33("bpf: AddPROG_TEST_RUNsupport forsk_lookupprograms") from upstream.Maybe the left patches of this patchset are needed for 5.10 LTS?
https://lore.kernel.org/bpf/[email protected]/Quoted 6 lines
If so, please submit them with the git commit ids so that I can fix this up.
thanks,
greg k-h
These 2 commits from upstream are necessary for bpf selftests build pass on 5.10.y:
607b9cc92bd7208338d714a22b8082fe83bcb177bpf: Consolidate shared test timing code7c32e8f8bc33a5f4b113a630857e46634e3e143bbpf: AddPROG_TEST_RUNsupport forsk_lookupprograms
Quoted 6 lines
Quoted 4 lines
This commit does not impact building stage, but can avoid a test case failure (by skipping it):
b4f894633fa14d7d46ba7676f950b90a401504bbselftests: bpf: Don't runsk_lookupin verifier testsThanks.
Or should I submit complete patches?
Yes, please submit complete patches.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 374/575 selftests/bpf: Fix fd cleanup in sk_lookup test
In reply to Greg Kroah-HartmanFrom: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit c3fc706e94f5653def2783ffcd809a38676b7551 ]
Similar to the fix in commit:e31eec77e4ab ("bpf: selftests: Fix fd cleanup in get_branch_snapshot")
We use designated initializer to set fds to -1 without breaking on future changes to MAX_SERVER constant denoting the array size.
The particular close(0) occurs on non-reuseport tests, so it can be seen with -n 115/{2,3} but not 115/4. This can cause problems with future tests if they depend on BTF fd never being acquired as fd 0, breaking internal libbpf assumptions.
--- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +2 -2
@@ -598,7 +598,7 @@ close:static void run_lookup_prog (const struct test *t) { -int server_fds[MAX_SERVERS ] = {-1 }; +int server_fds[] = { [0 ...MAX_SERVERS -1 ] =-1 };int client_fd, reuse_conn_fd =-1 ;struct bpf_link *lookup_link;int i, err;
@@ -1053,7 +1053,7 @@ static void run_sk_assign(struct test_sk_lookup *skel,struct bpf_program *lookup_prog, const char *remote_ip, const char *local_ip) { - int server_fds[MAX_SERVERS] = { -1 }; + int server_fds[] = { [0 ... MAX_SERVERS - 1] = -1 };struct bpf_sk_lookup ctx;__u64 server_cookie;int i, err;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 375/575 net: amd-xgbe: Toggle PLL settings during rate change
In reply to Greg Kroah-HartmanFrom: Shyam Sundar S K <[email protected]>
[ Upstream commit daf182d360e509a494db18666799f4e85d83dda0 ]
For each rate change command submission, the FW has to do a phy power off sequence internally. For this to happen correctly, the PLL re-initialization control setting has to be turned off before sending mailbox commands and re-enabled once the command submission is complete.
Without the PLL control setting, the link up takes longer time in a fixed phy configuration.
--- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 ++++++++ drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 20 +++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)
drivers/net/ethernet/amd/xgbe/xgbe-common.h +8 -0
@@ -1331,6 +1331,10 @@#define MDIO_VEND2_PMA_CDR_CONTROL 0x8056#endif +#ifndef MDIO_VEND2_PMA_MISC_CTRL0 +#define MDIO_VEND2_PMA_MISC_CTRL0 0x8090 +#endif +#ifndef MDIO_CTRL1_SPEED1G #define MDIO_CTRL1_SPEED1G (MDIO_CTRL1_SPEED10G & ~BMCR_SPEED100)#endif
@@ -1389,6 +1393,10 @@#define XGBE_PMA_RX_RST_0_RESET_ON 0x10#define XGBE_PMA_RX_RST_0_RESET_OFF 0x00 +#define XGBE_PMA_PLL_CTRL_MASK BIT(15) +#define XGBE_PMA_PLL_CTRL_ENABLE BIT(15) +#define XGBE_PMA_PLL_CTRL_DISABLE 0x0000 +/* Bit setting and getting macros * The get macro will extract the current bit field value from within * the variable
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +19 -1
@@ -1977,12 +1977,26 @@ static void xgbe_phy_rx_reset(struct xgbe_prv_data *pdata) } } +static void xgbe_phy_pll_ctrl (struct xgbe_prv_data *pdata,bool enable) +{ +XMDIO_WRITE_BITS (pdata,MDIO_MMD_PMAPMD ,MDIO_VEND2_PMA_MISC_CTRL0 , +XGBE_PMA_PLL_CTRL_MASK , + enable ?XGBE_PMA_PLL_CTRL_ENABLE + :XGBE_PMA_PLL_CTRL_DISABLE ); + +/* Wait for command to complete */ +usleep_range (100 ,200 ); +} +static void xgbe_phy_perform_ratechange (struct xgbe_prv_data *pdata,unsigned int cmd,unsigned int sub_cmd) {unsigned int s0 =0 ;unsigned int wait; +/* Disable PLL re-initialization during FW command processing */ +xgbe_phy_pll_ctrl (pdata, false); +/* Log if a previous command did not complete */ if (XP_IOREAD_BITS (pdata,XP_DRIVER_INT_RO ,STATUS )) { netif_dbg(pdata, link, pdata->netdev,
@@ -2003,7 +2017,7 @@ static void xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata, wait =XGBE_RATECHANGE_COUNT ;while (wait--) {if (!XP_IOREAD_BITS (pdata,XP_DRIVER_INT_RO ,STATUS )) -return ; + goto reenable_pll;usleep_range (1000 ,2000 ); }
@@ -2013,6 +2027,10 @@ static void xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata,/* Reset on error */ xgbe_phy_rx_reset (pdata); + +reenable_pll: +/* Enable PLL re-initialization */ +xgbe_phy_pll_ctrl (pdata, true); }static void xgbe_phy_rrc (struct xgbe_prv_data *pdata)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 376/575 net: phylink: avoid mvneta warning when setting pause parameters
In reply to Greg Kroah-HartmanFrom: Russell King (Oracle) <[email protected]>
[ Upstream commit fd8d9731bcdfb22d28e45bce789bcb211c868c78 ]
mvneta does not support asymetric pause modes, and it flags this by the lack of AsymPause in the supported field. When setting pause modes, we check that pause->rx_pause == pause->tx_pause, but only when pause autoneg is enabled. When pause autoneg is disabled, we still allow pause->rx_pause != pause->tx_pause, which is incorrect when the MAC does not support asymetric pause, and causes mvneta to issue a warning.
Fix this by removing the test for pause->autoneg, so we always check that pause->rx_pause == pause->tx_pause for network devices that do not support AsymPause.
--- drivers/net/phy/phylink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/phylink.c +1 -1
@@ -1610,7 +1610,7 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl,return -EOPNOTSUPP ;if (!phylink_test (pl->supported, Asym_Pause) && - !pause->autoneg && pause->rx_pause != pause->tx_pause) + pause->rx_pause != pause->tx_pause)return -EINVAL ; pause_state =0 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 377/575 crypto: pcrypt - Delay write to padata->info
In reply to Greg Kroah-HartmanFrom: Daniel Jordan <[email protected]>
[ Upstream commit 68b6dea802cea0dbdd8bd7ccc60716b5a32a5d8a ]
These three events can race when pcrypt is used multiple times in a template ("pcrypt(pcrypt(...))"):
1. [taskA] The caller makes the crypto request via crypto_aead_encrypt() 2. [kworkerB] padata serializes the inner pcrypt request 3. [kworkerC] padata serializes the outer pcrypt request
3 might finish before the call to crypto_aead_encrypt() returns in 1, resulting in two possible issues.
First, a use-after-free of the crypto request's memory when, for example, taskA writes to the outer pcrypt request's padata->info in pcrypt_aead_enc() after kworkerC completes the request.
Second, the outer pcrypt request overwrites the inner pcrypt request's return code with -EINPROGRESS, making a successful request appear to fail. For instance, kworkerB writes the outer pcrypt request's padata->info in pcrypt_aead_done() and then taskA overwrites it in pcrypt_aead_enc().
Avoid both situations by delaying the write of padata->info until after the inner crypto request's return code is checked. This prevents the use-after-free by not touching the crypto request's memory after the next-inner crypto request is made, and stops padata->info from being overwritten.
--- crypto/pcrypt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
crypto/pcrypt.c +8 -4
@@ -78,12 +78,14 @@ static void pcrypt_aead_enc(struct padata_priv *padata) {struct pcrypt_request *preq =pcrypt_padata_request (padata);struct aead_request *req =pcrypt_request_ctx (preq); +int ret; - padata->info =crypto_aead_encrypt (req); + ret =crypto_aead_encrypt (req); -if (padata->info == -EINPROGRESS ) +if (ret == -EINPROGRESS )return ; + padata->info = ret;padata_do_serial (padata); }
@@ -123,12 +125,14 @@ static void pcrypt_aead_dec(struct padata_priv *padata) {struct pcrypt_request *preq =pcrypt_padata_request (padata);struct aead_request *req =pcrypt_request_ctx (preq); +int ret; - padata->info =crypto_aead_decrypt (req); + ret =crypto_aead_decrypt (req); -if (padata->info == -EINPROGRESS ) +if (ret == -EINPROGRESS )return ; + padata->info = ret;padata_do_serial (padata); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 378/575 selftests/bpf: Fix fclose/pclose mismatch in test_progs
In reply to Greg Kroah-HartmanFrom: Andrea Righi <[email protected]>
[ Upstream commit f48ad69097fe79d1de13c4d8fef556d4c11c5e68 ]
Make sure to use pclose() to properly close the pipe opened by popen().
--- tools/testing/selftests/bpf/test_progs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/test_progs.c +2 -2
@@ -347,7 +347,7 @@ int extract_build_id(char *build_id, size_t size)if (getline (&line, &len, fp) ==-1 ) goto err; -fclose (fp); +pclose (fp);if (len > size) len = size;
@@ -356,7 +356,7 @@ int extract_build_id(char *build_id, size_t size)free (line);return 0 ; err: -fclose (fp); +pclose (fp);return -1 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 379/575 udp6: allow SO_MARK ctrl msg to affect routing
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 42dcfd850e514b229d616a53dec06d0f2533217c ]
Commit c6af0c227a22 ("ip: support SO_MARK cmsg") added propagation of SO_MARK from cmsg to skb->mark. For IPv4 and raw sockets the mark also affects route lookup, but in case of IPv6 the flow info is initialized before cmsg is parsed.
--- net/ipv6/udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/udp.c +1 -1
@@ -1420,7 +1420,6 @@ do_udp_sendmsg:if (!fl6.flowi6_oif) fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex; - fl6.flowi6_mark = ipc6.sockc.mark; fl6.flowi6_uid = sk->sk_uid;if (msg->msg_controllen) {
@@ -1456,6 +1455,7 @@ do_udp_sendmsg: ipc6.opt = opt; fl6.flowi6_proto = sk->sk_protocol; + fl6.flowi6_mark = ipc6.sockc.mark; fl6.daddr = *daddr;if (ipv6_addr_any (&fl6.saddr) && !ipv6_addr_any (&np->saddr)) fl6.saddr = np->saddr;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 380/575 ibmvnic: dont stop queue in xmit
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 8878e46fcfd46b19964bd90e13b25dd94cbfc9be ]
If adapter's resetting bit is on, discard the packet but don't stop the transmit queue - instead leave that to the reset code. With this change, it is possible that we may get several calls to ibmvnic_xmit() that simply discard packets and return.
But if we stop the queue here, we might end up doing so just after __ibmvnic_open() started the queues (during a hard/soft reset) and before the ->resetting bit was cleared. If that happens, there will be no one to restart queue and transmissions will be blocked indefinitely.
This can cause a TIMEOUT reset and with auto priority failover enabled, an unnecessary FAILOVER reset to less favored backing device and then a FAILOVER back to the most favored backing device. If we hit the window repeatedly, we can get stuck in a loop of TIMEOUT, FAILOVER, FAILOVER resets leaving the adapter unusable for extended periods of time.
--- drivers/net/ethernet/ibm/ibmvnic.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +0 -2
@@ -1548,8 +1548,6 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)netdev_tx_t ret =NETDEV_TX_OK ;if (test_bit (0 , &adapter->resetting)) { -if (!netif_subqueue_stopped (netdev, skb)) -netif_stop_subqueue (netdev, queue_num);dev_kfree_skb_any (skb); tx_send_failed++;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 381/575 ibmvnic: Process crqs after enabling interrupts
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
[ Upstream commit 6e20d00158f31f7631d68b86996b7e951c4451c8 ]
Soon after registering a CRQ it is possible that we get a fail over or maybe a CRQ_INIT from the VIOS while interrupts were disabled.
Look for any such CRQs after enabling interrupts.
Otherwise we can intermittently fail to bring up ibmvnic adapters during boot, specially in kexec/kdump kernels.
--- drivers/net/ethernet/ibm/ibmvnic.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/ibm/ibmvnic.c +3 -0
@@ -5185,6 +5185,9 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter) crq->cur =0 ;spin_lock_init (&crq->lock); +/* process any CRQs that were queued before we enabled interrupts */ +tasklet_schedule (&adapter->tasklet); +return retrc; req_irq_failed:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 382/575 cgroup: Fix rootcg cpu.stat guest double counting
In reply to Greg Kroah-HartmanFrom: Dan Schatzberg <[email protected]>
[ Upstream commit 81c49d39aea8a10e6d05d3aa1cb65ceb721e19b0 ]
In account_guest_time in kernel/sched/cputime.c guest time is attributed to both CPUTIME_NICE and CPUTIME_USER in addition to CPUTIME_GUEST_NICE and CPUTIME_GUEST respectively. Therefore, adding both to calculate usage results in double counting any guest time at the rootcg.
--- kernel/cgroup/rstat.c | 2 -- 1 file changed, 2 deletions(-)
kernel/cgroup/rstat.c +0 -2
@@ -421,8 +421,6 @@ static void root_cgroup_cputime(struct task_cputime *cputime) cputime->sum_exec_runtime += user; cputime->sum_exec_runtime += sys; cputime->sum_exec_runtime += cpustat[CPUTIME_STEAL ]; - cputime->sum_exec_runtime += cpustat[CPUTIME_GUEST ]; - cputime->sum_exec_runtime += cpustat[CPUTIME_GUEST_NICE ]; } }
Signature · 1 line
2.33.0
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.80 release. There are 575 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, 17 Nov 2021 16:52:23 +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/v5.x/stable-review/patch-5.10.80-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
5.10.80-rc1 Successfully Compiled and booted on my Raspberry PI 4b (8g) (bcm2711)
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.80 release. There are 575 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.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.80 release. There are 575 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, 17 Nov 2021 16:52:23 +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/v5.x/stable-review/patch-5.10.80-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Tested on arm64 and x86 for 5.10.80-rc1,
Kernel repo:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Branch: linux-5.10.y
Version: 5.10.80-rc1
Commit: 498eb27d1093fbde123a46948f9aef0a7dd41950
Compiler: gcc version 7.3.0 (GCC)
arm64:
--------------------------------------------------------------------
Testcase Result Summary:
total: 9020
passed: 9020
failed: 0
timeout: 0
--------------------------------------------------------------------
x86:
--------------------------------------------------------------------
Testcase Result Summary:
total: 9020
passed: 9020
failed: 0
timeout: 0
--------------------------------------------------------------------
Greg Kroah-Hartman
maintainerPATCH 383/575 bpf: Fix propagation of bounds from 64-bit min/max into 32-bit and var_off.
In reply to Greg Kroah-HartmanFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit b9979db8340154526d9ab38a1883d6f6ba9b6d47 ]
Before this fix:
166: (b5) if r2 <= 0x1 goto pc+22
from 166 to 189: R2=invP(id=1,umax_value=1,var_off=(0x0; 0xffffffff))
After this fix:
166: (b5) if r2 <= 0x1 goto pc+22
from 166 to 189: R2=invP(id=1,umax_value=1,var_off=(0x0; 0x1))
While processing BPF_JLE the reg_set_min_max() would set true_reg->umax_value = 1 and call __reg_combine_64_into_32(true_reg).
Without the fix it would not pass the condition:
if (__reg64_bound_u32(reg->umin_value) && __reg64_bound_u32(reg->umax_value))
since umin_value == 0 at this point.
Before commit 10bf4e83167c the umin was incorrectly ingored.
The commit 10bf4e83167c fixed the correctness issue, but pessimized propagation of 64-bit min max into 32-bit min max and corresponding var_off.
--- kernel/bpf/verifier.c | 2 +- tools/testing/selftests/bpf/verifier/array_access.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +1 -1
@@ -1303,7 +1303,7 @@ static bool __reg64_bound_s32(s64 a)static bool __reg64_bound_u32 (u64 a) { -return a >U32_MIN && a <U32_MAX ; +return a >=U32_MIN && a <=U32_MAX ; }static void __reg_combine_64_into_32 (struct bpf_reg_state *reg)
tools/testing/selftests/bpf/verifier/array_access.c +1 -1
@@ -186,7 +186,7 @@ }, .fixup_map_hash_48b = { 3 }, .errstr_unpriv = "R0 leaks addr", - .errstr = "R0 unbounded memory access", + .errstr = "invalid access to map value, value_size=48 off=44 size=8", .result_unpriv = REJECT, .result = REJECT, .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 384/575 bpf: Fix propagation of signed bounds from 64-bit min/max into 32-bit.
In reply to Greg Kroah-HartmanFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit 388e2c0b978339dee9b0a81a2e546f8979e021e2 ]
Similar to unsigned bounds propagation fix signed bounds. The 'Fixes' tag is a hint. There is no security bug here. The verifier was too conservative.
--- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
@@ -1298,7 +1298,7 @@ static void __reg_combine_32_into_64(struct bpf_reg_state *reg)static bool __reg64_bound_s32 (s64 a) { -return a >S32_MIN && a <S32_MAX ; +return a >=S32_MIN && a <=S32_MAX ; }static bool __reg64_bound_u32 (u64 a)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 385/575 of: unittest: fix EXPECT text for gpio hog errors
In reply to Greg Kroah-HartmanFrom: Frank Rowand <[email protected]>
[ Upstream commit e85860e5bc077865a04f0a88d0b0335d3200484a ]
The console message text for gpio hog errors does not match what unittest expects.
--- drivers/of/unittest.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/of/unittest.c +8 -8
@@ -1682,19 +1682,19 @@ static void __init of_unittest_overlay_gpio(void)*/ EXPECT_BEGIN (KERN_INFO , -"GPIO line <<int>> (line-B-input) hogged as input\n" ); +"gpio-<<int>> (line-B-input): hogged as input\n" );EXPECT_BEGIN (KERN_INFO , -"GPIO line <<int>> (line-A-input) hogged as input\n" ); +"gpio-<<int>> (line-A-input): hogged as input\n" ); ret =platform_driver_register (&unittest_gpio_driver);if (unittest (ret ==0 ,"could not register unittest gpio driver\n" ))return ;EXPECT_END (KERN_INFO , -"GPIO line <<int>> (line-A-input) hogged as input\n" ); +"gpio-<<int>> (line-A-input): hogged as input\n" );EXPECT_END (KERN_INFO , -"GPIO line <<int>> (line-B-input) hogged as input\n" ); +"gpio-<<int>> (line-B-input): hogged as input\n" );unittest (probe_pass_count +2 == unittest_gpio_probe_pass_count,"unittest_gpio_probe() failed or not called\n" );
@@ -1721,7 +1721,7 @@ static void __init of_unittest_overlay_gpio(void) chip_request_count = unittest_gpio_chip_request_count;EXPECT_BEGIN (KERN_INFO , -"GPIO line <<int>> (line-D-input) hogged as input\n" ); +"gpio-<<int>> (line-D-input): hogged as input\n" );/* overlay_gpio_03 contains gpio node and child gpio hog node */
@@ -1729,7 +1729,7 @@ static void __init of_unittest_overlay_gpio(void) "Adding overlay 'overlay_gpio_03' failed\n");EXPECT_END (KERN_INFO , -"GPIO line <<int>> (line-D-input) hogged as input\n" ); +"gpio-<<int>> (line-D-input): hogged as input\n" );unittest (probe_pass_count +1 == unittest_gpio_probe_pass_count,"unittest_gpio_probe() failed or not called\n" );
@@ -1768,7 +1768,7 @@ static void __init of_unittest_overlay_gpio(void)*/ EXPECT_BEGIN (KERN_INFO , -"GPIO line <<int>> (line-C-input) hogged as input\n" ); +"gpio-<<int>> (line-C-input): hogged as input\n" );/* overlay_gpio_04b contains child gpio hog node */
@@ -1776,7 +1776,7 @@ static void __init of_unittest_overlay_gpio(void) "Adding overlay 'overlay_gpio_04b' failed\n");EXPECT_END (KERN_INFO , -"GPIO line <<int>> (line-C-input) hogged as input\n" ); +"gpio-<<int>> (line-C-input): hogged as input\n" ); unittest(chip_request_count + 1 == unittest_gpio_chip_request_count, "unittest_gpio_chip_request() called %d times (expected 1 time)\n",
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 386/575 iio: st_sensors: Call st_sensors_power_enable() from bus drivers
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 7db4f2cacbede1c6d95552c0d10e77398665a733 ]
In case we would initialize two IIO devices from one physical device, we shouldn't have a clash on regulators. That's why move st_sensors_power_enable() call from core to bus drivers.
--- drivers/iio/accel/st_accel_core.c | 21 +++++---------------- drivers/iio/accel/st_accel_i2c.c | 17 +++++++++++++++-- drivers/iio/accel/st_accel_spi.c | 17 +++++++++++++++-- drivers/iio/gyro/st_gyro_core.c | 15 +++------------ drivers/iio/gyro/st_gyro_i2c.c | 17 +++++++++++++++-- drivers/iio/gyro/st_gyro_spi.c | 17 +++++++++++++++-- drivers/iio/magnetometer/st_magn_core.c | 15 +++------------ drivers/iio/magnetometer/st_magn_i2c.c | 14 +++++++++++++- drivers/iio/magnetometer/st_magn_spi.c | 14 +++++++++++++- drivers/iio/pressure/st_pressure_core.c | 15 +++------------ drivers/iio/pressure/st_pressure_i2c.c | 17 +++++++++++++++-- drivers/iio/pressure/st_pressure_spi.c | 17 +++++++++++++++-- 12 files changed, 130 insertions(+), 66 deletions(-)
drivers/iio/accel/st_accel_core.c +5 -16
@@ -1255,13 +1255,9 @@ int st_accel_common_probe(struct iio_dev *indio_dev) indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->info = &accel_info; - err =st_sensors_power_enable (indio_dev); -if (err) -return err; - err =st_sensors_verify_id (indio_dev);if (err <0 ) - goto st_accel_power_off; +return err; adata->num_data_channels =ST_ACCEL_NUMBER_DATA_CHANNELS ; indio_dev->num_channels =ST_SENSORS_NUMBER_ALL_CHANNELS ;
@@ -1270,10 +1266,8 @@ int st_accel_common_probe(struct iio_dev *indio_dev) channels =devm_kmemdup (&indio_dev->dev, adata->sensor_settings->ch, channels_size,GFP_KERNEL ); -if (!channels) { - err = -ENOMEM ; - goto st_accel_power_off; - } +if (!channels) +return -ENOMEM ;if (apply_acpi_orientation (indio_dev, channels)) dev_warn(&indio_dev->dev,
@@ -1288,11 +1282,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev) err =st_sensors_init_sensor (indio_dev, pdata);if (err <0 ) - goto st_accel_power_off; +return err; err =st_accel_allocate_ring (indio_dev);if (err <0 ) - goto st_accel_power_off; +return err;if (adata->irq >0 ) { err = st_sensors_allocate_trigger(indio_dev,
@@ -1315,9 +1309,6 @@ st_accel_device_register_error:st_sensors_deallocate_trigger (indio_dev); st_accel_probe_trigger_error:st_accel_deallocate_ring (indio_dev); -st_accel_power_off: -st_sensors_power_disable (indio_dev); -return err; }EXPORT_SYMBOL (st_accel_common_probe);
@@ -1326,8 +1317,6 @@ void st_accel_common_remove(struct iio_dev *indio_dev) {struct st_sensor_data *adata =iio_priv (indio_dev); -st_sensors_power_disable (indio_dev); -iio_device_unregister (indio_dev);if (adata->irq >0 )st_sensors_deallocate_trigger (indio_dev);
drivers/iio/accel/st_accel_i2c.c +15 -2
@@ -174,16 +174,29 @@ static int st_accel_i2c_probe(struct i2c_client *client)if (ret <0 )return ret; + ret =st_sensors_power_enable (indio_dev); +if (ret) +return ret; + ret =st_accel_common_probe (indio_dev);if (ret <0 ) -return ret; + goto st_accel_power_off;return 0 ; + +st_accel_power_off: +st_sensors_power_disable (indio_dev); + +return ret; }static int st_accel_i2c_remove (struct i2c_client *client) { -st_accel_common_remove (i2c_get_clientdata (client)); +struct iio_dev *indio_dev =i2c_get_clientdata (client); + +st_sensors_power_disable (indio_dev); + +st_accel_common_remove (indio_dev);return 0 ; }
drivers/iio/accel/st_accel_spi.c +15 -2
@@ -123,16 +123,29 @@ static int st_accel_spi_probe(struct spi_device *spi)if (err <0 )return err; + err =st_sensors_power_enable (indio_dev); +if (err) +return err; + err =st_accel_common_probe (indio_dev);if (err <0 ) -return err; + goto st_accel_power_off;return 0 ; + +st_accel_power_off: +st_sensors_power_disable (indio_dev); + +return err; }static int st_accel_spi_remove (struct spi_device *spi) { -st_accel_common_remove (spi_get_drvdata (spi)); +struct iio_dev *indio_dev =spi_get_drvdata (spi); + +st_sensors_power_disable (indio_dev); + +st_accel_common_remove (indio_dev);return 0 ; }
drivers/iio/gyro/st_gyro_core.c +3 -12
@@ -466,13 +466,9 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->info = &gyro_info; - err =st_sensors_power_enable (indio_dev); -if (err) -return err; - err =st_sensors_verify_id (indio_dev);if (err <0 ) - goto st_gyro_power_off; +return err; gdata->num_data_channels =ST_GYRO_NUMBER_DATA_CHANNELS ; indio_dev->channels = gdata->sensor_settings->ch;
@@ -485,11 +481,11 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) err =st_sensors_init_sensor (indio_dev, pdata);if (err <0 ) - goto st_gyro_power_off; +return err; err =st_gyro_allocate_ring (indio_dev);if (err <0 ) - goto st_gyro_power_off; +return err;if (gdata->irq >0 ) { err = st_sensors_allocate_trigger(indio_dev,
@@ -512,9 +508,6 @@ st_gyro_device_register_error:st_sensors_deallocate_trigger (indio_dev); st_gyro_probe_trigger_error:st_gyro_deallocate_ring (indio_dev); -st_gyro_power_off: -st_sensors_power_disable (indio_dev); -return err; }EXPORT_SYMBOL (st_gyro_common_probe);
@@ -523,8 +516,6 @@ void st_gyro_common_remove(struct iio_dev *indio_dev) {struct st_sensor_data *gdata =iio_priv (indio_dev); -st_sensors_power_disable (indio_dev); -iio_device_unregister (indio_dev);if (gdata->irq >0 )st_sensors_deallocate_trigger (indio_dev);
drivers/iio/gyro/st_gyro_i2c.c +15 -2
@@ -86,16 +86,29 @@ static int st_gyro_i2c_probe(struct i2c_client *client,if (err <0 )return err; + err =st_sensors_power_enable (indio_dev); +if (err) +return err; + err =st_gyro_common_probe (indio_dev);if (err <0 ) -return err; + goto st_gyro_power_off;return 0 ; + +st_gyro_power_off: +st_sensors_power_disable (indio_dev); + +return err; }static int st_gyro_i2c_remove (struct i2c_client *client) { -st_gyro_common_remove (i2c_get_clientdata (client)); +struct iio_dev *indio_dev =i2c_get_clientdata (client); + +st_sensors_power_disable (indio_dev); + +st_gyro_common_remove (indio_dev);return 0 ; }
drivers/iio/gyro/st_gyro_spi.c +15 -2
@@ -90,16 +90,29 @@ static int st_gyro_spi_probe(struct spi_device *spi)if (err <0 )return err; + err =st_sensors_power_enable (indio_dev); +if (err) +return err; + err =st_gyro_common_probe (indio_dev);if (err <0 ) -return err; + goto st_gyro_power_off;return 0 ; + +st_gyro_power_off: +st_sensors_power_disable (indio_dev); + +return err; }static int st_gyro_spi_remove (struct spi_device *spi) { -st_gyro_common_remove (spi_get_drvdata (spi)); +struct iio_dev *indio_dev =spi_get_drvdata (spi); + +st_sensors_power_disable (indio_dev); + +st_gyro_common_remove (indio_dev);return 0 ; }
drivers/iio/magnetometer/st_magn_core.c +3 -12
@@ -494,13 +494,9 @@ int st_magn_common_probe(struct iio_dev *indio_dev) indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->info = &magn_info; - err =st_sensors_power_enable (indio_dev); -if (err) -return err; - err =st_sensors_verify_id (indio_dev);if (err <0 ) - goto st_magn_power_off; +return err; mdata->num_data_channels =ST_MAGN_NUMBER_DATA_CHANNELS ; indio_dev->channels = mdata->sensor_settings->ch;
@@ -511,11 +507,11 @@ int st_magn_common_probe(struct iio_dev *indio_dev) err =st_sensors_init_sensor (indio_dev,NULL );if (err <0 ) - goto st_magn_power_off; +return err; err =st_magn_allocate_ring (indio_dev);if (err <0 ) - goto st_magn_power_off; +return err;if (mdata->irq >0 ) { err = st_sensors_allocate_trigger(indio_dev,
@@ -538,9 +534,6 @@ st_magn_device_register_error:st_sensors_deallocate_trigger (indio_dev); st_magn_probe_trigger_error:st_magn_deallocate_ring (indio_dev); -st_magn_power_off: -st_sensors_power_disable (indio_dev); -return err; }EXPORT_SYMBOL (st_magn_common_probe);
@@ -549,8 +542,6 @@ void st_magn_common_remove(struct iio_dev *indio_dev) {struct st_sensor_data *mdata =iio_priv (indio_dev); -st_sensors_power_disable (indio_dev); -iio_device_unregister (indio_dev);if (mdata->irq >0 )st_sensors_deallocate_trigger (indio_dev);
drivers/iio/magnetometer/st_magn_i2c.c +13 -1
@@ -78,16 +78,28 @@ static int st_magn_i2c_probe(struct i2c_client *client,if (err <0 )return err; + err =st_sensors_power_enable (indio_dev); +if (err) +return err; + err =st_magn_common_probe (indio_dev);if (err <0 ) -return err; + goto st_magn_power_off;return 0 ; + +st_magn_power_off: +st_sensors_power_disable (indio_dev); + +return err; }static int st_magn_i2c_remove (struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); + +st_sensors_power_disable (indio_dev); +st_magn_common_remove (indio_dev);return 0 ;
drivers/iio/magnetometer/st_magn_spi.c +13 -1
@@ -72,16 +72,28 @@ static int st_magn_spi_probe(struct spi_device *spi)if (err <0 )return err; + err =st_sensors_power_enable (indio_dev); +if (err) +return err; + err =st_magn_common_probe (indio_dev);if (err <0 ) -return err; + goto st_magn_power_off;return 0 ; + +st_magn_power_off: +st_sensors_power_disable (indio_dev); + +return err; }static int st_magn_spi_remove (struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); + +st_sensors_power_disable (indio_dev); +st_magn_common_remove (indio_dev);return 0 ;
drivers/iio/pressure/st_pressure_core.c +3 -12
@@ -689,13 +689,9 @@ int st_press_common_probe(struct iio_dev *indio_dev) indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->info = &press_info; - err =st_sensors_power_enable (indio_dev); -if (err) -return err; - err =st_sensors_verify_id (indio_dev);if (err <0 ) - goto st_press_power_off; +return err;/* * Skip timestamping channel while declaring available channels to
@@ -718,11 +714,11 @@ int st_press_common_probe(struct iio_dev *indio_dev) err =st_sensors_init_sensor (indio_dev, pdata);if (err <0 ) - goto st_press_power_off; +return err; err =st_press_allocate_ring (indio_dev);if (err <0 ) - goto st_press_power_off; +return err;if (press_data->irq >0 ) { err = st_sensors_allocate_trigger(indio_dev,
@@ -745,9 +741,6 @@ st_press_device_register_error:st_sensors_deallocate_trigger (indio_dev); st_press_probe_trigger_error:st_press_deallocate_ring (indio_dev); -st_press_power_off: -st_sensors_power_disable (indio_dev); -return err; }EXPORT_SYMBOL (st_press_common_probe);
@@ -756,8 +749,6 @@ void st_press_common_remove(struct iio_dev *indio_dev) {struct st_sensor_data *press_data =iio_priv (indio_dev); -st_sensors_power_disable (indio_dev); -iio_device_unregister (indio_dev);if (press_data->irq >0 )st_sensors_deallocate_trigger (indio_dev);
drivers/iio/pressure/st_pressure_i2c.c +15 -2
@@ -98,16 +98,29 @@ static int st_press_i2c_probe(struct i2c_client *client,if (ret <0 )return ret; + ret =st_sensors_power_enable (indio_dev); +if (ret) +return ret; + ret =st_press_common_probe (indio_dev);if (ret <0 ) -return ret; + goto st_press_power_off;return 0 ; + +st_press_power_off: +st_sensors_power_disable (indio_dev); + +return ret; }static int st_press_i2c_remove (struct i2c_client *client) { -st_press_common_remove (i2c_get_clientdata (client)); +struct iio_dev *indio_dev =i2c_get_clientdata (client); + +st_sensors_power_disable (indio_dev); + +st_press_common_remove (indio_dev);return 0 ; }
drivers/iio/pressure/st_pressure_spi.c +15 -2
@@ -82,16 +82,29 @@ static int st_press_spi_probe(struct spi_device *spi)if (err <0 )return err; + err =st_sensors_power_enable (indio_dev); +if (err) +return err; + err =st_press_common_probe (indio_dev);if (err <0 ) -return err; + goto st_press_power_off;return 0 ; + +st_press_power_off: +st_sensors_power_disable (indio_dev); + +return err; }static int st_press_spi_remove (struct spi_device *spi) { -st_press_common_remove (spi_get_drvdata (spi)); +struct iio_dev *indio_dev =spi_get_drvdata (spi); + +st_sensors_power_disable (indio_dev); + +st_press_common_remove (indio_dev);return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 387/575 iio: st_sensors: disable regulators after device unregistration
In reply to Greg Kroah-HartmanFrom: Alexandru Ardelean <[email protected]>
[ Upstream commit 9f0b3e0cc0c88618aa9e5cecef747b1337ae0a5d ]
Up until commit ea7e586bdd331 ("iio: st_sensors: move regulator retrieveal to core") only the ST pressure driver seems to have had any regulator disable. After that commit, the regulator handling was moved into the common st_sensors logic.
In all instances of this regulator handling, the regulators were disabled before unregistering the IIO device.
This can cause issues where the device would be powered down and still be available to userspace, allowing it to send invalid/garbage data.
This change moves the st_sensors_power_disable() after the common probe functions. These common probe functions also handle unregistering the IIO device.
--- drivers/iio/accel/st_accel_i2c.c | 4 ++-- drivers/iio/accel/st_accel_spi.c | 4 ++-- drivers/iio/gyro/st_gyro_i2c.c | 4 ++-- drivers/iio/gyro/st_gyro_spi.c | 4 ++-- drivers/iio/magnetometer/st_magn_i2c.c | 4 ++-- drivers/iio/magnetometer/st_magn_spi.c | 4 ++-- drivers/iio/pressure/st_pressure_i2c.c | 4 ++-- drivers/iio/pressure/st_pressure_spi.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-)
drivers/iio/accel/st_accel_i2c.c +2 -2
@@ -194,10 +194,10 @@ static int st_accel_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/accel/st_accel_spi.c +2 -2
@@ -143,10 +143,10 @@ static int st_accel_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/gyro/st_gyro_i2c.c +2 -2
@@ -106,10 +106,10 @@ static int st_gyro_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/gyro/st_gyro_spi.c +2 -2
@@ -110,10 +110,10 @@ static int st_gyro_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/magnetometer/st_magn_i2c.c +2 -2
@@ -98,10 +98,10 @@ static int st_magn_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/magnetometer/st_magn_spi.c +2 -2
@@ -92,10 +92,10 @@ static int st_magn_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/pressure/st_pressure_i2c.c +2 -2
@@ -118,10 +118,10 @@ static int st_press_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/pressure/st_pressure_spi.c +2 -2
@@ -102,10 +102,10 @@ static int st_press_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 388/575 RDMA/rxe: Fix wrong port_cap_flags
In reply to Greg Kroah-HartmanFrom: Junji Wei <[email protected]>
[ Upstream commit dcd3f985b20ffcc375f82ca0ca9f241c7025eb5e ]
The port->attr.port_cap_flags should be set to enum ib_port_capability_mask_bits in ib_mad.h, not RDMA_CORE_CAP_PROT_ROCE_UDP_ENCAP.
--- drivers/infiniband/sw/rxe/rxe_param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_param.h +1 -1
@@ -108,7 +108,7 @@ enum rxe_device_param {/* default/initial rxe port parameters */ enum rxe_port_param {RXE_PORT_GID_TBL_LEN =1024 , -RXE_PORT_PORT_CAP_FLAGS =RDMA_CORE_CAP_PROT_ROCE_UDP_ENCAP , +RXE_PORT_PORT_CAP_FLAGS =IB_PORT_CM_SUP ,RXE_PORT_MAX_MSG_SZ =0x800000 ,RXE_PORT_BAD_PKEY_CNTR =0 ,RXE_PORT_QKEY_VIOL_CNTR =0 ,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 389/575 ARM: dts: BCM5301X: Fix memory nodes names
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit c5e1df3276d7a500678da9453be31a66ad115150 ]
Thix fixes:arch/arm/boot/dts/bcm4708-netgear-r6250.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728], [2281701376, 134217728]]} arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728], [2281701376, 134217728]]} arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728], [2281701376, 402653184]]} arch/arm/boot/dts/bcm4709-linksys-ea9200.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728], [2281701376, 134217728]]} arch/arm/boot/dts/bcm4709-netgear-r7000.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728], [2281701376, 134217728]]} arch/arm/boot/dts/bcm4709-netgear-r8000.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728], [2281701376, 134217728]]} arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728]]} arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728], [2281701376, 402653184]]} arch/arm/boot/dts/bcm53016-meraki-mr32.dt.yaml: /: memory: False schema does not allow {'reg': [[0, 134217728]], 'device_type': ['memory']} arch/arm/boot/dts/bcm94708.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728]]} arch/arm/boot/dts/bcm94709.dt.yaml: /: memory: False schema does not allow {'device_type': ['memory'], 'reg': [[0, 134217728]]}
--- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 2 +- arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 2 +- arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 2 +- arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 2 +- arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 2 +- arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 2 +- arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 2 +- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- arch/arm/boot/dts/bcm94708.dts | 2 +- arch/arm/boot/dts/bcm94709.dts | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
arch/arm/boot/dts/bcm4708-netgear-r6250.dts +1 -1
@@ -20,7 +20,7 @@ bootargs = "console=ttyS0,115200 earlycon"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>, <0x88000000 0x08000000>;
arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts +1 -1
@@ -19,7 +19,7 @@ bootargs = "console=ttyS0,115200"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>, <0x88000000 0x08000000>;
arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +1 -1
@@ -19,7 +19,7 @@ bootargs = "console=ttyS0,115200"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>, <0x88000000 0x18000000>;
arch/arm/boot/dts/bcm4709-linksys-ea9200.dts +1 -1
@@ -16,7 +16,7 @@ bootargs = "console=ttyS0,115200"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>, <0x88000000 0x08000000>;
arch/arm/boot/dts/bcm4709-netgear-r7000.dts +1 -1
@@ -19,7 +19,7 @@ bootargs = "console=ttyS0,115200"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>, <0x88000000 0x08000000>;
arch/arm/boot/dts/bcm4709-netgear-r8000.dts +1 -1
@@ -30,7 +30,7 @@ bootargs = "console=ttyS0,115200"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>, <0x88000000 0x08000000>;
arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts +1 -1
@@ -15,7 +15,7 @@ bootargs = "console=ttyS0,115200 earlycon"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>; };
arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +1 -1
@@ -16,7 +16,7 @@ bootargs = "earlycon"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>, <0x88000000 0x18000000>;
arch/arm/boot/dts/bcm53016-meraki-mr32.dts +1 -1
@@ -20,7 +20,7 @@ bootargs = " console=ttyS0,115200n8 earlycon"; }; - memory { + memory@0 { reg = <0x00000000 0x08000000>; device_type = "memory"; };
arch/arm/boot/dts/bcm94708.dts +1 -1
@@ -38,7 +38,7 @@ model = "NorthStar SVK (BCM94708)"; compatible = "brcm,bcm94708", "brcm,bcm4708"; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>; };
arch/arm/boot/dts/bcm94709.dts +1 -1
@@ -38,7 +38,7 @@ model = "NorthStar SVK (BCM94709)"; compatible = "brcm,bcm94709", "brcm,bcm4709", "brcm,bcm4708"; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x08000000>; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 390/575 clk: mvebu: ap-cpu-clk: Fix a memory leak in error handling paths
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit af9617b419f77cf0b99702a7b2b0519da0d27715 ]
If we exit the for_each_of_cpu_node loop early, the reference on the current node must be decremented, otherwise there is a leak.
--- drivers/clk/mvebu/ap-cpu-clk.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/clk/mvebu/ap-cpu-clk.c +11 -3
@@ -256,12 +256,15 @@ static int ap_cpu_clock_probe(struct platform_device *pdev)int cpu, err; err =of_property_read_u32 (dn,"reg" , &cpu); -if (WARN_ON (err)) +if (WARN_ON (err)) { +of_node_put (dn);return err; + }/* If cpu2 or cpu3 is enabled */ if (cpu &APN806_CLUSTER_NUM_MASK ) { nclusters =2 ; +of_node_put (dn);break ; } }
@@ -288,8 +291,10 @@ static int ap_cpu_clock_probe(struct platform_device *pdev)int cpu, err; err =of_property_read_u32 (dn,"reg" , &cpu); -if (WARN_ON (err)) +if (WARN_ON (err)) { +of_node_put (dn);return err; + } cluster_index = cpu &APN806_CLUSTER_NUM_MASK ; cluster_index >>=APN806_CLUSTER_NUM_OFFSET ;
@@ -301,6 +306,7 @@ static int ap_cpu_clock_probe(struct platform_device *pdev) parent =of_clk_get (np, cluster_index);if (IS_ERR (parent)) {dev_err (dev,"Could not get the clock parent\n" ); +of_node_put (dn);return -EINVAL ; } parent_name =__clk_get_name (parent);
@@ -319,8 +325,10 @@ static int ap_cpu_clock_probe(struct platform_device *pdev) init.parent_names = &parent_name; ret =devm_clk_hw_register (dev, &ap_cpu_clk[cluster_index].hw); -if (ret) +if (ret) { +of_node_put (dn);return ret; + } ap_cpu_data->hws[cluster_index] = &ap_cpu_clk[cluster_index].hw; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 391/575 ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc()
In reply to Greg Kroah-HartmanFrom: Jackie Liu <[email protected]>
[ Upstream commit 2aa717473ce96c93ae43a5dc8c23cedc8ce7dd9f ]
The s3c24xx_init_intc() returns an error pointer upon failure, not NULL. let's add an error pointer check in s3c24xx_handle_irq.
s3c_intc[0] is not NULL or ERR, we can simplify the code.
--- arch/arm/mach-s3c/irq-s3c24xx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
arch/arm/mach-s3c/irq-s3c24xx.c +18 -4
@@ -360,11 +360,25 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc, asmlinkage void __exception_irq_entry s3c24xx_handle_irq(struct pt_regs *regs) { do { - if (likely(s3c_intc[0])) - if (s3c24xx_handle_intc(s3c_intc[0], regs, 0)) - continue; + /* + * For platform based machines, neither ERR nor NULL can happen here. + * The s3c24xx_handle_irq() will be set as IRQ handler iff this succeeds: + * + * s3c_intc[0] = s3c24xx_init_intc() + * + * If this fails, the next calls to s3c24xx_init_intc() won't be executed. + * + * For DT machine, s3c_init_intc_of() could set the IRQ handler without + * setting s3c_intc[0] only if it was called with num_ctrl=0. There is no + * such code path, so again the s3c_intc[0] will have a valid pointer if + * set_handle_irq() is called. + * + * Therefore in s3c24xx_handle_irq(), the s3c_intc[0] is always something. + */ + if (s3c24xx_handle_intc(s3c_intc[0], regs, 0)) + continue; - if (s3c_intc[2]) + if (!IS_ERR_OR_NULL(s3c_intc[2])) if (s3c24xx_handle_intc(s3c_intc[2], regs, 64)) continue;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 392/575 arm64: dts: rockchip: Fix GPU register width for RK3328
In reply to Greg Kroah-HartmanFrom: Alex Bee <[email protected]>
[ Upstream commit 932b4610f55b49f3a158b0db451137bab7ed0e1f ]
As can be seen in RK3328's TRM the register range for the GPU is 0xff300000 to 0xff330000.
It would (and does in vendor kernel) overlap with the registers of the HEVC encoder (node/driver do not exist yet in upstream kernel). See already existing h265e_mmu node.
--- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +1 -1
@@ -603,7 +603,7 @@ gpu: gpu@ff300000 { compatible = "rockchip,rk3328-mali", "arm,mali-450"; - reg = <0x0 0xff300000 0x0 0x40000>; + reg = <0x0 0xff300000 0x0 0x30000>; interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 393/575 ARM: dts: qcom: msm8974: Add xo_board reference clock to DSI0 PHY
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit 8ccecf6c710b8c048eecc65709640642e5357d6e ]
According to YAML validation, and for a future patchset putting this xo_board reference clock to use as VCO reference parent, add the missing clock to dsi_phy0.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-msm8974.dtsi +2 -2
@@ -1528,8 +1528,8 @@ #phy-cells = <0>; qcom,dsi-phy-index = <0>; - clocks = <&mmcc MDSS_AHB_CLK>; - clock-names = "iface"; + clocks = <&mmcc MDSS_AHB_CLK>, <&xo_board>; + clock-names = "iface", "ref"; }; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 394/575 RDMA/bnxt_re: Fix query SRQ failure
In reply to Greg Kroah-HartmanFrom: Selvin Xavier <[email protected]>
[ Upstream commit 598d16fa1bf93431ad35bbab3ed1affe4fb7b562 ]
Fill the missing parameters for the FW command while querying SRQ.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +2 -1
@@ -707,12 +707,13 @@ int bnxt_qplib_query_srq(struct bnxt_qplib_res *res,int rc =0 ;RCFW_CMD_PREP (req,QUERY_SRQ , cmd_flags); - req.srq_cid =cpu_to_le32 (srq->id);/* Configure the request */ sbuf =bnxt_qplib_rcfw_alloc_sbuf (rcfw,sizeof (*sb));if (!sbuf)return -ENOMEM ; + req.resp_size =sizeof (*sb) /BNXT_QPLIB_CMDQE_UNITS ; + req.srq_cid =cpu_to_le32 (srq->id); sb = sbuf->sb; rc =bnxt_qplib_rcfw_send_message (rcfw, (void *)&req, (void *)&resp, (void *)sbuf,0 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 395/575 arm64: dts: ti: k3-j721e-main: Fix "max-virtual-functions" in PCIe EP nodes
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit 9af3ef954975c383eeb667aee207d9ce6fbef8c4 ]
commit 4e5833884f66 ("arm64: dts: ti: k3-j721e-main: Add PCIe device tree nodes") added "max-virtual-functions" to have 16 bit values. Fix "max-virtual-functions" in PCIe endpoint (EP) nodes to have 8 bit values instead of 16.
--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +4 -4
@@ -656,7 +656,7 @@ clock-names = "fck"; cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; - max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; + max-virtual-functions = /bits/ 8 <4 4 4 4 0 0>; dma-coherent; };
@@ -705,7 +705,7 @@ clock-names = "fck"; cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; - max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; + max-virtual-functions = /bits/ 8 <4 4 4 4 0 0>; dma-coherent; };
@@ -754,7 +754,7 @@ clock-names = "fck"; cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; - max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; + max-virtual-functions = /bits/ 8 <4 4 4 4 0 0>; dma-coherent; };
@@ -803,7 +803,7 @@ clock-names = "fck"; cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; - max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; + max-virtual-functions = /bits/ 8 <4 4 4 4 0 0>; dma-coherent; #address-cells = <2>; #size-cells = <2>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 396/575 arm64: dts: ti: k3-j721e-main: Fix "bus-range" upto 256 bus number for PCIe
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit 5f46633565b1c1e1840a927676065d72b442dac4 ]
commit 4e5833884f66 ("arm64: dts: ti: k3-j721e-main: Add PCIe device tree nodes") restricted PCIe bus numbers from 0 to 15 (due to SMMU restriction in J721E). However since SMMU is not enabled, allow the full supported bus numbers from 0 to 255.
--- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +4 -4
@@ -629,7 +629,7 @@ clock-names = "fck"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x0 0xf>; + bus-range = <0x0 0xff>; vendor-id = <0x104c>; device-id = <0xb00d>; msi-map = <0x0 &gic_its 0x0 0x10000>;
@@ -678,7 +678,7 @@ clock-names = "fck"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x0 0xf>; + bus-range = <0x0 0xff>; vendor-id = <0x104c>; device-id = <0xb00d>; msi-map = <0x0 &gic_its 0x10000 0x10000>;
@@ -727,7 +727,7 @@ clock-names = "fck"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x0 0xf>; + bus-range = <0x0 0xff>; vendor-id = <0x104c>; device-id = <0xb00d>; msi-map = <0x0 &gic_its 0x20000 0x10000>;
@@ -776,7 +776,7 @@ clock-names = "fck"; #address-cells = <3>; #size-cells = <2>; - bus-range = <0x0 0xf>; + bus-range = <0x0 0xff>; vendor-id = <0x104c>; device-id = <0xb00d>; msi-map = <0x0 &gic_its 0x30000 0x10000>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 397/575 arm64: dts: meson-g12a: Fix the pwm regulator supply properties
In reply to Greg Kroah-HartmanFrom: Anand Moon <[email protected]>
[ Upstream commit 085675117ecf5e02c4220698fd549024ec64ad2c ]
After enabling CONFIG_REGULATOR_DEBUG=y we observe below debug logs. Changes help link VDDCPU pwm regulator to 12V regulator supply instead of dummy regulator.
[ 11.602281] pwm-regulator regulator-vddcpu: Looking up pwm-supply property
in node /regulator-vddcpu failed
[ 11.602344] VDDCPU: supplied by regulator-dummy
[ 11.602365] regulator-dummy: could not add device link regulator.11: -ENOENT
[ 11.602548] VDDCPU: 721 <--> 1022 mV at 1022 mV, enabled--- arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +1 -1
@@ -139,7 +139,7 @@ regulator-min-microvolt = <721000>; regulator-max-microvolt = <1022000>; - vin-supply = <&dc_in>; + pwm-supply = <&dc_in>; pwms = <&pwm_AO_cd 1 1250 0>; pwm-dutycycle-range = <100 0>;
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +1 -1
@@ -139,7 +139,7 @@ regulator-min-microvolt = <721000>; regulator-max-microvolt = <1022000>; - vin-supply = <&main_12v>; + pwm-supply = <&main_12v>; pwms = <&pwm_AO_cd 1 1250 0>; pwm-dutycycle-range = <100 0>;
arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +1 -1
@@ -139,7 +139,7 @@ regulator-min-microvolt = <721000>; regulator-max-microvolt = <1022000>; - vin-supply = <&dc_in>; + pwm-supply = <&dc_in>; pwms = <&pwm_AO_cd 1 1250 0>; pwm-dutycycle-range = <100 0>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 398/575 arm64: dts: meson-g12b: Fix the pwm regulator supply properties
In reply to Greg Kroah-HartmanFrom: Anand Moon <[email protected]>
[ Upstream commit 62183863f708c2464769e0d477c8ce9f3d326feb ]
After enabling CONFIG_REGULATOR_DEBUG=y we observer below debug logs. Changes help link VDDCP_A and VDDCPU_B pwm regulator to 12V regulator supply instead of dummy regulator.
[ 4.147196] VDDCPU_A: will resolve supply early: pwm [ 4.147216] pwm-regulator regulator-vddcpu-a: Looking up pwm-supply from device tree [ 4.147227] pwm-regulator regulator-vddcpu-a: Looking up pwm-supply property in node /regulator-vddcpu-a failed [ 4.147258] VDDCPU_A: supplied by regulator-dummy [ 4.147288] regulator-dummy: could not add device link regulator.12: -ENOENT [ 4.147353] VDDCPU_A: 721 <--> 1022 mV at 871 mV, enabled [ 4.152014] VDDCPU_B: will resolve supply early: pwm [ 4.152035] pwm-regulator regulator-vddcpu-b: Looking up pwm-supply from device tree [ 4.152047] pwm-regulator regulator-vddcpu-b: Looking up pwm-supply property in node /regulator-vddcpu-b failed [ 4.152079] VDDCPU_B: supplied by regulator-dummy [ 4.152108] regulator-dummy: could not add device link regulator.13: -ENOENT
--- arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 ++-- arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi +2 -2
@@ -18,7 +18,7 @@ regulator-min-microvolt = <690000>; regulator-max-microvolt = <1050000>; - vin-supply = <&dc_in>; + pwm-supply = <&dc_in>; pwms = <&pwm_ab 0 1250 0>; pwm-dutycycle-range = <100 0>;
@@ -37,7 +37,7 @@ regulator-min-microvolt = <690000>; regulator-max-microvolt = <1050000>; - vin-supply = <&vsys_3v3>; + pwm-supply = <&vsys_3v3>; pwms = <&pwm_AO_cd 1 1250 0>; pwm-dutycycle-range = <100 0>;
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +2 -2
@@ -128,7 +128,7 @@ regulator-min-microvolt = <721000>; regulator-max-microvolt = <1022000>; - vin-supply = <&main_12v>; + pwm-supply = <&main_12v>; pwms = <&pwm_ab 0 1250 0>; pwm-dutycycle-range = <100 0>;
@@ -147,7 +147,7 @@ regulator-min-microvolt = <721000>; regulator-max-microvolt = <1022000>; - vin-supply = <&main_12v>; + pwm-supply = <&main_12v>; pwms = <&pwm_AO_cd 1 1250 0>; pwm-dutycycle-range = <100 0>;
arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi +2 -2
@@ -96,7 +96,7 @@ regulator-min-microvolt = <721000>; regulator-max-microvolt = <1022000>; - vin-supply = <&main_12v>; + pwm-supply = <&main_12v>; pwms = <&pwm_ab 0 1250 0>; pwm-dutycycle-range = <100 0>;
@@ -115,7 +115,7 @@ regulator-min-microvolt = <721000>; regulator-max-microvolt = <1022000>; - vin-supply = <&main_12v>; + pwm-supply = <&main_12v>; pwms = <&pwm_AO_cd 1 1250 0>; pwm-dutycycle-range = <100 0>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 399/575 bus: ti-sysc: Fix timekeeping_suspended warning on resume
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit b3e9431854e8f305385d5de225441c0477b936cb ]
On resume we can get a warning at kernel/time/timekeeping.c:824 for timekeeping_suspended.
Let's fix this by adding separate functions for sysc_poll_reset_sysstatus() and sysc_poll_reset_sysconfig() and have the new functions handle also timekeeping_suspended.
If iopoll at some point supports timekeeping_suspended, we can just drop the custom handling from these functions.
--- drivers/bus/ti-sysc.c | 65 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-)
drivers/bus/ti-sysc.c +53 -12
@@ -17,6 +17,7 @@#include <linux/of_platform.h> #include <linux/slab.h> #include <linux/sys_soc.h> +#include <linux/timekeeping.h> #include <linux/iopoll.h> #include <linux/platform_data/ti-sysc.h>
@@ -223,37 +224,77 @@ static u32 sysc_read_sysstatus(struct sysc *ddata)return sysc_read (ddata, offset); } -/* Poll on reset status */ -static int sysc_wait_softreset (struct sysc *ddata) +static int sysc_poll_reset_sysstatus (struct sysc *ddata) { -u32 sysc_mask, syss_done, rstval; -int syss_offset, error =0 ; - -if (ddata->cap->regbits->srst_shift <0 ) -return 0 ; - - syss_offset = ddata->offsets[SYSC_SYSSTATUS ]; - sysc_mask =BIT (ddata->cap->regbits->srst_shift); +int error, retries; +u32 syss_done, rstval;if (ddata->cfg.quirks &SYSS_QUIRK_RESETDONE_INVERTED ) syss_done =0 ;else syss_done = ddata->cfg.syss_mask; -if (syss_offset >=0 ) { +if (likely (!timekeeping_suspended)) { error =readx_poll_timeout_atomic (sysc_read_sysstatus, ddata, rstval, (rstval & ddata->cfg.syss_mask) == syss_done,100 ,MAX_MODULE_SOFTRESET_WAIT ); + }else { + retries =MAX_MODULE_SOFTRESET_WAIT ; +while (retries--) { + rstval =sysc_read_sysstatus (ddata); +if ((rstval & ddata->cfg.syss_mask) == syss_done) +return 0 ; +udelay (2 );/* Account for udelay flakeyness */ + } + error = -ETIMEDOUT ; + } - }else if (ddata->cfg.quirks &SYSC_QUIRK_RESET_STATUS ) { +return error; +} + +static int sysc_poll_reset_sysconfig (struct sysc *ddata) +{ +int error, retries; +u32 sysc_mask, rstval; + + sysc_mask =BIT (ddata->cap->regbits->srst_shift); + +if (likely (!timekeeping_suspended)) { error =readx_poll_timeout_atomic (sysc_read_sysconfig, ddata, rstval, !(rstval & sysc_mask),100 ,MAX_MODULE_SOFTRESET_WAIT ); + }else { + retries =MAX_MODULE_SOFTRESET_WAIT ; +while (retries--) { + rstval =sysc_read_sysconfig (ddata); +if (!(rstval & sysc_mask)) +return 0 ; +udelay (2 );/* Account for udelay flakeyness */ + } + error = -ETIMEDOUT ; }return error; } +/* Poll on reset status */ +static int sysc_wait_softreset (struct sysc *ddata) +{ +int syss_offset, error =0 ; + +if (ddata->cap->regbits->srst_shift <0 ) +return 0 ; + + syss_offset = ddata->offsets[SYSC_SYSSTATUS ]; + +if (syss_offset >=0 ) + error =sysc_poll_reset_sysstatus (ddata); +else if (ddata->cfg.quirks &SYSC_QUIRK_RESET_STATUS ) + error =sysc_poll_reset_sysconfig (ddata); + +return error; +} +static int sysc_add_named_clock_from_child (struct sysc *ddata,const char *name,const char *optfck_name)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 400/575 ARM: dts: at91: tse850: the emac<->phy interface is rmii
In reply to Greg Kroah-HartmanFrom: Peter Rosin <[email protected]>
[ Upstream commit dcdbc335a91a26e022a803e1a6b837266989c032 ]
This went unnoticed until commit 7897b071ac3b ("net: macb: convert to phylink") which tickled the problem. The sama5d3 emac has never been capable of rgmii, and it all just happened to work before that commit.
--- arch/arm/boot/dts/at91-tse850-3.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/at91-tse850-3.dts +1 -1
@@ -262,7 +262,7 @@ &macb1 { status = "okay"; - phy-mode = "rgmii"; + phy-mode = "rmii"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 401/575 scsi: dc395: Fix error case unwinding
In reply to Greg Kroah-HartmanFrom: Tong Zhang <[email protected]>
[ Upstream commit cbd9a3347c757383f3d2b50cf7cfd03eb479c481 ]
dc395x_init_one()->adapter_init() might fail. In this case, the acb is already cleaned up by adapter_init(), no need to do that in adapter_uninit(acb) again.
[ 1.252251] dc395x: adapter init failed [ 1.254900] RIP: 0010:adapter_uninit+0x94/0x170 [dc395x] [ 1.260307] Call Trace: [ 1.260442] dc395x_init_one.cold+0x72a/0x9bb [dc395x]
--- drivers/scsi/dc395x.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/dc395x.c +1 -0
@@ -4658,6 +4658,7 @@ static int dc395x_init_one(struct pci_dev *dev, const struct pci_device_id *id)/* initialise the adapter and everything we need */ if (adapter_init (acb, io_port_base, io_port_len, irq)) {dprintkl (KERN_INFO ,"adapter init failed\n" ); + acb =NULL ; goto fail; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 402/575 MIPS: loongson64: make CPU_LOONGSON64 depends on MIPS_FP_SUPPORT
In reply to Greg Kroah-HartmanFrom: Jackie Liu <[email protected]>
[ Upstream commit 7f3b3c2bfa9c93ab9b5595543496f570983dc330 ]
mach/loongson64 fails to build when the FPU support is disabled:
arch/mips/loongson64/cop2-ex.c:45:15: error: implicit declaration of function ‘__is_fpu_owner’; did you mean ‘is_fpu_owner’? [-Werror=implicit-function-declaration] arch/mips/loongson64/cop2-ex.c:98:30: error: ‘struct thread_struct’ has no member named ‘fpu’arch/mips/loongson64/cop2-ex.c:99:30: error: ‘struct thread_struct’ has no member named ‘fpu’arch/mips/loongson64/cop2-ex.c:131:43: error: ‘struct thread_struct’ has no member named ‘fpu’arch/mips/loongson64/cop2-ex.c:137:38: error: ‘struct thread_struct’ has no member named ‘fpu’arch/mips/loongson64/cop2-ex.c:203:30: error: ‘struct thread_struct’ has no member named ‘fpu’arch/mips/loongson64/cop2-ex.c:219:30: error: ‘struct thread_struct’ has no member named ‘fpu’arch/mips/loongson64/cop2-ex.c:283:38: error: ‘struct thread_struct’ has no member named ‘fpu’arch/mips/loongson64/cop2-ex.c:301:38: error: ‘struct thread_struct’ has no member named ‘fpu’
--- arch/mips/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/mips/Kconfig +1 -0
@@ -1380,6 +1380,7 @@ config CPU_LOONGSON64 select MIPS_ASID_BITS_VARIABLE select MIPS_PGD_C0_CONTEXT select MIPS_L1_CACHE_SHIFT_6 + select MIPS_FP_SUPPORT select GPIOLIB select SWIOTLB select HAVE_KVM
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 403/575 JFS: fix memleak in jfs_mount
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit c48a14dca2cb57527dde6b960adbe69953935f10 ]
In jfs_mount, when diMount(ipaimap2) fails, it goes to errout35. However, the following code does not free ipaimap2 allocated by diReadSpecial.
Fix this by refactoring the error handling code of jfs_mount. To be specific, modify the lable name and free ipaimap2 when the above error ocurrs.
--- fs/jfs/jfs_mount.c | 51 ++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 29 deletions(-)
fs/jfs/jfs_mount.c +22 -29
@@ -81,14 +81,14 @@ int jfs_mount(struct super_block *sb)* (initialize mount inode from the superblock) */ if ((rc =chkSuper (sb))) { - goto errout20; + goto out; } ipaimap =diReadSpecial (sb,AGGREGATE_I ,0 );if (ipaimap ==NULL ) {jfs_err ("jfs_mount: Failed to read AGGREGATE_I" ); rc = -EIO ; - goto errout20; + goto out; } sbi->ipaimap = ipaimap;
@@ -99,7 +99,7 @@ int jfs_mount(struct super_block *sb)*/ if ((rc =diMount (ipaimap))) {jfs_err ("jfs_mount: diMount(ipaimap) failed w/rc = %d" , rc); - goto errout21; + goto err_ipaimap; }/*
@@ -108,7 +108,7 @@ int jfs_mount(struct super_block *sb) ipbmap =diReadSpecial (sb,BMAP_I ,0 );if (ipbmap ==NULL ) { rc = -EIO ; - goto errout22; + goto err_umount_ipaimap; }jfs_info ("jfs_mount: ipbmap:0x%p" , ipbmap);
@@ -120,7 +120,7 @@ int jfs_mount(struct super_block *sb)*/ if ((rc =dbMount (ipbmap))) {jfs_err ("jfs_mount: dbMount failed w/rc = %d" , rc); - goto errout22; + goto err_ipbmap; }/*
@@ -139,7 +139,7 @@ int jfs_mount(struct super_block *sb)if (!ipaimap2) {jfs_err ("jfs_mount: Failed to read AGGREGATE_I" ); rc = -EIO ; - goto errout35; + goto err_umount_ipbmap; } sbi->ipaimap2 = ipaimap2;
@@ -151,7 +151,7 @@ int jfs_mount(struct super_block *sb)if ((rc =diMount (ipaimap2))) {jfs_err ("jfs_mount: diMount(ipaimap2) failed, rc = %d" , rc); - goto errout35; + goto err_ipaimap2; } }else /* Secondary aggregate inode table is not valid */
@@ -168,7 +168,7 @@ int jfs_mount(struct super_block *sb)jfs_err ("jfs_mount: Failed to read FILESYSTEM_I" );/* open fileset secondary inode allocation map */ rc = -EIO ; - goto errout40; + goto err_umount_ipaimap2; }jfs_info ("jfs_mount: ipimap:0x%p" , ipimap);
@@ -178,41 +178,34 @@ int jfs_mount(struct super_block *sb)/* initialize fileset inode allocation map */ if ((rc =diMount (ipimap))) {jfs_err ("jfs_mount: diMount failed w/rc = %d" , rc); - goto errout41; + goto err_ipimap; } - goto out; +return rc;/* * unwind on error */ - errout41:/* close fileset inode allocation map inode */ +err_ipimap: +/* close fileset inode allocation map inode */ diFreeSpecial (ipimap); - - errout40:/* fileset closed */ - +err_umount_ipaimap2:/* close secondary aggregate inode allocation map */ -if (ipaimap2) { +if (ipaimap2)diUnmount (ipaimap2,1 ); +err_ipaimap2: +/* close aggregate inodes */ +if (ipaimap2)diFreeSpecial (ipaimap2); - } - - errout35: - -/* close aggregate block allocation map */ +err_umount_ipbmap:/* close aggregate block allocation map */ dbUnmount (ipbmap,1 ); +err_ipbmap:/* close aggregate inodes */ diFreeSpecial (ipbmap); - - errout22:/* close aggregate inode allocation map */ - +err_umount_ipaimap:/* close aggregate inode allocation map */ diUnmount (ipaimap,1 ); - - errout21:/* close aggregate inodes */ +err_ipaimap:/* close aggregate inodes */ diFreeSpecial (ipaimap); - errout20:/* aggregate closed */ - - out: - +out:if (rc)jfs_err ("Mount JFS Failure: %d" , rc);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 404/575 arm64: dts: qcom: msm8916: Fix Secondary MI2S bit clock
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 8199a0b31e76d158ac14841e7119890461f8c595 ]
At the moment, playing audio on Secondary MI2S will just end up getting stuck, without actually playing any audio. This happens because the wrong bit clock is configured when playing audio on Secondary MI2S.
The PRI_I2S_CLK (better name: SPKR_I2S_CLK) is used by the SPKR audio mux block that provides both Primary and Secondary MI2S.
The SEC_I2S_CLK (better name: MIC_I2S_CLK) is used by the MIC audio mux block that provides Tertiary MI2S. Quaternary MI2S is also part of the MIC audio mux but has its own clock (AUX_I2S_CLK).
This means that (quite confusingly) the SEC_I2S_CLK is not actually used for Secondary MI2S as the name would suggest. Secondary MI2S needs to have the same clock as Primary MI2S configured.
Fix the clock list for the lpass node in the device tree and add a comment to clarify this confusing naming. With these changes, audio can be played correctly on Secondary MI2S.
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +7 -1
@@ -1322,11 +1322,17 @@ lpass: audio-controller@7708000 { status = "disabled"; compatible = "qcom,lpass-cpu-apq8016"; + + /* + * Note: Unlike the name would suggest, the SEC_I2S_CLK + * is actually only used by Tertiary MI2S while + * Primary/Secondary MI2S both use the PRI_I2S_CLK. + */ clocks = <&gcc GCC_ULTAUDIO_AHBFABRIC_IXFABRIC_CLK>, <&gcc GCC_ULTAUDIO_PCNOC_MPORT_CLK>, <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>, <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>, - <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>, + <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>, <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>, <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 405/575 arm64: dts: renesas: beacon: Fix Ethernet PHY mode
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 59a8bda062f8646d99ff8c4956adf37dee1cb75e ]
While networking works fine in RGMII mode when using the Linux generic PHY driver, it fails when using the Atheros PHY driver.
Fix this by correcting the Ethernet PHY mode to RGMII-RXID, which works fine with both drivers.
--- arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi +1 -0
@@ -54,6 +54,7 @@ &avb { pinctrl-0 = <&avb_pins>; pinctrl-names = "default"; + phy-mode = "rgmii-rxid"; phy-handle = <&phy0>; rx-internal-delay-ps = <1800>; tx-internal-delay-ps = <2000>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 406/575 arm64: dts: qcom: pm8916: Remove wrong reg-names for rtc@6000
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 483de2b44cd3a168458f8f9ff237e78a434729bc ]
While removing the size from the "reg" properties in pm8916.dtsi, commit bd6429e81010 ("ARM64: dts: qcom: Remove size elements from pmic reg properties") mistakenly also removed the second register address for the rtc@6000 device. That one did not represent the size of the register region but actually the address of the second "alarm" register region of the rtc@6000 device.
Now there are "reg-names" for two "reg" elements, but there is actually only one "reg" listed.
Since the DT schema for "qcom,pm8941-rtc" only expects one "reg" element anyway, just drop the "reg-names" entirely to fix this.
--- arch/arm64/boot/dts/qcom/pm8916.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/qcom/pm8916.dtsi +0 -1
@@ -86,7 +86,6 @@ rtc@6000 { compatible = "qcom,pm8941-rtc"; reg = <0x6000>; - reg-names = "rtc", "alarm"; interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 407/575 ALSA: hda: Reduce udelay() at SKL+ position reporting
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 46243b85b0ec5d2cee7545e5ce18c015ce91957e ]
The position reporting on Intel Skylake and later chips via azx_get_pos_skl() contains a udelay(20) call for the capture streams. A call for this alone doesn't sound too harmful. However, as the pointer PCM ops is one of the hottest path in the PCM operations -- especially for the timer-scheduled operations like PulseAudio -- such a delay hogs CPU usage significantly in the total performance.
The code there was taken from the original code in ASoC SST Skylake driver blindly. The udelay() is a workaround for the case where the reported position is behind the period boundary at the timing triggered from interrupts; applications often expect that the full data is available for the whole period when returned (and also that's the definition of the ALSA PCM period).
OTOH, HD-audio (legacy) driver has already some workarounds for the delayed position reporting due to its relatively large FIFO, such as the BDL position adjustment and the delayed period-elapsed call in the work. That said, the udelay() is almost superfluous for HD-audio driver unlike SST, and we can drop the udelay().
Though, the current code doesn't guarantee the full period readiness as mentioned in the above, but rather it checks the wallclock and detects the unexpected jump. That's one missing piece, and the drop of udelay() needs a bit more sanity checks for the delayed handling.
This patch implements those: the drop of udelay() call in azx_get_pos_skl() and the more proper check of hwptr in azx_position_ok(). The latter change is applied only for the case where the stream is running in the normal mode without no_period_wakeup flag. When no_period_wakeup is set, it essentially ignores the period handling and rather concentrates only on the current position; which implies that we don't need to care about the period boundary at all.
--- sound/pci/hda/hda_intel.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
sound/pci/hda/hda_intel.c +23 -5
@@ -672,13 +672,17 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev)* the update-IRQ timing. The IRQ is issued before actually the * data is processed. So, we need to process it afterwords in a * workqueue. +* +* Returns 1 if OK to proceed, 0 for delay handling, -1 for skipping update */ static int azx_position_ok (struct azx *chip,struct azx_dev *azx_dev) {struct snd_pcm_substream *substream = azx_dev->core.substream; +struct snd_pcm_runtime *runtime = substream->runtime;int stream = substream->stream;u32 wallclk;unsigned int pos; +snd_pcm_uframes_t hwptr, target; wallclk =azx_readl (chip,WALLCLK ) - azx_dev->core.start_wallclk;if (wallclk < (azx_dev->core.period_wallclk *2 ) /3 )
@@ -715,6 +719,24 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)/* NG - it's below the first next period boundary */ return chip->bdl_pos_adj ?0 :-1 ; azx_dev->core.start_wallclk += wallclk; + +if (azx_dev->core.no_period_wakeup) +return 1 ;/* OK, no need to check period boundary */ + +if (runtime->hw_ptr_base != runtime->hw_ptr_interrupt) +return 1 ;/* OK, already in hwptr updating process */ + +/* check whether the period gets really elapsed */ + pos =bytes_to_frames (runtime, pos); + hwptr = runtime->hw_ptr_base + pos; +if (hwptr < runtime->status->hw_ptr) + hwptr += runtime->buffer_size; + target = runtime->hw_ptr_interrupt + runtime->period_size; +if (hwptr < target) { +/* too early wakeup, process it later */ +return chip->bdl_pos_adj ?0 :-1 ; + } +return 1 ;/* OK, it's fine */ }
@@ -909,11 +931,7 @@ static unsigned int azx_get_pos_skl(struct azx *chip, struct azx_dev *azx_dev)if (azx_dev->core.substream->stream ==SNDRV_PCM_STREAM_PLAYBACK )return azx_skl_get_dpib_pos (chip, azx_dev); -/* For capture, we need to read posbuf, but it requires a delay -* for the possible boundary overlap; the read of DPIB fetches the -* actual posbuf -*/ -udelay (20 ); +/* read of DPIB fetches the actual posbuf */ azx_skl_get_dpib_pos (chip, azx_dev);return azx_get_pos_posbuf (chip, azx_dev); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 408/575 ALSA: hda: Release controller display power during shutdown/reboot
In reply to Greg Kroah-HartmanFrom: Imre Deak <[email protected]>
[ Upstream commit 472e18f63c425dda97b888f40f858ea54e3efc17 ]
Make sure the HDA driver's display power reference is released during shutdown/reboot.
During the shutdown/reboot sequence the pci device core calls the pm_runtime_resume handler for all devices before calling the driver's shutdown callback and so the HDA driver's runtime resume callback will acquire a display power reference (on HSW/BDW). This triggers a power reference held WARN on HSW/BDW in the i915 driver's subsequent shutdown handler, which expects all display power references to be released by that time.
Since the HDA controller is stopped in the shutdown handler in any case, let's follow here the same sequence as the one during runtime suspend. This will also reset the HDA link and drop the display power reference, getting rid of the above WARN.
Tested on HSW.
v2:
- Fix the build for CONFIG_PM=n (Takashi)
- s/__azx_runtime_suspend/azx_shutdown_chip/
--- sound/pci/hda/hda_intel.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
sound/pci/hda/hda_intel.c +11 -11
@@ -936,6 +936,14 @@ static unsigned int azx_get_pos_skl(struct azx *chip, struct azx_dev *azx_dev)return azx_get_pos_posbuf (chip, azx_dev); } +static void azx_shutdown_chip (struct azx *chip) +{ +azx_stop_chip (chip); +azx_enter_link_reset (chip); +azx_clear_irq_pending (chip); +display_power (chip, false); +} +#ifdef CONFIG_PM static DEFINE_MUTEX (card_list_lock);static LIST_HEAD (card_list);
@@ -995,14 +1003,6 @@ static bool azx_is_pm_ready(struct snd_card *card)return true; } -static void __azx_runtime_suspend (struct azx *chip) -{ -azx_stop_chip (chip); -azx_enter_link_reset (chip); -azx_clear_irq_pending (chip); -display_power (chip, false); -} -static void __azx_runtime_resume (struct azx *chip) { struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
@@ -1081,7 +1081,7 @@ static int azx_suspend(struct device *dev) chip = card->private_data; bus =azx_bus (chip); -__azx_runtime_suspend (chip); +azx_shutdown_chip (chip);if (bus->irq >=0 ) {free_irq (bus->irq, chip); bus->irq =-1 ;
@@ -1160,7 +1160,7 @@ static int azx_runtime_suspend(struct device *dev)/* enable controller wake up event */ azx_writew (chip,WAKEEN ,azx_readw (chip,WAKEEN ) |STATESTS_INT_MASK ); -__azx_runtime_suspend (chip); +azx_shutdown_chip (chip);trace_azx_runtime_suspend (chip);return 0 ; }
@@ -2461,7 +2461,7 @@ static void azx_shutdown(struct pci_dev *pci)return ; chip = card->private_data;if (chip && chip->running) -azx_stop_chip (chip); +azx_shutdown_chip (chip); }/* PCI IDs */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 409/575 ALSA: hda: Fix hang during shutdown due to link reset
In reply to Greg Kroah-HartmanFrom: Imre Deak <[email protected]>
[ Upstream commit 0165c4e19f6ec76b535de090e4bd145c73810c51 ]
During system shutdown codecs may be still active, and resetting the controller->codec HW link in this state - based on the bug reporter's tests - leads to the shutdown sequence to get stuck. This happens at least on the reporter's KBL system with an ALC662 codec.
For now fix the issue by skipping the link reset step.
--- sound/pci/hda/hda_intel.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
sound/pci/hda/hda_intel.c +9 -3
@@ -936,10 +936,11 @@ static unsigned int azx_get_pos_skl(struct azx *chip, struct azx_dev *azx_dev)return azx_get_pos_posbuf (chip, azx_dev); } -static void azx_shutdown_chip (struct azx *chip) +static void __azx_shutdown_chip (struct azx *chip,bool skip_link_reset) {azx_stop_chip (chip); -azx_enter_link_reset (chip); +if (!skip_link_reset) +azx_enter_link_reset (chip);azx_clear_irq_pending (chip);display_power (chip, false); }
@@ -948,6 +949,11 @@ static void azx_shutdown_chip(struct azx *chip)static DEFINE_MUTEX (card_list_lock);static LIST_HEAD (card_list); +static void azx_shutdown_chip (struct azx *chip) +{ +__azx_shutdown_chip (chip, false); +} +static void azx_add_card_list (struct azx *chip) { struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
@@ -2461,7 +2467,7 @@ static void azx_shutdown(struct pci_dev *pci)return ; chip = card->private_data;if (chip && chip->running) -azx_shutdown_chip (chip); +__azx_shutdown_chip (chip, true); }/* PCI IDs */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 410/575 ALSA: hda: Use position buffer for SKL+ again
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit c4ca3871e21fa085096316f5f8d9975cf3dfde1d ]
The commit f87e7f25893d ("ALSA: hda - Improved position reporting on SKL+") changed the PCM position report for SKL+ chips to use DPIB, but according to Pierre, DPIB is no best choice for the accurate position reports and it often reports too early. The recommended method is rather the classical position buffer.
This patch makes the PCM position reporting on SKL+ back to the position buffer again.
--- sound/pci/hda/hda_intel.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-)
sound/pci/hda/hda_intel.c +1 -22
@@ -915,27 +915,6 @@ static int azx_get_delay_from_fifo(struct azx *chip, struct azx_dev *azx_dev,return substream->runtime->delay; } -static unsigned int azx_skl_get_dpib_pos (struct azx *chip, -struct azx_dev *azx_dev) -{ -return _snd_hdac_chip_readl (azx_bus (chip), -AZX_REG_VS_SDXDPIB_XBASE + - (AZX_REG_VS_SDXDPIB_XINTERVAL * - azx_dev->core.index)); -} - -/* get the current DMA position with correction on SKL+ chips */ -static unsigned int azx_get_pos_skl (struct azx *chip,struct azx_dev *azx_dev) -{ -/* DPIB register gives a more accurate position for playback */ -if (azx_dev->core.substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) -return azx_skl_get_dpib_pos (chip, azx_dev); - -/* read of DPIB fetches the actual posbuf */ -azx_skl_get_dpib_pos (chip, azx_dev); -return azx_get_pos_posbuf (chip, azx_dev); -} -static void __azx_shutdown_chip (struct azx *chip,bool skip_link_reset) {azx_stop_chip (chip);
@@ -1632,7 +1611,7 @@ static void assign_position_fix(struct azx *chip, int fix) [POS_FIX_POSBUF] = azx_get_pos_posbuf, [POS_FIX_VIACOMBO] = azx_via_get_position, [POS_FIX_COMBO] = azx_get_pos_lpib, - [POS_FIX_SKL] = azx_get_pos_skl, + [POS_FIX_SKL] = azx_get_pos_posbuf, [POS_FIX_FIFO] = azx_get_pos_fifo, };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 411/575 soundwire: debugfs: use controller id and link_id for debugfs
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 75eac387a2539aa6c6bbee3affa23435f2096396 ]
link_id can be zero and if we have multiple controller instances in a system like Qualcomm debugfs will end-up with duplicate namespace resulting in incorrect debugfs entries.
Using bus-id and link-id combination should give a unique debugfs directory entry and should fix below warning too.
"debugfs: Directory 'master-0' with parent 'soundwire' already present!"
--- drivers/soundwire/debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/debugfs.c +1 -1
@@ -19,7 +19,7 @@ void sdw_bus_debugfs_init(struct sdw_bus *bus)return ;/* create the debugfs master-N */ -snprintf (name,sizeof (name),"master-%d" , bus->link_id); +snprintf (name,sizeof (name),"master-%d-%d" , bus->id, bus->link_id); bus->debugfs =debugfs_create_dir (name, sdw_debugfs_root); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 412/575 scsi: pm80xx: Fix misleading log statement in pm8001_mpi_get_nvmd_resp()
In reply to Greg Kroah-HartmanFrom: Igor Pylypiv <[email protected]>
[ Upstream commit 4084a7235d38311a77c86ba69ba849bd787db87b ]
pm8001_mpi_get_nvmd_resp() handles a GET_NVMD_DATA response, not a SET_NVMD_DATA response, as the log statement implies.
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -3107,7 +3107,7 @@ pm8001_mpi_get_nvmd_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)* fw_control_context->usrAddr */ complete (pm8001_ha->nvmd_completion); -pm8001_dbg (pm8001_ha,MSG ,"Set nvm data complete!\n" ); +pm8001_dbg (pm8001_ha,MSG ,"Get nvmd data complete!\n" ); ccb->task =NULL ; ccb->ccb_tag =0xFFFFFFFF ;pm8001_tag_free (pm8001_ha, tag);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 413/575 driver core: Fix possible memory leak in device_link_add()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit df0a18149474c7e6b21f6367fbc6bc8d0f192444 ]
I got memory leak as follows:
unreferenced object 0xffff88801f0b2200 (size 64):
comm "i2c-lis2hh12-21", pid 5455, jiffies 4294944606 (age 15.224s) hex dump (first 32 bytes):
72 65 67 75 6c 61 74 6f 72 3a 72 65 67 75 6c 61 regulator:regula
74 6f 72 2e 30 2d 2d 69 32 63 3a 31 2d 30 30 31 tor.0--i2c:1-001
backtrace:
[<00000000bf5b0c3b>] __kmalloc_track_caller+0x19f/0x3a0
[<0000000050da42d9>] kvasprintf+0xb5/0x150
[<000000004bbbed13>] kvasprintf_const+0x60/0x190
[<00000000cdac7480>] kobject_set_name_vargs+0x56/0x150
[<00000000bf83f8e8>] dev_set_name+0xc0/0x100
[<00000000cc1cf7e3>] device_link_add+0x6b4/0x17c0
[<000000009db9faed>] _regulator_get+0x297/0x680
[<00000000845e7f2b>] _devm_regulator_get+0x5b/0xe0
[<000000003958ee25>] st_sensors_power_enable+0x71/0x1b0 [st_sensors]
[<000000005f450f52>] st_accel_i2c_probe+0xd9/0x150 [st_accel_i2c]
[<00000000b5f2ab33>] i2c_device_probe+0x4d8/0xbe0
[<0000000070fb977b>] really_probe+0x299/0xc30
[<0000000088e226ce>] __driver_probe_device+0x357/0x500
[<00000000c21dda32>] driver_probe_device+0x4e/0x140
[<000000004e650441>] __device_attach_driver+0x257/0x340
[<00000000cf1891b8>] bus_for_each_drv+0x166/0x1e0When device_register() returns an error, the name allocated in dev_set_name() will be leaked, the put_device() should be used instead of kfree() to give up the device reference, then the name will be freed in kobject_cleanup() and the references of consumer and supplier will be decreased in device_link_release_fn().
--- drivers/base/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/base/core.c +1 -3
@@ -668,9 +668,7 @@ struct device_link *device_link_add(struct device *consumer,dev_bus_name (supplier),dev_name (supplier), dev_bus_name(consumer), dev_name(consumer));if (device_register (&link->link_dev)) { -put_device (consumer); -put_device (supplier); -kfree (link); +put_device (&link->link_dev); link =NULL ; goto out; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 414/575 arm: dts: omap3-gta04a4: accelerometer irq fix
In reply to Greg Kroah-HartmanFrom: Andreas Kemnade <[email protected]>
[ Upstream commit 884ea75d79a36faf3731ad9d6b9c29f58697638d ]
Fix typo in pinctrl. It did only work because the bootloader seems to have initialized it.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04.dtsi +1 -1
@@ -515,7 +515,7 @@ compatible = "bosch,bma180"; reg = <0x41>; pinctrl-names = "default"; - pintcrl-0 = <&bma180_pins>; + pinctrl-0 = <&bma180_pins>; interrupt-parent = <&gpio4>; interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */ };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 415/575 ASoC: SOF: topology: do not power down primary core during topology removal
In reply to Greg Kroah-HartmanFrom: Ranjani Sridharan <[email protected]>
[ Upstream commit ec626334eaffe101df9ed79e161eba95124e64ad ]
When removing the topology components, do not power down the primary core. Doing so will result in an IPC timeout when the SOF PCI device runtime suspends.
--- sound/soc/sof/topology.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/soc/sof/topology.c +9 -0
@@ -2590,6 +2590,15 @@ static int sof_widget_unload(struct snd_soc_component *scomp,/* power down the pipeline schedule core */ pipeline = swidget->private; + +/* +* Runtime PM should still function normally if topology loading fails and +* it's components are unloaded. Do not power down the primary core so that the +* CTX_SAVE IPC can succeed during runtime suspend. +*/ +if (pipeline->core ==SOF_DSP_PRIMARY_CORE ) +break ; + ret =snd_sof_dsp_core_power_down (sdev,1 << pipeline->core);if (ret <0 ) dev_err(scomp->dev, "error: powering down pipeline schedule core %d\n",
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 416/575 soc/tegra: Fix an error handling path in tegra_powergate_power_up()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 986b5094708e508baa452a23ffe809870934a7df ]
If an error occurs after a successful tegra_powergate_enable_clocks() call, it must be undone by a tegra_powergate_disable_clocks() call, as already done in the below and above error handling paths of this function.
Update the 'goto' to branch at the correct place of the error handling path.
--- drivers/soc/tegra/pmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/tegra/pmc.c +1 -1
@@ -705,7 +705,7 @@ static int tegra_powergate_power_up(struct tegra_powergate *pg, err =reset_control_deassert (pg->reset);if (err) - goto powergate_off; + goto disable_clks;usleep_range (10 ,20 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 417/575 memory: fsl_ifc: fix leak of irq and nand_irq in fsl_ifc_ctrl_probe
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 4ed2f3545c2e5acfbccd7f85fea5b1a82e9862d7 ]
The error handling code of fsl_ifc_ctrl_probe is problematic. When fsl_ifc_ctrl_init fails or request_irq of fsl_ifc_ctrl_dev->irq fails, it forgets to free the irq and nand_irq. Meanwhile, if request_irq of fsl_ifc_ctrl_dev->nand_irq fails, it will still free nand_irq even if the request_irq is not successful.
Fix this by refactoring the error handling code.
--- drivers/memory/fsl_ifc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/memory/fsl_ifc.c +6 -7
@@ -263,7 +263,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) ret =fsl_ifc_ctrl_init (fsl_ifc_ctrl_dev);if (ret <0 ) - goto err; + goto err_unmap_nandirq;init_waitqueue_head (&fsl_ifc_ctrl_dev->nand_wait);
@@ -272,7 +272,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)if (ret !=0 ) {dev_err (&dev->dev,"failed to install irq (%d)\n" , fsl_ifc_ctrl_dev->irq); - goto err_irq; + goto err_unmap_nandirq; }if (fsl_ifc_ctrl_dev->nand_irq) {
@@ -281,17 +281,16 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)if (ret !=0 ) {dev_err (&dev->dev,"failed to install irq (%d)\n" , fsl_ifc_ctrl_dev->nand_irq); - goto err_nandirq; + goto err_free_irq; } }return 0 ; -err_nandirq: -free_irq (fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_ctrl_dev); -irq_dispose_mapping (fsl_ifc_ctrl_dev->nand_irq); -err_irq: +err_free_irq:free_irq (fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev); +err_unmap_nandirq: +irq_dispose_mapping (fsl_ifc_ctrl_dev->nand_irq);irq_dispose_mapping (fsl_ifc_ctrl_dev->irq); err:iounmap (fsl_ifc_ctrl_dev->gregs);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 418/575 clk: at91: check pmc node status before registering syscore ops
In reply to Greg Kroah-HartmanFrom: Clément Léger <[email protected]>
[ Upstream commit c405f5c15e9f6094f2fa1658e73e56f3058e2122 ]
Currently, at91 pmc driver always register the syscore_ops whatever the status of the pmc node that has been found. When set as secure and disabled, the pmc should not be accessed or this will generate abort exceptions.
To avoid this, add a check on node availability before registering the syscore operations.
--- drivers/clk/at91/pmc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/clk/at91/pmc.c +5 -0
@@ -267,6 +267,11 @@ static int __init pmc_register_ops(void)if (!np)return -ENODEV ; +if (!of_device_is_available (np)) { +of_node_put (np); +return -ENODEV ; + } + pmcreg =device_node_to_regmap (np);of_node_put (np);if (IS_ERR (pmcreg))
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 419/575 video: fbdev: chipsfb: use memset_io() instead of memset()
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit f2719b26ae27282c145202ffd656d5ff1fe737cc ]
While investigating a lockup at startup on Powerbook 3400C, it was identified that the fbdev driver generates alignment exception at startup:
--- interrupt: 600 at memset+0x60/0xc0
NIP: c0021414 LR: c03fc49c CTR: 00007fff
REGS: ca021c10 TRAP: 0600 Tainted: G W (5.14.2-pmac-00727-g12a41fa69492)
MSR: 00009032 <EE,ME,IR,DR,RI> CR: 44008442 XER: 20000100
DAR: cab80020 DSISR: 00017c07
GPR00: 00000007 ca021cd0 c14412e0 cab80000 00000000 00100000 cab8001c 00000004
GPR08: 00100000 00007fff 00000000 00000000 84008442 00000000 c0006fb4 00000000
GPR16: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00100000
GPR24: 00000000 81800000 00000320 c15fa400 c14d1878 00000000 c14d1800 c094e19c NIP [c0021414] memset+0x60/0xc0
LR [c03fc49c] chipsfb_pci_init+0x160/0x580
--- interrupt: 600
[ca021cd0] [c03fc46c] chipsfb_pci_init+0x130/0x580 (unreliable) [ca021d20] [c03a3a70] pci_device_probe+0xf8/0x1b8
[ca021d50] [c043d584] really_probe.part.0+0xac/0x388
[ca021d70] [c043d914] __driver_probe_device+0xb4/0x170
[ca021d90] [c043da18] driver_probe_device+0x48/0x144
[ca021dc0] [c043e318] __driver_attach+0x11c/0x1c4
[ca021de0] [c043ad30] bus_for_each_dev+0x88/0xf0
[ca021e10] [c043c724] bus_add_driver+0x190/0x22c
[ca021e40] [c043ee94] driver_register+0x9c/0x170
[ca021e60] [c0006c28] do_one_initcall+0x54/0x1ec
[ca021ed0] [c08246e4] kernel_init_freeable+0x1c0/0x270
[ca021f10] [c0006fdc] kernel_init+0x28/0x11c
[ca021f30] [c0017148] ret_from_kernel_thread+0x14/0x1c Instruction dump:
7d4601a4 39490777 7d4701a4 39490888 7d4801a4 39490999 7d4901a4 39290aaa 7d2a01a4 4c00012c 4bfffe88 0fe00000 <4bfffe80> 9421fff0 38210010 48001970
This is due to 'dcbz' instruction being used on non-cached memory. 'dcbz' instruction is used by memset() to zeroize a complete cacheline at once, and memset() is not expected to be used on non cached memory.
When performing a 'sparse' check on fbdev driver, it also appears that the use of memset() is unexpected:
drivers/video/fbdev/chipsfb.c:334:17: warning: incorrect type in argument 1 (different address spaces)
drivers/video/fbdev/chipsfb.c:334:17: expected void *
drivers/video/fbdev/chipsfb.c:334:17: got char [noderef] __iomem *screen_base
drivers/video/fbdev/chipsfb.c:334:15: warning: memset with byte count of 1048576
Use fb_memset() instead of memset(). fb_memset() is defined as memset_io() for powerpc.
--- drivers/video/fbdev/chipsfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/chipsfb.c +1 -1
@@ -331,7 +331,7 @@ static const struct fb_var_screeninfo chipsfb_var = {static void init_chips (struct fb_info *p,unsigned long addr) { -memset (p->screen_base,0 ,0x100000 ); +fb_memset (p->screen_base,0 ,0x100000 ); p->fix = chipsfb_fix; p->fix.smem_start = addr;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 420/575 powerpc: Refactor is_kvm_guest() declaration to new header
In reply to Greg Kroah-HartmanFrom: Srikar Dronamraju <[email protected]>
[ Upstream commit 92cc6bf01c7f4c5cfefd1963985c0064687ebeda ]
Only code/declaration movement, in anticipation of doing a KVM-aware vcpu_is_preempted(). No additional changes.
--- arch/powerpc/include/asm/firmware.h | 6 ------ arch/powerpc/include/asm/kvm_guest.h | 15 +++++++++++++++ arch/powerpc/include/asm/kvm_para.h | 2 +- arch/powerpc/kernel/firmware.c | 1 + arch/powerpc/platforms/pseries/smp.c | 1 + 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 arch/powerpc/include/asm/kvm_guest.h
arch/powerpc/include/asm/firmware.h +0 -6
@@ -134,12 +134,6 @@ extern int ibm_nmi_interlock_token;extern unsigned int __start___fw_ftr_fixup, __stop___fw_ftr_fixup; -#if defined(CONFIG_PPC_PSERIES ) || defined(CONFIG_KVM_GUEST ) -bool is_kvm_guest (void ); -#else -static inline bool is_kvm_guest (void ) {return false; } -#endif -#ifdef CONFIG_PPC_PSERIES void pseries_probe_fw_features (void );#else
arch/powerpc/include/asm/kvm_guest.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2020 IBM Corporation +*/ + +#ifndef _ASM_POWERPC_KVM_GUEST_H_ +#define _ASM_POWERPC_KVM_GUEST_H_ + +#if defined(CONFIG_PPC_PSERIES ) || defined(CONFIG_KVM_GUEST ) +bool is_kvm_guest (void ); +#else +static inline bool is_kvm_guest (void ) {return false; } +#endif + +#endif /* _ASM_POWERPC_KVM_GUEST_H_ */
arch/powerpc/include/asm/kvm_para.h +1 -1
@@ -8,7 +8,7 @@#ifndef __POWERPC_KVM_PARA_H__#define __POWERPC_KVM_PARA_H__ -#include <asm/firmware.h> +#include <asm/kvm_guest.h> #include <uapi/asm/kvm_para.h>
arch/powerpc/kernel/firmware.c +1 -0
@@ -14,6 +14,7 @@#include <linux/of.h> #include <asm/firmware.h> +#include <asm/kvm_guest.h> #ifdef CONFIG_PPC64 unsigned long powerpc_firmware_features__read_mostly ;
arch/powerpc/platforms/pseries/smp.c +1 -0
@@ -42,6 +42,7 @@#include <asm/plpar_wrappers.h> #include <asm/code-patching.h> #include <asm/svm.h> +#include <asm/kvm_guest.h> #include "pseries.h"
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 421/575 powerpc: Rename is_kvm_guest() to check_kvm_guest()
In reply to Greg Kroah-HartmanFrom: Srikar Dronamraju <[email protected]>
[ Upstream commit 16520a858a995742c2d2248e86a6026bd0316562 ]
We want to reuse the is_kvm_guest() name in a subsequent patch but with a new body. Hence rename is_kvm_guest() to check_kvm_guest(). No additional changes.
--- arch/powerpc/include/asm/kvm_guest.h | 4 ++-- arch/powerpc/include/asm/kvm_para.h | 2 +- arch/powerpc/kernel/firmware.c | 8 ++++---- arch/powerpc/platforms/pseries/smp.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/kvm_guest.h +2 -2
@@ -7,9 +7,9 @@#define _ASM_POWERPC_KVM_GUEST_H_#if defined(CONFIG_PPC_PSERIES ) || defined(CONFIG_KVM_GUEST ) -bool is_kvm_guest (void ); +bool check_kvm_guest (void );#else -static inline bool is_kvm_guest (void ) {return false; } +static inline bool check_kvm_guest (void ) {return false; }#endif #endif /* _ASM_POWERPC_KVM_GUEST_H_ */
arch/powerpc/include/asm/kvm_para.h +1 -1
@@ -14,7 +14,7 @@static inline int kvm_para_available (void ) { -return IS_ENABLED (CONFIG_KVM_GUEST ) &&is_kvm_guest (); +return IS_ENABLED (CONFIG_KVM_GUEST ) &&check_kvm_guest (); }static inline unsigned int kvm_arch_para_features (void )
arch/powerpc/kernel/firmware.c +4 -4
@@ -22,17 +22,17 @@ EXPORT_SYMBOL_GPL(powerpc_firmware_features);#endif #if defined(CONFIG_PPC_PSERIES ) || defined(CONFIG_KVM_GUEST ) -bool is_kvm_guest (void ) +bool check_kvm_guest (void ) {struct device_node *hyper_node; hyper_node =of_find_node_by_path ("/hypervisor" );if (!hyper_node) -return 0 ; +return false;if (!of_device_is_compatible (hyper_node,"linux,kvm" )) -return 0 ; +return false; -return 1 ; +return true; }#endif
arch/powerpc/platforms/pseries/smp.c +1 -1
@@ -208,7 +208,7 @@ static __init void pSeries_smp_probe(void)if (!cpu_has_feature (CPU_FTR_SMT ))return ; -if (is_kvm_guest ()) { +if (check_kvm_guest ()) {/* * KVM emulates doorbells by disabling FSCR[MSGP] so msgsndp * faults to the hypervisor which then reads the instruction
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 422/575 powerpc: Reintroduce is_kvm_guest() as a fast-path check
In reply to Greg Kroah-HartmanFrom: Srikar Dronamraju <[email protected]>
[ Upstream commit a21d1becaa3f17a97b933ffa677b526afc514ec5 ]
Introduce a static branch that would be set during boot if the OS happens to be a KVM guest. Subsequent checks to see if we are on KVM will rely on this static branch. This static branch would be used in vcpu_is_preempted() in a subsequent patch.
--- arch/powerpc/include/asm/kvm_guest.h | 10 ++++++++++ arch/powerpc/include/asm/kvm_para.h | 2 +- arch/powerpc/kernel/firmware.c | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/kvm_guest.h +10 -0
@@ -7,8 +7,18 @@#define _ASM_POWERPC_KVM_GUEST_H_#if defined(CONFIG_PPC_PSERIES ) || defined(CONFIG_KVM_GUEST ) +#include <linux/jump_label.h> + +DECLARE_STATIC_KEY_FALSE (kvm_guest); + +static inline bool is_kvm_guest (void ) +{ +return static_branch_unlikely (&kvm_guest); +} +bool check_kvm_guest (void );#else +static inline bool is_kvm_guest (void ) {return false; }static inline bool check_kvm_guest (void ) {return false; }#endif
arch/powerpc/include/asm/kvm_para.h +1 -1
@@ -14,7 +14,7 @@static inline int kvm_para_available (void ) { -return IS_ENABLED (CONFIG_KVM_GUEST ) &&check_kvm_guest (); +return IS_ENABLED (CONFIG_KVM_GUEST ) &&is_kvm_guest (); }static inline unsigned int kvm_arch_para_features (void )
arch/powerpc/kernel/firmware.c +2 -0
@@ -22,6 +22,7 @@ EXPORT_SYMBOL_GPL(powerpc_firmware_features);#endif #if defined(CONFIG_PPC_PSERIES ) || defined(CONFIG_KVM_GUEST ) +DEFINE_STATIC_KEY_FALSE (kvm_guest);bool check_kvm_guest (void ) {struct device_node *hyper_node;
@@ -33,6 +34,7 @@ bool check_kvm_guest(void)if (!of_device_is_compatible (hyper_node,"linux,kvm" ))return false; +static_branch_enable (&kvm_guest); return true; }#endif
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 423/575 powerpc: Fix is_kvm_guest() / kvm_para_available()
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 95839225639ba7c3d8d7231b542728dcf222bf2d ]
Commit a21d1becaa3f ("powerpc: Reintroduce is_kvm_guest() as a fast-path check") added is_kvm_guest() and changed kvm_para_available() to use it.
is_kvm_guest() checks a static key, kvm_guest, and that static key is set in check_kvm_guest().
The problem is check_kvm_guest() is only called on pseries, and even then only in some configurations. That means is_kvm_guest() always returns false on all non-pseries and some pseries depending on configuration. That's a bug.
For PR KVM guests this is noticable because they no longer do live patching of themselves, which can be detected by the omission of a message in dmesg such as:
KVM: Live patching for a fast VM worked
To fix it make check_kvm_guest() an initcall, to ensure it's always called at boot. It needs to be core so that it runs before kvm_guest_init() which is postcore. To be an initcall it needs to return int, where 0 means success, so update that.
We still call it manually in pSeries_smp_probe(), because that runs before init calls are run.
--- arch/powerpc/include/asm/kvm_guest.h | 4 ++-- arch/powerpc/kernel/firmware.c | 10 ++++++---- arch/powerpc/platforms/pseries/smp.c | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/kvm_guest.h +2 -2
@@ -16,10 +16,10 @@ static inline bool is_kvm_guest(void)return static_branch_unlikely (&kvm_guest); } -bool check_kvm_guest (void ); +int check_kvm_guest (void );#else static inline bool is_kvm_guest (void ) {return false; } -static inline bool check_kvm_guest (void ) {return false; } +static inline int check_kvm_guest (void ) {return 0 ; }#endif #endif /* _ASM_POWERPC_KVM_GUEST_H_ */
arch/powerpc/kernel/firmware.c +6 -4
@@ -23,18 +23,20 @@ EXPORT_SYMBOL_GPL(powerpc_firmware_features);#if defined(CONFIG_PPC_PSERIES ) || defined(CONFIG_KVM_GUEST )DEFINE_STATIC_KEY_FALSE (kvm_guest); -bool check_kvm_guest (void ) +int __init check_kvm_guest (void ) {struct device_node *hyper_node; hyper_node =of_find_node_by_path ("/hypervisor" );if (!hyper_node) -return false; +return 0 ;if (!of_device_is_compatible (hyper_node,"linux,kvm" )) -return false; +return 0 ;static_branch_enable (&kvm_guest); -return true; + +return 0 ; } +core_initcall (check_kvm_guest);// before kvm_guest_init() #endif
arch/powerpc/platforms/pseries/smp.c +3 -1
@@ -208,7 +208,9 @@ static __init void pSeries_smp_probe(void)if (!cpu_has_feature (CPU_FTR_SMT ))return ; -if (check_kvm_guest ()) { +check_kvm_guest (); + +if (is_kvm_guest ()) {/* * KVM emulates doorbells by disabling FSCR[MSGP] so msgsndp * faults to the hypervisor which then reads the instruction
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 424/575 powerpc: fix unbalanced node refcount in check_kvm_guest()
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit 56537faf8821e361d739fc5ff58c9c40f54a1d4c ]
When check_kvm_guest() succeeds in looking up a /hypervisor OF node, it returns without performing a matching put for the lookup, leaving the node's reference count elevated.
Add the necessary call to of_node_put(), rearranging the code slightly to avoid repetition or goto.
--- arch/powerpc/kernel/firmware.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/powerpc/kernel/firmware.c +3 -4
@@ -31,11 +31,10 @@ int __init check_kvm_guest(void)if (!hyper_node)return 0 ; -if (!of_device_is_compatible (hyper_node,"linux,kvm" )) -return 0 ; - -static_branch_enable (&kvm_guest); +if (of_device_is_compatible (hyper_node,"linux,kvm" )) +static_branch_enable (&kvm_guest); +of_node_put (hyper_node);return 0 ; }core_initcall (check_kvm_guest);// before kvm_guest_init()
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 425/575 serial: 8250_dw: Drop wrong use of ACPI_PTR()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit ebabb77a2a115b6c5e68f7364b598310b5f61fb2 ]
ACPI_PTR() is more harmful than helpful. For example, in this case if CONFIG_ACPI=n, the ID table left unused which is not what we want.
Instead of adding ifdeffery here and there, drop ACPI_PTR().
--- drivers/tty/serial/8250/8250_dw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_dw.c +1 -1
@@ -726,7 +726,7 @@ static struct platform_driver dw8250_platform_driver = { .name = "dw-apb-uart", .pm = &dw8250_pm_ops, .of_match_table = dw8250_of_match, - .acpi_match_table = ACPI_PTR(dw8250_acpi_match), + .acpi_match_table = dw8250_acpi_match, }, .probe = dw8250_probe, .remove = dw8250_remove,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 426/575 usb: gadget: hid: fix error code in do_config()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 68e7c510fdf4f6167404609da52e1979165649f6 ]
Return an error code if usb_get_function() fails. Don't return success.
--- drivers/usb/gadget/legacy/hid.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/gadget/legacy/hid.c +3 -1
@@ -99,8 +99,10 @@ static int do_config(struct usb_configuration *c)list_for_each_entry (e, &hidg_func_list, node) { e->f =usb_get_function (e->fi); -if (IS_ERR (e->f)) +if (IS_ERR (e->f)) { + status =PTR_ERR (e->f); goto put; + } status =usb_add_function (c, e->f);if (status <0 ) {usb_put_function (e->f);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 427/575 =?UTF-8?q?power:=20supply:=20rt5033=5Fbattery:=20Change=20voltage?= =?UTF-8?q?=20values=20to=20=C2=B5V?=
In reply to Greg Kroah-HartmanFrom: Jakob Hauser <[email protected]>
[ Upstream commit bf895295e9a73411889816f1a0c1f4f1a2d9c678 ]
Currently the rt5033_battery driver provides voltage values in mV. It should be µV as stated in Documentation/power/power_supply_class.rst.
--- drivers/power/supply/rt5033_battery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/rt5033_battery.c +1 -1
@@ -60,7 +60,7 @@ static int rt5033_battery_get_watt_prop(struct i2c_client *client,regmap_read (battery->regmap, regh, &msb);regmap_read (battery->regmap, regl, &lsb); - ret = ((msb <<4 ) + (lsb >>4 )) *1250 /1000 ; + ret = ((msb <<4 ) + (lsb >>4 )) *1250 ;return ret; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 428/575 power: supply: max17040: fix null-ptr-deref in max17040_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 1d422ecfc48ee683ae1ccc9217764f6310c0ffce ]
Add check the return value of devm_regmap_init_i2c(), otherwise later access may cause null-ptr-deref as follows:
KASAN: null-ptr-deref in range [0x0000000000000360-0x0000000000000367] RIP: 0010:regmap_read+0x33/0x170 Call Trace: max17040_probe+0x61b/0xff0 [max17040_battery] ? write_comp_data+0x2a/0x90 ? max17040_set_property+0x1d0/0x1d0 [max17040_battery] ? tracer_hardirqs_on+0x33/0x520 ? __sanitizer_cov_trace_pc+0x1d/0x50 ? _raw_spin_unlock_irqrestore+0x4b/0x60 ? trace_hardirqs_on+0x63/0x2d0 ? write_comp_data+0x2a/0x90 ? __sanitizer_cov_trace_pc+0x1d/0x50 ? max17040_set_property+0x1d0/0x1d0 [max17040_battery] i2c_device_probe+0xa31/0xbe0
--- drivers/power/supply/max17040_battery.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/power/supply/max17040_battery.c +2 -0
@@ -482,6 +482,8 @@ static int max17040_probe(struct i2c_client *client, chip->client = client; chip->regmap =devm_regmap_init_i2c (client, &max17040_regmap); chip->pdata = client->dev.platform_data; +if (IS_ERR (chip->regmap)) +return PTR_ERR (chip->regmap); chip_id = (enum chip_id ) id->driver_data;if (client->dev.of_node) { ret =max17040_get_of_data (chip);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 429/575 scsi: csiostor: Uninitialized data in csio_ln_vnp_read_cbfn()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit f4875d509a0a78ad294a1a538d534b5ba94e685a ]
This variable is just a temporary variable, used to do an endian conversion. The problem is that the last byte is not initialized. After the conversion is completely done, the last byte is discarded so it doesn't cause a problem. But static checkers and the KMSan runtime checker can detect the uninitialized read and will complain about it.
--- drivers/scsi/csiostor/csio_lnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/csiostor/csio_lnode.c +1 -1
@@ -619,7 +619,7 @@ csio_ln_vnp_read_cbfn(struct csio_hw *hw, struct csio_mb *mbp)struct fc_els_csp *csp;struct fc_els_cssp *clsp;enum fw_retval retval; -__be32 nport_id; +__be32 nport_id =0 ; retval =FW_CMD_RETVAL_G (ntohl (rsp->alloc_to_len16));if (retval !=FW_SUCCESS ) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 430/575 RDMA/mlx4: Return missed an error if device doesnt support steering
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit f4e56ec4452f48b8292dcf0e1c4bdac83506fb8b ]
The error flow fixed in this patch is not possible because all kernel users of create QP interface check that device supports steering before set IB_QP_CREATE_NETIF_QP flag.
--- drivers/infiniband/hw/mlx4/qp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/mlx4/qp.c +3 -1
@@ -1099,8 +1099,10 @@ static int create_qp_common(struct ib_pd *pd, struct ib_qp_init_attr *init_attr,if (dev->steering_support ==MLX4_STEERING_MODE_DEVICE_MANAGED ) qp->flags |=MLX4_IB_QP_NETIF ; -else +else { + err = -EINVAL ; goto err; + } } err =set_kernel_sq_size (dev, &init_attr->cap, qp_type, qp);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 431/575 usb: musb: select GENERIC_PHY instead of depending on it
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit fde1fbedbaed4e76cef4600d775b185f59b9b568 ]
The kconfig symbol GENERIC_PHY says:
All the users of this framework should select this config.
and around 136 out of 138 drivers do so, so change USB_MUSB_MEDIATEK to do so also.
This (also) fixes a long circular dependency problem for an upcoming patch.
--- drivers/usb/musb/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/musb/Kconfig +1 -1
@@ -120,7 +120,7 @@ config USB_MUSB_MEDIATEK tristate "MediaTek platforms" depends on ARCH_MEDIATEK || COMPILE_TEST depends on NOP_USB_XCEIV - depends on GENERIC_PHY + select GENERIC_PHY select USB_ROLE_SWITCH comment "MUSB DMA mode"
Signature · 9 lines
2.33.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Greg Kroah-Hartman
maintainerPATCH 432/575 staging: most: dim2: do not double-register the same device
In reply to Greg Kroah-HartmanFrom: Nikita Yushchenko <[email protected]>
[ Upstream commit 2ab189164056b05474275bb40caa038a37713061 ]
Commit 723de0f9171e ("staging: most: remove device from interface structure") moved registration of driver-provided struct device to the most subsystem.
Dim2 used to register the same struct device to provide a custom device attribute. This causes double-registration of the same struct device.
Fix that by moving the custom attribute to driver's dev_groups. This moves attribute to the platform_device object, which is a better location for platform-specific attributes anyway.
--- drivers/staging/most/dim2/Makefile | 2 +- drivers/staging/most/dim2/dim2.c | 24 ++++++++------- drivers/staging/most/dim2/sysfs.c | 49 ------------------------------ drivers/staging/most/dim2/sysfs.h | 11 ------- 4 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 drivers/staging/most/dim2/sysfs.c
drivers/staging/most/dim2/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_MOST_DIM2) += most_dim2.o -most_dim2-objs := dim2.o hal.o sysfs.o +most_dim2-objs := dim2.o hal.o
drivers/staging/most/dim2/dim2.c +13 -11
@@ -115,7 +115,8 @@ struct dim2_platform_data { (((p)[1 ] ==0x18 ) && ((p)[2 ] ==0x05 ) && ((p)[3 ] ==0x0C ) && \ ((p)[13] == 0x3C) && ((p)[14] == 0x00) && ((p)[15] == 0x0A)) -bool dim2_sysfs_get_state_cb (void ) +static ssize_t state_show (struct device *dev,struct device_attribute *attr, +char *buf) {bool state;unsigned long flags;
@@ -124,9 +125,18 @@ bool dim2_sysfs_get_state_cb(void) state =dim_get_lock_state ();spin_unlock_irqrestore (&dim_lock, flags); -return state; +return sysfs_emit (buf,"%s\n" , state ?"locked" :"" ); } +static DEVICE_ATTR_RO (state); + +static struct attribute *dim2_attrs[] = { + &dev_attr_state.attr, +NULL , +}; + +ATTRIBUTE_GROUPS (dim2); +/** * dimcb_on_error - callback from HAL to report miscommunication between * HDM and HAL
@@ -863,16 +873,8 @@ static int dim2_probe(struct platform_device *pdev) goto err_stop_thread; } - ret =dim2_sysfs_probe (&dev->dev); -if (ret) { -dev_err (&pdev->dev,"failed to create sysfs attribute\n" ); - goto err_unreg_iface; - } -return 0 ; -err_unreg_iface: -most_deregister_interface (&dev->most_iface); err_stop_thread:kthread_stop (dev->netinfo_task); err_shutdown_dim:
@@ -895,7 +897,6 @@ static int dim2_remove(struct platform_device *pdev)struct dim2_hdm *dev =platform_get_drvdata (pdev);unsigned long flags; -dim2_sysfs_destroy (&dev->dev);most_deregister_interface (&dev->most_iface);kthread_stop (dev->netinfo_task);
@@ -1079,6 +1080,7 @@ static struct platform_driver dim2_driver = { .driver = { .name = "hdm_dim2", .of_match_table = dim2_of_match, + .dev_groups = dim2_groups, }, };
drivers/staging/most/dim2/sysfs.c deleted +0 -49
49 lines not on this page · raw message
drivers/staging/most/dim2/sysfs.h +0 -11
@@ -16,15 +16,4 @@ struct medialb_bus { struct kobject kobj_group; }; -struct device ; - -int dim2_sysfs_probe (struct device *dev); -void dim2_sysfs_destroy (struct device *dev); - -/* -* callback, -* must deliver MediaLB state as true if locked or false if unlocked -*/ -bool dim2_sysfs_get_state_cb (void ); -#endif /* DIM2_SYSFS_H */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 433/575 staging: ks7010: select CRYPTO_HASH/CRYPTO_MICHAEL_MIC
In reply to Greg Kroah-HartmanFrom: Vegard Nossum <[email protected]>
[ Upstream commit 9ca0e55e52c7b2a99f3c2051fc4bd1c63a061519 ]
Fix the following build/link errors:
ld: drivers/staging/ks7010/ks_hostif.o: in function `michael_mic.constprop.0':
ks_hostif.c:(.text+0x95b): undefined reference to `crypto_alloc_shash'
ld: ks_hostif.c:(.text+0x97a): undefined reference to `crypto_shash_setkey'
ld: ks_hostif.c:(.text+0xa13): undefined reference to `crypto_shash_update'
ld: ks_hostif.c:(.text+0xa28): undefined reference to `crypto_shash_update'
ld: ks_hostif.c:(.text+0xa48): undefined reference to `crypto_shash_finup'
ld: ks_hostif.c:(.text+0xa6d): undefined reference to `crypto_destroy_tfm'
--- drivers/staging/ks7010/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/ks7010/Kconfig +3 -0
@@ -5,6 +5,9 @@ config KS7010 select WIRELESS_EXT select WEXT_PRIV select FW_LOADER + select CRYPTO + select CRYPTO_HASH + select CRYPTO_MICHAEL_MIC help This is a driver for KeyStream KS7010 based SDIO WIFI cards. It is found on at least later Spectec SDW-821 (FCC-ID "S2Y-WLAN-11G-K" only,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 434/575 pinctrl: renesas: checker: Fix off-by-one bug in drive register check
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 28e7f8ff90583791a034d43b5d2e3fe394142e13 ]
The GENMASK(h, l) macro creates a contiguous bitmask starting at bit position @l and ending at position @h, inclusive.
This did not trigger any error checks, as the individual register fields cover at most 3 of the 4 available bits.
--- drivers/pinctrl/renesas/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/renesas/core.c +1 -1
@@ -890,7 +890,7 @@ static void __init sh_pfc_check_drive_reg(const struct sh_pfc_soc_info *info,if (!field->pin && !field->offset && !field->size)continue ; - mask =GENMASK (field->offset + field->size, field->offset); + mask =GENMASK (field->offset + field->size -1 , field->offset);if (mask & seen)sh_pfc_err ("drive_reg 0x%x: field %u overlap\n" , drive->reg, i);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 435/575 ARM: dts: stm32: Reduce DHCOR SPI NOR frequency to 50 MHz
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 2012579b31293d0a8cf2024e9dab66810bf1a15e ]
The SPI NOR is a bit further away from the SoC on DHCOR than on DHCOM, which causes additional signal delay. At 108 MHz, this delay triggers a sporadic issue where the first bit of RX data is not received by the QSPI controller.
There are two options of addressing this problem, either by using the DLYB block to compensate the extra delay, or by reducing the QSPI bus clock frequency. The former requires calibration and that is overly complex, so opt for the second option.
--- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi +1 -1
@@ -198,7 +198,7 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-rx-bus-width = <4>; - spi-max-frequency = <108000000>; + spi-max-frequency = <50000000>; #address-cells = <1>; #size-cells = <1>; };
Signature · 9 lines
2.33.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 436/575 ARM: dts: stm32: fix SAI sub nodes register range
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
[ Upstream commit 6f87a74d31277f0896dcf8c0850ec14bde03c423 ]
The STM32 SAI subblocks registers offsets are in the range 0x0004 (SAIx_CR1) to 0x0020 (SAIx_DR).
The corresponding range length is 0x20 instead of 0x1c. Change reg property accordingly.
--- arch/arm/boot/dts/stm32mp151.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/stm32mp151.dtsi +8 -8
@@ -811,7 +811,7 @@ #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-a"; - reg = <0x4 0x1c>; + reg = <0x4 0x20>; clocks = <&rcc SAI1_K>; clock-names = "sai_ck"; dmas = <&dmamux1 87 0x400 0x01>;
@@ -821,7 +821,7 @@ sai1b: audio-controller@4400a024 { #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-b"; - reg = <0x24 0x1c>; + reg = <0x24 0x20>; clocks = <&rcc SAI1_K>; clock-names = "sai_ck"; dmas = <&dmamux1 88 0x400 0x01>;
@@ -842,7 +842,7 @@ sai2a: audio-controller@4400b004 { #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-a"; - reg = <0x4 0x1c>; + reg = <0x4 0x20>; clocks = <&rcc SAI2_K>; clock-names = "sai_ck"; dmas = <&dmamux1 89 0x400 0x01>;
@@ -852,7 +852,7 @@ sai2b: audio-controller@4400b024 { #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-b"; - reg = <0x24 0x1c>; + reg = <0x24 0x20>; clocks = <&rcc SAI2_K>; clock-names = "sai_ck"; dmas = <&dmamux1 90 0x400 0x01>;
@@ -873,7 +873,7 @@ sai3a: audio-controller@4400c004 { #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-a"; - reg = <0x04 0x1c>; + reg = <0x04 0x20>; clocks = <&rcc SAI3_K>; clock-names = "sai_ck"; dmas = <&dmamux1 113 0x400 0x01>;
@@ -883,7 +883,7 @@ sai3b: audio-controller@4400c024 { #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-b"; - reg = <0x24 0x1c>; + reg = <0x24 0x20>; clocks = <&rcc SAI3_K>; clock-names = "sai_ck"; dmas = <&dmamux1 114 0x400 0x01>;
@@ -1250,7 +1250,7 @@ sai4a: audio-controller@50027004 { #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-a"; - reg = <0x04 0x1c>; + reg = <0x04 0x20>; clocks = <&rcc SAI4_K>; clock-names = "sai_ck"; dmas = <&dmamux1 99 0x400 0x01>;
@@ -1260,7 +1260,7 @@ sai4b: audio-controller@50027024 { #sound-dai-cells = <0>; compatible = "st,stm32-sai-sub-b"; - reg = <0x24 0x1c>; + reg = <0x24 0x20>; clocks = <&rcc SAI4_K>; clock-names = "sai_ck"; dmas = <&dmamux1 100 0x400 0x01>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 437/575 ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
[ Upstream commit 1a9a9d226f0f0ef5d9bf588ab432e0d679bb1954 ]
Fix SAI2A and SAI2B pin muxings for AV96 board on STM32MP15. Change sai2a-4 & sai2a-5 to sai2a-2 & sai2a-2. Change sai2a-4 & sai2a-sleep-5 to sai2b-2 & sai2b-sleep-2
--- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +4 -4
@@ -1091,7 +1091,7 @@ }; }; - sai2a_pins_c: sai2a-4 { + sai2a_pins_c: sai2a-2 { pins { pinmux = <STM32_PINMUX('D', 13, AF10)>, /* SAI2_SCK_A */ <STM32_PINMUX('D', 11, AF10)>, /* SAI2_SD_A */
@@ -1102,7 +1102,7 @@ }; }; - sai2a_sleep_pins_c: sai2a-5 { + sai2a_sleep_pins_c: sai2a-2 { pins { pinmux = <STM32_PINMUX('D', 13, ANALOG)>, /* SAI2_SCK_A */ <STM32_PINMUX('D', 11, ANALOG)>, /* SAI2_SD_A */
@@ -1147,14 +1147,14 @@ }; }; - sai2b_pins_c: sai2a-4 { + sai2b_pins_c: sai2b-2 { pins1 { pinmux = <STM32_PINMUX('F', 11, AF10)>; /* SAI2_SD_B */ bias-disable; }; }; - sai2b_sleep_pins_c: sai2a-sleep-5 { + sai2b_sleep_pins_c: sai2b-sleep-2 { pins { pinmux = <STM32_PINMUX('F', 11, ANALOG)>; /* SAI2_SD_B */ };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 438/575 ASoC: cs42l42: Correct some register default values
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit d591d4b32aa9552af14a0c7c586a2d3fe9ecc6e0 ]
Some registers had wrong default values in cs42l42_reg_defaults[].
--- sound/soc/codecs/cs42l42.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/cs42l42.c +2 -2
@@ -91,7 +91,7 @@ static const struct reg_default cs42l42_reg_defaults[] = { { CS42L42_ASP_RX_INT_MASK, 0x1F }, { CS42L42_ASP_TX_INT_MASK, 0x0F }, { CS42L42_CODEC_INT_MASK, 0x03 }, - { CS42L42_SRCPL_INT_MASK, 0xFF }, + { CS42L42_SRCPL_INT_MASK, 0x7F }, { CS42L42_VPMON_INT_MASK, 0x01 }, { CS42L42_PLL_LOCK_INT_MASK, 0x01 }, { CS42L42_TSRS_PLUG_INT_MASK, 0x0F },
@@ -128,7 +128,7 @@ static const struct reg_default cs42l42_reg_defaults[] = { { CS42L42_MIXER_CHA_VOL, 0x3F }, { CS42L42_MIXER_ADC_VOL, 0x3F }, { CS42L42_MIXER_CHB_VOL, 0x3F }, - { CS42L42_EQ_COEF_IN0, 0x22 }, + { CS42L42_EQ_COEF_IN0, 0x00 }, { CS42L42_EQ_COEF_IN1, 0x00 }, { CS42L42_EQ_COEF_IN2, 0x00 }, { CS42L42_EQ_COEF_IN3, 0x00 },
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 439/575 ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER
In reply to Greg Kroah-HartmanFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit 0306988789d9d91a18ff70bd2bf165d3ae0ef1dd ]
The driver can run without an interrupt so if devm_request_threaded_irq() failed, the probe() just carried on. But if this was EPROBE_DEFER the driver would continue without an interrupt instead of deferring to wait for the interrupt to become available.
--- sound/soc/codecs/cs42l42.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/cs42l42.c +3 -2
@@ -1796,8 +1796,9 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client,NULL , cs42l42_irq_thread,IRQF_ONESHOT |IRQF_TRIGGER_LOW , "cs42l42", cs42l42); - -if (ret !=0 ) +if (ret == -EPROBE_DEFER ) + goto err_disable; +else if (ret !=0 )dev_err (&i2c_client->dev,"Failed to request IRQ: %d\n" , ret);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 440/575 soc: qcom: rpmhpd: Provide some missing struct member descriptions
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 5d16af6a921f5a4e7038671be5478cba4b7cfe81 ]
Fixes the following W=1 kernel build warning(s):
drivers/soc/qcom/rpmhpd.c:52: warning: Function parameter or member 'parent' not described in 'rpmhpd' drivers/soc/qcom/rpmhpd.c:52: warning: Function parameter or member 'corner' not described in 'rpmhpd' drivers/soc/qcom/rpmhpd.c:52: warning: Function parameter or member 'active_corner' not described in 'rpmhpd'
--- drivers/soc/qcom/rpmhpd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/qcom/rpmhpd.c +3 -0
@@ -24,9 +24,12 @@* struct rpmhpd - top level RPMh power domain resource data structure * @dev: rpmh power domain controller device * @pd: generic_pm_domain corrresponding to the power domain +* @parent: generic_pm_domain corrresponding to the parent's power domain * @peer: A peer power domain in case Active only Voting is * supported * @active_only: True if it represents an Active only peer +* @corner: current corner +* @active_corner: current active corner * @level: An array of level (vlvl) to corner (hlvl) mappings * derived from cmd-db * @level_count: Number of levels supported by the power domain. max
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 441/575 soc: qcom: rpmhpd: Make power_on actually enable the domain
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit e3e56c050ab6e3f1bd811f0787f50709017543e4 ]
The general expectation is that powering on a power-domain should make the power domain deliver some power, and if a specific performance state is needed further requests has to be made.
But in contrast with other power-domain implementations (e.g. rpmpd) the RPMh does not have an interface to enable the power, so the driver has to vote for a particular corner (performance level) in rpmh_power_on().
But the corner is never initialized, so a typical request to simply enable the power domain would not actually turn on the hardware. Further more, when no more clients vote for a performance state (i.e. the aggregated vote is 0) the power domain would be turned off.
Fix both of these issues by always voting for a corner with non-zero value, when the power domain is enabled.
The tracking of the lowest non-zero corner is performed to handle the corner case if there's ever a domain with a non-zero lowest corner, in which case both rpmh_power_on() and rpmh_rpmhpd_set_performance_state() would be allowed to use this lowest corner.
--- drivers/soc/qcom/rpmhpd.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/soc/qcom/rpmhpd.c +14 -4
@@ -30,6 +30,7 @@* @active_only: True if it represents an Active only peer * @corner: current corner * @active_corner: current active corner +* @enable_corner: lowest non-zero corner * @level: An array of level (vlvl) to corner (hlvl) mappings * derived from cmd-db * @level_count: Number of levels supported by the power domain. max
@@ -47,6 +48,7 @@ struct rpmhpd {const bool active_only;unsigned int corner;unsigned int active_corner; +unsigned int enable_corner;u32 level[RPMH_ARC_MAX_LEVELS ];size_t level_count;bool enabled;
@@ -295,13 +297,13 @@ static int rpmhpd_aggregate_corner(struct rpmhpd *pd, unsigned int corner)static int rpmhpd_power_on (struct generic_pm_domain *domain) {struct rpmhpd *pd =domain_to_rpmhpd (domain); -int ret =0 ; +unsigned int corner; +int ret;mutex_lock (&rpmhpd_lock); -if (pd->corner) - ret =rpmhpd_aggregate_corner (pd, pd->corner); - + corner =max (pd->corner, pd->enable_corner); + ret =rpmhpd_aggregate_corner (pd, corner);if (!ret) pd->enabled = true;
@@ -346,6 +348,10 @@ static int rpmhpd_set_performance_state(struct generic_pm_domain *domain, i--;if (pd->enabled) { +/* Ensure that the domain isn't turn off */ +if (i < pd->enable_corner) + i = pd->enable_corner; + ret =rpmhpd_aggregate_corner (pd, i);if (ret) goto out;
@@ -382,6 +388,10 @@ static int rpmhpd_update_level_mapping(struct rpmhpd *rpmhpd)for (i =0 ; i < rpmhpd->level_count; i++) { rpmhpd->level[i] = buf[i]; +/* Remember the first corner with non-zero level */ +if (!rpmhpd->level[rpmhpd->enable_corner] && rpmhpd->level[i]) + rpmhpd->enable_corner = i; +/* * The AUX data may be zero padded. These 0 valued entries at * the end of the map must be ignored.
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 442/575 usb: typec: STUSB160X should select REGMAP_I2C
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 8ef1e58783b9f55daa4a865c7801dc75cbeb8260 ]
REGMAP_I2C is not a user visible kconfig symbol so driver configs should not "depend on" it. They should depend on I2C and then select REGMAP_I2C.
If this worked, it was only because some other driver had set/enabled REGMAP_I2C.
--- drivers/usb/typec/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/typec/Kconfig +2 -2
@@ -75,9 +75,9 @@ config TYPEC_TPS6598X config TYPEC_STUSB160X tristate "STMicroelectronics STUSB160x Type-C controller driver" - depends on I2C - depends on REGMAP_I2C depends on USB_ROLE_SWITCH || !USB_ROLE_SWITCH + depends on I2C + select REGMAP_I2C help Say Y or M here if your system has STMicroelectronics STUSB160x Type-C port controller.
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 443/575 iio: adis: do not disabe IRQs in adis_init()
In reply to Greg Kroah-HartmanFrom: Nuno Sá <[email protected]>
[ Upstream commit b600bd7eb333554518b4dd36b882b2ae58a5149e ]
With commit ecb010d441088 ("iio: imu: adis: Refactor adis_initial_startup") we are doing a HW or SW reset to the device which means that we'll get the default state of the data ready pin (which is enabled). Hence there's no point in disabling the IRQ in the init function. Moreover, this function is intended to initialize internal data structures and not really do anything on the device.
As a result of this, some devices were left with the data ready pin enabled after probe which was not the desired behavior. Thus, we move the call to 'adis_enable_irq()' to the initial startup function where it makes more sense for it to be.
Note that for devices that cannot mask/unmask the pin, it makes no sense to call the function at this point since the IRQ should not have been yet requested. This will be improved in a follow up change.
--- drivers/iio/imu/adis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/imu/adis.c +3 -1
@@ -434,6 +434,8 @@ int __adis_initial_startup(struct adis *adis)if (ret)return ret; +adis_enable_irq (adis, false); +if (!adis->data->prod_id_reg)return 0 ;
@@ -530,7 +532,7 @@ int adis_init(struct adis *adis, struct iio_dev *indio_dev, adis->current_page =0 ; } -return adis_enable_irq (adis, false); +return 0 ; }EXPORT_SYMBOL_GPL (adis_init);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 444/575 scsi: ufs: Refactor ufshcd_setup_clocks() to remove skip_ref_clk
In reply to Greg Kroah-HartmanFrom: Can Guo <[email protected]>
[ Upstream commit 81309c247a4dcd597cbda5254fd0afdd61b93f14 ]
Remove the param skip_ref_clk from __ufshcd_setup_clocks(), but keep a flag in struct ufs_clk_info to tell whether a clock can be disabled or not while the link is active.
--- drivers/scsi/ufs/ufshcd-pltfrm.c | 2 ++ drivers/scsi/ufs/ufshcd.c | 29 +++++++++-------------------- drivers/scsi/ufs/ufshcd.h | 3 +++ 3 files changed, 14 insertions(+), 20 deletions(-)
drivers/scsi/ufs/ufshcd-pltfrm.c +2 -0
@@ -92,6 +92,8 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) clki->min_freq = clkfreq[i]; clki->max_freq = clkfreq[i+1 ]; clki->name =kstrdup (name,GFP_KERNEL ); +if (!strcmp (name,"ref_clk" )) + clki->keep_link_active = true;dev_dbg (dev,"%s: min %u max %u name %s\n" ,"freq-table-hz" , clki->min_freq, clki->max_freq, clki->name);list_add_tail (&clki->list, &hba->clk_list_head);
drivers/scsi/ufs/ufshcd.c +9 -20
@@ -221,8 +221,6 @@ static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd);static int ufshcd_clear_tm_cmd (struct ufs_hba *hba,int tag);static void ufshcd_hba_exit (struct ufs_hba *hba);static int ufshcd_probe_hba (struct ufs_hba *hba,bool async); -static int __ufshcd_setup_clocks (struct ufs_hba *hba,bool on, -bool skip_ref_clk);static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on);static int ufshcd_uic_hibern8_enter (struct ufs_hba *hba);static inline void ufshcd_add_delay_before_dme_cmd (struct ufs_hba *hba);
@@ -1714,11 +1712,7 @@ static void ufshcd_gate_work(struct work_struct *work)ufshcd_disable_irq (hba); -if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); -else -/* If link is active, device ref_clk can't be switched off */ -__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false);/* * In case you are here to cancel this work the gating state
@@ -8055,8 +8049,7 @@ static int ufshcd_init_hba_vreg(struct ufs_hba *hba)return 0 ; } -static int __ufshcd_setup_clocks (struct ufs_hba *hba,bool on, -bool skip_ref_clk) +static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on) {int ret =0 ;struct ufs_clk_info *clki;
@@ -8074,7 +8067,12 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,list_for_each_entry (clki, head, list) {if (!IS_ERR_OR_NULL (clki->clk)) { -if (skip_ref_clk && !strcmp (clki->name,"ref_clk" )) +/* +* Don't disable clocks which are needed +* to keep the link active. +*/ +if (ufshcd_is_link_active (hba) && + clki->keep_link_active)continue ; clk_state_changed = on ^ clki->enabled;
@@ -8119,11 +8117,6 @@ out:return ret; } -static int ufshcd_setup_clocks (struct ufs_hba *hba,bool on) -{ -return __ufshcd_setup_clocks (hba, on, false); -} -static int ufshcd_init_clocks (struct ufs_hba *hba) {int ret =0 ;
@@ -8642,11 +8635,7 @@ disable_clks:*/ ufshcd_disable_irq (hba); -if (!ufshcd_is_link_active (hba)) -ufshcd_setup_clocks (hba, false); -else -/* If link is active, device ref_clk can't be switched off */ -__ufshcd_setup_clocks (hba, false, true); +ufshcd_setup_clocks (hba, false);if (ufshcd_is_clkgating_allowed (hba)) { hba->clk_gating.state =CLKS_OFF ;
drivers/scsi/ufs/ufshcd.h +3 -0
@@ -229,6 +229,8 @@ struct ufs_dev_cmd {* @max_freq: maximum frequency supported by the clock * @min_freq: min frequency that can be used for clock scaling * @curr_freq: indicates the current frequency that it is set to +* @keep_link_active: indicates that the clk should not be disabled if +link is active * @enabled: variable to check against multiple enable/disable */ struct ufs_clk_info {
@@ -238,6 +240,7 @@ struct ufs_clk_info {u32 max_freq;u32 min_freq;u32 curr_freq; +bool keep_link_active;bool enabled; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 445/575 scsi: ufs: ufshcd-pltfrm: Fix memory leak due to probe defer
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit b6ca770ae7f2c560a29bbd02c4e3d734fafaf804 ]
UFS drivers that probe defer will end up leaking memory allocated for clk and regulator names via kstrdup() because the structure that is holding this memory is allocated via devm_* variants which will be freed during probe defer but the names are never freed.
Use same devm_* variant of kstrdup to free the memory allocated to name when driver probe defers.
Kmemleak found around 11 leaks on Qualcomm Dragon Board RB5:
unreferenced object 0xffff66f243fb2c00 (size 128):
comm "kworker/u16:0", pid 7, jiffies 4294893319 (age 94.848s) hex dump (first 32 bytes):
63 6f 72 65 5f 63 6c 6b 00 76 69 72 74 75 61 6c core_clk.virtual
2f 77 6f 72 6b 71 75 65 75 65 2f 73 63 73 69 5f /workqueue/scsi_
backtrace:
[<000000006f788cd1>] slab_post_alloc_hook+0x88/0x410
[<00000000cfd1372b>] __kmalloc_track_caller+0x138/0x230
[<00000000a92ab17b>] kstrdup+0xb0/0x110
[<0000000037263ab6>] ufshcd_pltfrm_init+0x1a8/0x500
[<00000000a20a5caa>] ufs_qcom_probe+0x20/0x58
[<00000000a5e43067>] platform_probe+0x6c/0x118
[<00000000ef686e3f>] really_probe+0xc4/0x330
[<000000005b18792c>] __driver_probe_device+0x88/0x118
[<00000000a5d295e8>] driver_probe_device+0x44/0x158
[<000000007e83f58d>] __device_attach_driver+0xb4/0x128
[<000000004bfa4470>] bus_for_each_drv+0x68/0xd0
[<00000000b89a83bc>] __device_attach+0xec/0x170
[<00000000ada2beea>] device_initial_probe+0x14/0x20
[<0000000079921612>] bus_probe_device+0x9c/0xa8
[<00000000d268bf7c>] deferred_probe_work_func+0x90/0xd0
[<000000009ef64bfa>] process_one_work+0x29c/0x788
unreferenced object 0xffff66f243fb2c80 (size 128):
comm "kworker/u16:0", pid 7, jiffies 4294893319 (age 94.848s)
hex dump (first 32 bytes):
62 75 73 5f 61 67 67 72 5f 63 6c 6b 00 00 00 00 bus_aggr_clk....
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................With this patch no memory leaks are reported.
--- drivers/scsi/ufs/ufshcd-pltfrm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd-pltfrm.c +2 -2
@@ -91,7 +91,7 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) clki->min_freq = clkfreq[i]; clki->max_freq = clkfreq[i+1 ]; - clki->name =kstrdup (name,GFP_KERNEL ); + clki->name =devm_kstrdup (dev, name,GFP_KERNEL );if (!strcmp (name,"ref_clk" )) clki->keep_link_active = true; dev_dbg(dev, "%s: min %u max %u name %s\n", "freq-table-hz",
@@ -127,7 +127,7 @@ static int ufshcd_populate_vreg(struct device *dev, const char *name,if (!vreg)return -ENOMEM ; - vreg->name =kstrdup (name,GFP_KERNEL ); + vreg->name =devm_kstrdup (dev, name,GFP_KERNEL );snprintf (prop_name,MAX_PROP_SIZE ,"%s-max-microamp" , name);if (of_property_read_u32 (np, prop_name, &vreg->max_uA)) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 446/575 serial: imx: fix detach/attach of serial console
In reply to Greg Kroah-HartmanFrom: Stefan Agner <[email protected]>
[ Upstream commit 6d0d1b5a1b4870911beb89544ec1a9751c42fec7 ]
If the device used as a serial console gets detached/attached at runtime, register_console() will try to call imx_uart_setup_console(), but this is not possible since it is marked as __init.
For instance
# cat /sys/devices/virtual/tty/console/active tty1 ttymxc0 # echo -n N > /sys/devices/virtual/tty/console/subsystem/ttymxc0/console # echo -n Y > /sys/devices/virtual/tty/console/subsystem/ttymxc0/console
[ 73.166649] 8<--- cut here --- [ 73.167005] Unable to handle kernel paging request at virtual address c154d928 [ 73.167601] pgd = 55433e84 [ 73.167875] [c154d928] *pgd=8141941e(bad) [ 73.168304] Internal error: Oops: 8000000d [#1] SMP ARM [ 73.168429] Modules linked in: [ 73.168522] CPU: 0 PID: 536 Comm: sh Not tainted 5.15.0-rc6-00056-g3968ddcf05fb #3 [ 73.168675] Hardware name: Freescale i.MX6 Ultralite (Device Tree) [ 73.168791] PC is at imx_uart_console_setup+0x0/0x238 [ 73.168927] LR is at try_enable_new_console+0x98/0x124 [ 73.169056] pc : [<c154d928>] lr : [<c0196f44>] psr: a0000013 [ 73.169178] sp : c2ef5e70 ip : 00000000 fp : 00000000 [ 73.169281] r10: 00000000 r9 : c02cf970 r8 : 00000000 [ 73.169389] r7 : 00000001 r6 : 00000001 r5 : c1760164 r4 : c1e0fb08 [ 73.169512] r3 : c154d928 r2 : 00000000 r1 : efffcbd1 r0 : c1760164 [ 73.169641] Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none [ 73.169782] Control: 10c5387d Table: 8345406a DAC: 00000051 [ 73.169895] Register r0 information: non-slab/vmalloc memory [ 73.170032] Register r1 information: non-slab/vmalloc memory [ 73.170158] Register r2 information: NULL pointer [ 73.170273] Register r3 information: non-slab/vmalloc memory [ 73.170397] Register r4 information: non-slab/vmalloc memory [ 73.170521] Register r5 information: non-slab/vmalloc memory [ 73.170647] Register r6 information: non-paged memory [ 73.170771] Register r7 information: non-paged memory [ 73.170892] Register r8 information: NULL pointer [ 73.171009] Register r9 information: non-slab/vmalloc memory [ 73.171142] Register r10 information: NULL pointer [ 73.171259] Register r11 information: NULL pointer [ 73.171375] Register r12 information: NULL pointer [ 73.171494] Process sh (pid: 536, stack limit = 0xcd1ba82f) [ 73.171621] Stack: (0xc2ef5e70 to 0xc2ef6000) [ 73.171731] 5e60: ???????? ???????? ???????? ???????? [ 73.171899] 5e80: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.172059] 5ea0: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.172217] 5ec0: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.172377] 5ee0: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.172537] 5f00: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.172698] 5f20: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.172856] 5f40: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.173016] 5f60: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.173177] 5f80: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.173336] 5fa0: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.173496] 5fc0: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.173654] 5fe0: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.173826] [<c0196f44>] (try_enable_new_console) from [<c01984a8>] (register_console+0x10c/0x2ec) [ 73.174053] [<c01984a8>] (register_console) from [<c06e2c90>] (console_store+0x14c/0x168) [ 73.174262] [<c06e2c90>] (console_store) from [<c0383718>] (kernfs_fop_write_iter+0x110/0x1cc) [ 73.174470] [<c0383718>] (kernfs_fop_write_iter) from [<c02cf5f4>] (vfs_write+0x31c/0x548) [ 73.174679] [<c02cf5f4>] (vfs_write) from [<c02cf970>] (ksys_write+0x60/0xec) [ 73.174863] [<c02cf970>] (ksys_write) from [<c0100080>] (ret_fast_syscall+0x0/0x1c) [ 73.175052] Exception stack(0xc2ef5fa8 to 0xc2ef5ff0) [ 73.175167] 5fa0: ???????? ???????? ???????? ???????? ???????? ???????? [ 73.175327] 5fc0: ???????? ???????? ???????? ???????? ???????? ???????? ???????? ???????? [ 73.175486] 5fe0: ???????? ???????? ???????? ???????? [ 73.175608] Code: 00000000 00000000 00000000 00000000 (00000000) [ 73.175744] ---[ end trace 9b75121265109bf1 ]---
A similar issue could be triggered by unbinding/binding the serial console device [*].
Drop __init so that imx_uart_setup_console() can be safely called at runtime.
[*] https://lore.kernel.org/all/[email protected]/
--- drivers/tty/serial/imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/imx.c +2 -2
@@ -2049,7 +2049,7 @@ imx_uart_console_write(struct console *co, const char *s, unsigned int count)* If the port was already initialised (eg, by a boot loader), * try to determine the current setup. */ -static void __init +static void imx_uart_console_get_options (struct imx_port *sport,int *baud,int *parity,int *bits) {
@@ -2108,7 +2108,7 @@ imx_uart_console_get_options(struct imx_port *sport, int *baud, } } -static int __init +static int imx_uart_console_setup (struct console *co,char *options) {struct imx_port *sport;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 447/575 usb: dwc2: drd: fix dwc2_force_mode call in dwc2_ovr_init
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit b2cab2a24fb5d13ce1d384ecfb6de827fa08a048 ]
Instead of forcing the role to Device, check the dr_mode configuration. If the core is Host only, force the mode to Host, this to avoid the dwc2_force_mode warning:
WARNING: CPU: 1 PID: 21 at drivers/usb/dwc2/core.c:615 dwc2_drd_init+0x104/0x17c
When forcing mode to Host, dwc2_force_mode may sleep the time the host role is applied. To avoid sleeping while atomic context, move the call to dwc2_force_mode after spin_unlock_irqrestore. It is safe, as interrupts are not yet unmasked here.
--- drivers/usb/dwc2/drd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc2/drd.c +2 -2
@@ -25,9 +25,9 @@ static void dwc2_ovr_init(struct dwc2_hsotg *hsotg) gotgctl &= ~(GOTGCTL_BVALOVAL |GOTGCTL_AVALOVAL |GOTGCTL_VBVALOVAL );dwc2_writel (hsotg, gotgctl,GOTGCTL ); -dwc2_force_mode (hsotg, false); -spin_unlock_irqrestore (&hsotg->lock, flags); + +dwc2_force_mode (hsotg, (hsotg->dr_mode ==USB_DR_MODE_HOST )); }static int dwc2_ovr_avalid (struct dwc2_hsotg *hsotg,bool valid)
Signature · 1 line
2.33.0