media: s5p-jpeg: Correct step and max values for V4L2_CID_JPEG_RESTART_INTERVAL
Subsystems (51)
Sasha Levin
maintainerPATCH 254/371 mic: avoid statically declaring a 'struct device'.
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit bc83f79bd2119230888fb8574639d5a51b38f903 ]
Generally, declaring a platform device as a static variable is a bad idea and can cause all kinds of problems, in particular with the DMA configuration and lifetime rules.
A specific problem we hit here is from a bug in clang that warns about certain (otherwise valid) macros when used in static variables:
drivers/misc/mic/card/mic_x100.c:285:27: warning: shift count >= width of type [-Wshift-count-overflow]
static u64 mic_dma_mask = DMA_BIT_MASK(64);
^~~~~~~~~~~~~~~~
include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
^ ~~~A slightly better way here is to create the platform device dynamically and set the dma mask in the probe function.
This avoids the warning and some other problems, but is still not ideal because the device creation should really be separated from the driver, and the fact that the device has no parent means we have to force the dma mask rather than having it set up from the bus that the device is actually on.
--- drivers/misc/mic/card/mic_x100.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/misc/mic/card/mic_x100.c +12 -16
@@ -249,6 +249,9 @@ static int __init mic_probe(struct platform_device *pdev) mdrv->dev = &pdev->dev;snprintf (mdrv->name,sizeof (mic_driver_name), mic_driver_name); +/* FIXME: use dma_set_mask_and_coherent() and check result */ +dma_coerce_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (64 )); + mdev->mmio.pa =MIC_X100_MMIO_BASE ; mdev->mmio.len =MIC_X100_MMIO_LEN ; mdev->mmio.va = devm_ioremap(&pdev->dev, MIC_X100_MMIO_BASE,
@@ -294,18 +297,6 @@ static void mic_platform_shutdown(struct platform_device *pdev)mic_remove (pdev); } -static u64 mic_dma_mask =DMA_BIT_MASK (64 ); - -static struct platform_device mic_platform_dev = { - .name = mic_driver_name, - .id =0 , - .num_resources =0 , - .dev = { - .dma_mask = &mic_dma_mask, - .coherent_dma_mask =DMA_BIT_MASK (64 ), - }, -}; -static struct platform_driver __refdata mic_platform_driver = { .probe = mic_probe, .remove = mic_remove,
@@ -315,6 +306,8 @@ static struct platform_driver __refdata mic_platform_driver = { }, }; +static struct platform_device *mic_platform_dev; +static int __init mic_init (void ) {int ret;
@@ -328,9 +321,12 @@ static int __init mic_init(void)request_module ("mic_x100_dma" );mic_init_card_debugfs (); - ret =platform_device_register (&mic_platform_dev); + + mic_platform_dev =platform_device_register_simple (mic_driver_name, +0 ,NULL ,0 ); + ret =PTR_ERR_OR_ZERO (mic_platform_dev);if (ret) { -pr_err ("platform_device_register ret %d\n" , ret); +pr_err ("platform_device_register_full ret %d\n" , ret); goto cleanup_debugfs; } ret =platform_driver_register (&mic_platform_driver);
@@ -341,7 +337,7 @@ static int __init mic_init(void)return ret; device_unregister: -platform_device_unregister (&mic_platform_dev); +platform_device_unregister (mic_platform_dev); cleanup_debugfs:mic_exit_card_debugfs (); done:
@@ -351,7 +347,7 @@ static int __init mic_init(void) static void __exit mic_exit(void) {platform_driver_unregister (&mic_platform_driver); -platform_device_unregister (&mic_platform_dev); +platform_device_unregister (mic_platform_dev);mic_exit_card_debugfs (); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 255/371 x86/kgbd: Use NMI_VECTOR not APIC_DM_NMI
In reply to Sasha LevinFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 2591bc4e8d70b4e1330d327fb7e3921f4e070a51 ]
apic->send_IPI_allbutself() takes a vector number as argument.
APIC_DM_NMI is clearly not a vector number. It's defined to 0x400 which is outside the vector space.
Use NMI_VECTOR instead as that's what it is intended to be.
--- arch/x86/kernel/kgdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/kgdb.c +1 -1
@@ -438,7 +438,7 @@ static void kgdb_disable_hw_debug(struct pt_regs *regs)*/ void kgdb_roundup_cpus (unsigned long flags) { - apic->send_IPI_allbutself (APIC_DM_NMI ); + apic->send_IPI_allbutself (NMI_VECTOR ); }#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 256/371 crypto: ccp - Reduce maximum stack usage
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 72c8117adfced37df101c8c0b3f363e0906f83f0 ]
Each of the operations in ccp_run_cmd() needs several hundred bytes of kernel stack. Depending on the inlining, these may need separate stack slots that add up to more than the warning limit, as shown in this clang based build:
drivers/crypto/ccp/ccp-ops.c:871:12: error: stack frame size of 1164 bytes in function 'ccp_run_aes_cmd' [-Werror,-Wframe-larger-than=] static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
The problem may also happen when there is no warning, e.g. in the ccp_run_cmd()->ccp_run_aes_cmd()->ccp_run_aes_gcm_cmd() call chain with over 2000 bytes.
Mark each individual function as 'noinline_for_stack' to prevent this from happening, and move the calls to the two special cases for aes into the top-level function. This will keep the actual combined stack usage to the mimimum: 828 bytes for ccp_run_aes_gcm_cmd() and at most 524 bytes for each of the other cases.
--- drivers/crypto/ccp/ccp-ops.c | 52 +++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 21 deletions(-)
drivers/crypto/ccp/ccp-ops.c +31 -21
@@ -458,8 +458,8 @@ static int ccp_copy_from_sb(struct ccp_cmd_queue *cmd_q,return ccp_copy_to_from_sb (cmd_q, wa, jobid, sb, byte_swap, true); } -static int ccp_run_aes_cmac_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_cmac_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx;
@@ -614,8 +614,8 @@ static int ccp_run_aes_cmac_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_aes_gcm_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_gcm_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx, final_wa, tag;
@@ -897,7 +897,8 @@ static int ccp_run_aes_gcm_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_aes_engine *aes = &cmd->u.aes;struct ccp_dm_workarea key, ctx;
@@ -907,12 +908,6 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)bool in_place = false;int ret; -if (aes->mode ==CCP_AES_MODE_CMAC ) -return ccp_run_aes_cmac_cmd (cmd_q, cmd); - -if (aes->mode ==CCP_AES_MODE_GCM ) -return ccp_run_aes_gcm_cmd (cmd_q, cmd); -if (!((aes->key_len ==AES_KEYSIZE_128 ) || (aes->key_len ==AES_KEYSIZE_192 ) || (aes->key_len ==AES_KEYSIZE_256 )))
@@ -1080,8 +1075,8 @@ static int ccp_run_aes_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_xts_aes_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_xts_aes_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_xts_aes_engine *xts = &cmd->u.xts;struct ccp_dm_workarea key, ctx;
@@ -1280,7 +1275,8 @@ static int ccp_run_xts_aes_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_des3_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_des3_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_des3_engine *des3 = &cmd->u.des3;
@@ -1476,7 +1472,8 @@ static int ccp_run_des3_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_sha_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_sha_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_sha_engine *sha = &cmd->u.sha;struct ccp_dm_workarea ctx;
@@ -1820,7 +1817,8 @@ static int ccp_run_sha_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_rsa_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_rsa_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_rsa_engine *rsa = &cmd->u.rsa;struct ccp_dm_workarea exp, src, dst;
@@ -1951,8 +1949,8 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_passthru_cmd (struct ccp_cmd_queue *cmd_q, -struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_passthru_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_passthru_engine *pt = &cmd->u.passthru;struct ccp_dm_workarea mask;
@@ -2083,7 +2081,8 @@ static int ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q,return ret; } -static int ccp_run_passthru_nomap_cmd (struct ccp_cmd_queue *cmd_q, +static noinline_for_stack int +ccp_run_passthru_nomap_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_passthru_nomap_engine *pt = &cmd->u.passthru_nomap;
@@ -2424,7 +2423,8 @@ static int ccp_run_ecc_pm_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)return ret; } -static int ccp_run_ecc_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) +static noinline_for_stack int +ccp_run_ecc_cmd (struct ccp_cmd_queue *cmd_q,struct ccp_cmd *cmd) {struct ccp_ecc_engine *ecc = &cmd->u.ecc;
@@ -2461,7 +2461,17 @@ int ccp_run_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)switch (cmd->engine) {case CCP_ENGINE_AES : - ret =ccp_run_aes_cmd (cmd_q, cmd); +switch (cmd->u.aes.mode) { +case CCP_AES_MODE_CMAC : + ret =ccp_run_aes_cmac_cmd (cmd_q, cmd); +break ; +case CCP_AES_MODE_GCM : + ret =ccp_run_aes_gcm_cmd (cmd_q, cmd); +break ; +default : + ret =ccp_run_aes_cmd (cmd_q, cmd); +break ; + }break ;case CCP_ENGINE_XTS_AES_128 : ret =ccp_run_xts_aes_cmd (cmd_q, cmd);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 257/371 ALSA: aoa: onyx: always initialize register read value
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit f474808acb3c4b30552d9c59b181244e0300d218 ]
A lot of places in the driver use onyx_read_register() without checking the return value, and it's been working OK for ~10 years or so, so probably never fails ... Rather than trying to check the return value everywhere, which would be relatively intrusive, at least make sure we don't use an uninitialized value.
--- sound/aoa/codecs/onyx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/aoa/codecs/onyx.c +3 -1
@@ -74,8 +74,10 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value)return 0 ; } v =i2c_smbus_read_byte_data (onyx->i2c, reg); -if (v <0 ) +if (v <0 ) { + *value =0 ;return -1 ; + } *value = (u8 )v; onyx->cache[ONYX_REG_CONTROL -FIRSTREGISTER ] = *value;return 0 ;
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 258/371 tipc: reduce risk of wakeup queue starvation
In reply to Sasha LevinFrom: Jon Maloy <[email protected]>
[ Upstream commit 7c5b42055964f587e55bd87ef334c3a27e95d144 ]
In commit 365ad353c256 ("tipc: reduce risk of user starvation during link congestion") we allowed senders to add exactly one list of extra buffers to the link backlog queues during link congestion (aka "oversubscription"). However, the criteria for when to stop adding wakeup messages to the input queue when the overload abates is inaccurate, and may cause starvation problems during very high load.
Currently, we stop adding wakeup messages after 10 total failed attempts where we find that there is no space left in the backlog queue for a certain importance level. The counter for this is accumulated across all levels, which may lead the algorithm to leave the loop prematurely, although there may still be plenty of space available at some levels. The result is sometimes that messages near the wakeup queue tail are not added to the input queue as they should be.
We now introduce a more exact algorithm, where we keep adding wakeup messages to a level as long as the backlog queue has free slots for the corresponding level, and stop at the moment there are no more such slots or when there are no more wakeup messages to dequeue.
--- net/tipc/link.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
net/tipc/link.c +21 -8
@@ -811,18 +811,31 @@ static int link_schedule_user(struct tipc_link *l, struct tipc_msg *hdr)*/ void link_prepare_wakeup (struct tipc_link *l) { +struct sk_buff_head *wakeupq = &l->wakeupq; +struct sk_buff_head *inputq = l->inputq;struct sk_buff *skb, *tmp; -int imp, i =0 ; +struct sk_buff_head tmpq; +int avail[5 ] = {0 ,}; +int imp =0 ; + +__skb_queue_head_init (&tmpq); - skb_queue_walk_safe(&l->wakeupq, skb, tmp) { +for (; imp <=TIPC_SYSTEM_IMPORTANCE ; imp++) + avail[imp] = l->backlog[imp].limit - l->backlog[imp].len; + + skb_queue_walk_safe(wakeupq, skb, tmp) { imp =TIPC_SKB_CB (skb)->chain_imp; -if (l->backlog[imp].len < l->backlog[imp].limit) { -skb_unlink (skb, &l->wakeupq); -skb_queue_tail (l->inputq, skb); - }else if (i++ >10 ) { -break ; - } +if (avail[imp] <=0 ) +continue ; + avail[imp]--; +__skb_unlink (skb, wakeupq); +__skb_queue_tail (&tmpq, skb); } + +spin_lock_bh (&inputq->lock); +skb_queue_splice_tail (&tmpq, inputq); +spin_unlock_bh (&inputq->lock); + }void tipc_link_reset (struct tipc_link *l)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 259/371 ARM: dts: stm32: add missing vdda-supply to adc on stm32h743i-eval
In reply to Sasha LevinFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit 493e84c5dc4d703d976b5875f5db22dae08a0782 ]
Add missing vdda-supply required by STM32 ADC.
board")
--- arch/arm/boot/dts/stm32h743i-eval.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/stm32h743i-eval.dts +1 -0
@@ -71,6 +71,7 @@ }; &adc_12 { + vdda-supply = <&vdda>; vref-supply = <&vdda>; status = "okay"; adc1: adc@0 {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 260/371 coredump: split pipe command whitespace before expanding template
In reply to Sasha LevinFrom: Paul Wise <[email protected]>
[ Upstream commit 315c69261dd3fa12dbc830d4fa00d1fad98d3b03 ]
Save the offsets of the start of each argument to avoid having to update pointers to each argument after every corename krealloc and to avoid having to duplicate the memory for the dump command.
Executable names containing spaces were previously being expanded from %e or %E and then split in the middle of the filename. This is incorrect behaviour since an argument list can represent arguments with spaces.
The splitting could lead to extra arguments being passed to the core dump handler that it might have interpreted as options or ignored completely.
Core dump handlers that are not aware of this Linux kernel issue will be using %e or %E without considering that it may be split and so they will be vulnerable to processes with spaces in their names breaking their argument list. If their internals are otherwise well written, such as if they are written in shell but quote arguments, they will work better after this change than before. If they are not well written, then there is a slight chance of breakage depending on the details of the code but they will already be fairly broken by the split filenames.
Core dump handlers that are aware of this Linux kernel issue will be placing %e or %E as the last item in their core_pattern and then aggregating all of the remaining arguments into one, separated by spaces. Alternatively they will be obtaining the filename via other methods. Both of these will be compatible with the new arrangement.
A side effect from this change is that unknown template types (for example %z) result in an empty argument to the dump handler instead of the argument being dropped. This is a desired change as:
It is easier for dump handlers to process empty arguments than dropped ones, especially if they are written in shell or don't pass each template item with a preceding command-line option in order to differentiate between individual template types. Most core_patterns in the wild do not use options so they can confuse different template types (especially numeric ones) if an earlier one gets dropped in old kernels. If the kernel introduces a new template type and a core_pattern uses it, the core dump handler might not expect that the argument can be dropped in old kernels.
For example, this can result in security issues when %d is dropped in old kernels. This happened with the corekeeper package in Debian and resulted in the interface between corekeeper and Linux having to be rewritten to use command-line options to differentiate between template types.
The core_pattern for most core dump handlers is written by the handler author who would generally not insert unknown template types so this change should be compatible with all the core dump handlers that exist.
--- fs/coredump.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-)
fs/coredump.c +39 -5
@@ -7,6 +7,7 @@#include <linux/stat.h> #include <linux/fcntl.h> #include <linux/swap.h> +#include <linux/ctype.h> #include <linux/string.h> #include <linux/init.h> #include <linux/pagemap.h>
@@ -187,11 +188,13 @@ static int cn_print_exe_file(struct core_name *cn)* name into corename, which must have space for at least * CORENAME_MAX_SIZE bytes plus one byte for the zero terminator. */ -static int format_corename (struct core_name *cn,struct coredump_params *cprm) +static int format_corename (struct core_name *cn,struct coredump_params *cprm, +size_t **argv,int *argc) {const struct cred *cred =current_cred ();const char *pat_ptr = core_pattern;int ispipe = (*pat_ptr =='|' ); +bool was_space = false;int pid_in_pattern =0 ;int err =0 ;
@@ -201,12 +204,35 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm)return -ENOMEM ; cn->corename[0 ] ='\0' ; -if (ispipe) +if (ispipe) { +int argvs =sizeof (core_pattern) /2 ; + (*argv) =kmalloc_array (argvs,sizeof (**argv),GFP_KERNEL ); +if (!(*argv)) +return -ENOMEM ; + (*argv)[(*argc)++] =0 ; ++pat_ptr; + }/* Repeat as long as we have more pattern to process and more output space */ while (*pat_ptr) { +/* +* Split on spaces before doing template expansion so that +* %e and %E don't get split if they have spaces in them +*/ +if (ispipe) { +if (isspace (*pat_ptr)) { + was_space = true; + pat_ptr++; +continue ; + }else if (was_space) { + was_space = false; + err =cn_printf (cn,"%c" ,'\0' ); +if (err) +return err; + (*argv)[(*argc)++] = cn->used; + } + }if (*pat_ptr !='%' ) { err =cn_printf (cn,"%c" , *pat_ptr++); }else {
@@ -546,6 +572,8 @@ void do_coredump(const siginfo_t *siginfo)struct cred *cred;int retval =0 ;int ispipe; +size_t *argv =NULL ; +int argc =0 ;struct files_struct *displaced;/* require nonrelative corefile path and be extra careful */ bool need_suid_safe = false;
@@ -592,9 +620,10 @@ void do_coredump(const siginfo_t *siginfo) old_cred =override_creds (cred); - ispipe =format_corename (&cn, &cprm); + ispipe =format_corename (&cn, &cprm, &argv, &argc);if (ispipe) { +int argi;int dump_count;char **helper_argv;struct subprocess_info *sub_info;
@@ -637,12 +666,16 @@ void do_coredump(const siginfo_t *siginfo) goto fail_dropcount; } - helper_argv =argv_split (GFP_KERNEL , cn.corename,NULL ); + helper_argv =kmalloc_array (argc +1 ,sizeof (*helper_argv), +GFP_KERNEL );if (!helper_argv) {printk (KERN_WARNING "%s failed to allocate memory\n" , __func__); goto fail_dropcount; } +for (argi =0 ; argi < argc; argi++) + helper_argv[argi] = cn.corename + argv[argi]; + helper_argv[argi] =NULL ; retval = -ENOMEM ; sub_info = call_usermodehelper_setup(helper_argv[0],
@@ -652,7 +685,7 @@ void do_coredump(const siginfo_t *siginfo) retval =call_usermodehelper_exec (sub_info,UMH_WAIT_EXEC ); -argv_free (helper_argv); +kfree (helper_argv);if (retval) {printk (KERN_INFO "Core dump to |%s pipe failed\n" , cn.corename);
@@ -771,6 +804,7 @@ void do_coredump(const siginfo_t *siginfo)if (ispipe)atomic_dec (&core_dump_count); fail_unlock: +kfree (argv);kfree (cn.corename);coredump_finish (mm, core_dumped);revert_creds (old_cred);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 261/371 net/mlx5: Fix mlx5_ifc_query_lag_out_bits
In reply to Sasha LevinFrom: Mark Zhang <[email protected]>
[ Upstream commit ea77388b02270b0af8dc57f668f311235ea068f0 ]
Remove the "reserved_at_40" field to match the device specification.
--- include/linux/mlx5/mlx5_ifc.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/mlx5/mlx5_ifc.h +0 -2
@@ -8671,8 +8671,6 @@ struct mlx5_ifc_query_lag_out_bits {u8 syndrome[0x20 ]; -u8 reserved_at_40[0x40 ]; -struct mlx5_ifc_lagc_bits ctx; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 262/371 cifs: fix rmmod regression in cifs.ko caused by force_sig changes
In reply to Sasha LevinFrom: Steve French <[email protected]>
[ Upstream commit 247bc9470b1eeefc7b58cdf2c39f2866ba651509 ]
The global change from force_sig caused module unloading of cifs.ko to fail (since the cifsd process could not be killed, "rmmod cifs" now would always fail)
--- fs/cifs/connect.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/connect.c +1 -0
@@ -921,6 +921,7 @@ cifs_demultiplex_thread(void *p)mempool_resize (cifs_req_poolp, length + cifs_min_rcv);set_freezable (); +allow_signal (SIGKILL );while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 263/371 crypto: caam - free resources in case caam_rng registration failed
In reply to Sasha LevinFrom: Iuliana Prodan <[email protected]>
[ Upstream commit c59a1d41672a89b5cac49db1a472ff889e35a2d2 ]
Check the return value of the hardware registration for caam_rng and free resources in case of failure.
--- drivers/crypto/caam/caamrng.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/caam/caamrng.c +4 -1
@@ -353,7 +353,10 @@ static int __init caam_rng_init(void) goto free_rng_ctx;dev_info (dev,"registering rng-caam\n" ); -return hwrng_register (&caam_rng); + + err =hwrng_register (&caam_rng); +if (!err) +return err; free_rng_ctx:kfree (rng_ctx);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 264/371 ext4: set error return correctly when ext4_htree_store_dirent fails
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 7a14826ede1d714f0bb56de8167c0e519041eeda ]
Currently when the call to ext4_htree_store_dirent fails the error return variable 'ret' is is not being set to the error code and variable count is instead, hence the error code is not being returned. Fix this by assigning ret to the error return code.
Addresses-Coverity: ("Unused value")
--- fs/ext4/inline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inline.c +1 -1
@@ -1425,7 +1425,7 @@ int htree_inlinedir_to_tree(struct file *dir_file, err =ext4_htree_store_dirent (dir_file, hinfo->hash, hinfo->minor_hash, de, &tmp_str);if (err) { - count = err; + ret = err; goto out; } count++;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 265/371 ASoC: es8328: Fix copy-paste error in es8328_right_line_controls
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 630742c296341a8cfe00dfd941392025ba8dd4e8 ]
It seems 'es8328_rline_enum' should be used
in es8328_right_line_controls
--- sound/soc/codecs/es8328.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/es8328.c +1 -1
@@ -231,7 +231,7 @@ static const struct soc_enum es8328_rline_enum =ARRAY_SIZE (es8328_line_texts), es8328_line_texts);static const struct snd_kcontrol_new es8328_right_line_controls = -SOC_DAPM_ENUM ("Route" , es8328_lline_enum); +SOC_DAPM_ENUM ("Route" , es8328_rline_enum);/* Left Mixer */ static const struct snd_kcontrol_new es8328_left_mixer_controls[] = {
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 266/371 ASoC: cs4349: Use PM ops 'cs4349_runtime_pm'
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 9b4275c415acca6264a3d7f1182589959c93d530 ]
sound/soc/codecs/cs4349.c:358:32: warning:
cs4349_runtime_pm defined but not used [-Wunused-const-variable=]
cs4349_runtime_pm ops already defined, it seems we should enable it.
--- sound/soc/codecs/cs4349.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/cs4349.c +1 -0
@@ -380,6 +380,7 @@ static struct i2c_driver cs4349_i2c_driver = { .driver = { .name = "cs4349", .of_match_table = cs4349_of_match, + .pm = &cs4349_runtime_pm, }, .id_table = cs4349_i2c_id, .probe = cs4349_i2c_probe,
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Sasha Levin
maintainerPATCH 267/371 ASoC: wm8737: Fix copy-paste error in wm8737_snd_controls
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 554b75bde64bcad9662530726d1483f7ef012069 ]
sound/soc/codecs/wm8737.c:112:29: warning:
high_3d defined but not used [-Wunused-const-variable=]
'high_3d' should be used for 3D High Cut-off.
--- sound/soc/codecs/wm8737.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8737.c +1 -1
@@ -170,7 +170,7 @@ SOC_DOUBLE("Polarity Invert Switch", WM8737_ADC_CONTROL, 5, 6, 1, 0),SOC_SINGLE ("3D Switch" ,WM8737_3D_ENHANCE ,0 ,1 ,0 ),SOC_SINGLE ("3D Depth" ,WM8737_3D_ENHANCE ,1 ,15 ,0 ),SOC_ENUM ("3D Low Cut-off" , low_3d), -SOC_ENUM ("3D High Cut-off" , low_3d), +SOC_ENUM ("3D High Cut-off" , high_3d),SOC_SINGLE_TLV ("3D ADC Volume" ,WM8737_3D_ENHANCE ,7 ,1 ,1 , adc_tlv), SOC_SINGLE("Noise Gate Switch", WM8737_NOISE_GATE, 0, 1, 0),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 268/371 net/rds: Add a few missing rds_stat_names entries
In reply to Sasha LevinFrom: Gerd Rausch <[email protected]>
[ Upstream commit 55c70ca00c982fbc0df4c4d3e31747fb73f4ddb5 ]
In a previous commit, fields were added to "struct rds_statistics" but array "rds_stat_names" was not updated accordingly.
Please note the inconsistent naming of the string representations that is done in the name of compatibility
with the Oracle internal code-base.
s_recv_bytes_added_to_socket -> "recv_bytes_added_to_sock"s_recv_bytes_removed_from_socket -> "recv_bytes_freed_fromsock"
--- net/rds/stats.c | 2 ++ 1 file changed, 2 insertions(+)
net/rds/stats.c +2 -0
@@ -76,6 +76,8 @@ static const char *const rds_stat_names[] = {"cong_update_received" ,"cong_send_error" ,"cong_send_blocked" , +"recv_bytes_added_to_sock" , + "recv_bytes_freed_fromsock", }; void rds_stats_info_copy(struct rds_info_iterator *iter,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 269/371 bnxt_en: Fix handling FRAG_ERR when NVM_INSTALL_UPDATE cmd fails
In reply to Sasha LevinFrom: Vasundhara Volam <[email protected]>
[ Upstream commit dd2ebf3404c7c295014bc025dea23960960ceb1a ]
If FW returns FRAG_ERR in response error code, driver is resending the command only when HWRM command returns success. Fix the code to resend NVM_INSTALL_UPDATE command with DEFRAG install flags, if FW returns FRAG_ERR in its response error code.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +5 -7
@@ -1667,21 +1667,19 @@ static int bnxt_flash_package_from_file(struct net_device *dev,mutex_lock (&bp->hwrm_cmd_lock); hwrm_err =_hwrm_send_message (bp, &install,sizeof (install),INSTALL_PACKAGE_TIMEOUT ); -if (hwrm_err) - goto flash_pkg_exit; - -if (resp->error_code) { +if (hwrm_err) {u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err; -if (error_code ==NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { +if (resp->error_code && error_code == +NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { install.flags |=cpu_to_le16 (NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG ); hwrm_err =_hwrm_send_message (bp, &install,sizeof (install),INSTALL_PACKAGE_TIMEOUT ); -if (hwrm_err) - goto flash_pkg_exit; } +if (hwrm_err) + goto flash_pkg_exit; }if (resp->result) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 270/371 signal: Allow cifs and drbd to receive their terminating signals
In reply to Sasha LevinFrom: "Eric W. Biederman" <[email protected]>
[ Upstream commit 33da8e7c814f77310250bb54a9db36a44c5de784 ]
My recent to change to only use force_sig for a synchronous events wound up breaking signal reception cifs and drbd. I had overlooked the fact that by default kthreads start out with all signals set to SIG_IGN. So a change I thought was safe turned out to have made it impossible for those kernel thread to catch their signals.
Reverting the work on force_sig is a bad idea because what the code was doing was very much a misuse of force_sig. As the way force_sig ultimately allowed the signal to happen was to change the signal handler to SIG_DFL. Which after the first signal will allow userspace to send signals to these kernel threads. At least for wake_ack_receiver in drbd that does not appear actively wrong.
So correct this problem by adding allow_kernel_signal that will allow signals whose siginfo reports they were sent by the kernel through, but will not allow userspace generated signals, and update cifs and drbd to call allow_kernel_signal in an appropriate place so that their thread can receive this signal.
Fixing things this way ensures that userspace won't be able to send signals and cause problems, that it is clear which signals the threads are expecting to receive, and it guarantees that nothing else in the system will be affected.
This change was partly inspired by similar cifs and drbd patches that added allow_signal.
--- drivers/block/drbd/drbd_main.c | 2 ++ fs/cifs/connect.c | 2 +- include/linux/signal.h | 15 ++++++++++++++- kernel/signal.c | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-)
drivers/block/drbd/drbd_main.c +2 -0
@@ -334,6 +334,8 @@ static int drbd_thread_setup(void *arg) thi->name[0 ], resource->name); +allow_kernel_signal (DRBD_SIGKILL ); +allow_kernel_signal (SIGXCPU ); restart: retval = thi->function (thi);
fs/cifs/connect.c +1 -1
@@ -921,7 +921,7 @@ cifs_demultiplex_thread(void *p)mempool_resize (cifs_req_poolp, length + cifs_min_rcv);set_freezable (); -allow_signal (SIGKILL ); +allow_kernel_signal (SIGKILL );while (server->tcpStatus != CifsExiting) {if (try_to_freeze ())continue ;
include/linux/signal.h +14 -1
@@ -268,6 +268,9 @@ extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);extern void exit_signals (struct task_struct *tsk);extern void kernel_sigaction (int ,__sighandler_t ); +#define SIG_KTHREAD ((__force __sighandler_t)2) +#define SIG_KTHREAD_KERNEL ((__force __sighandler_t)3) +static inline void allow_signal (int sig) {/*
@@ -275,7 +278,17 @@ static inline void allow_signal(int sig)* know it'll be handled, so that they don't get converted to * SIGKILL or just silently dropped. */ -kernel_sigaction (sig, (__force __sighandler_t )2 ); +kernel_sigaction (sig,SIG_KTHREAD ); +} + +static inline void allow_kernel_signal (int sig) +{ +/* +* Kernel threads handle their own signals. Let the signal code +* know signals sent by the kernel will be handled, so that they +* don't get silently dropped. +*/ +kernel_sigaction (sig,SIG_KTHREAD_KERNEL ); }static inline void disallow_signal (int sig)
kernel/signal.c +5 -0
@@ -85,6 +85,11 @@ static int sig_task_ignored(struct task_struct *t, int sig, bool force) handler == SIG_DFL && !(force && sig_kernel_only(sig)))return 1 ; +/* Only allow kernel generated signals to this kthread */ +if (unlikely ((t->flags &PF_KTHREAD ) && + (handler ==SIG_KTHREAD_KERNEL ) && !force)) +return true; +return sig_handler_ignored (handler, sig); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 271/371 ASoC: sun4i-i2s: RX and TX counter registers are swapped
In reply to Sasha LevinFrom: Maxime Ripard <[email protected]>
[ Upstream commit cf2c0e1ce9544df42170fb921f12da82dc0cc8d6 ]
The RX and TX counters registers offset have been swapped, fix that.
--- sound/soc/sunxi/sun4i-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/sunxi/sun4i-i2s.c +2 -2
@@ -80,8 +80,8 @@#define SUN4I_I2S_CLK_DIV_MCLK_MASK GENMASK(3, 0)#define SUN4I_I2S_CLK_DIV_MCLK (mclk) ((mclk) << 0) -#define SUN4I_I2S_RX_CNT_REG 0x28 -#define SUN4I_I2S_TX_CNT_REG 0x2c +#define SUN4I_I2S_TX_CNT_REG 0x28 +#define SUN4I_I2S_RX_CNT_REG 0x2c#define SUN4I_I2S_TX_CHAN_SEL_REG 0x30#define SUN4I_I2S_CHAN_SEL (num_chan) (((num_chan) - 1) << 0)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 272/371 dmaengine: dw: platform: Switch to acpi_dma_controller_register()
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit e7b8514e4d68bec21fc6385fa0a66797ddc34ac9 ]
There is a possibility to have registered ACPI DMA controller while it has been gone already.
To avoid the potential crash, move to non-managed acpi_dma_controller_register().
--- drivers/dma/dw/platform.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/dma/dw/platform.c +12 -2
@@ -87,13 +87,20 @@ static void dw_dma_acpi_controller_register(struct dw_dma *dw)dma_cap_set (DMA_SLAVE , info->dma_cap); info->filter_fn = dw_dma_acpi_filter; - ret =devm_acpi_dma_controller_register (dev, acpi_dma_simple_xlate, - info); + ret =acpi_dma_controller_register (dev, acpi_dma_simple_xlate, info);if (ret) dev_err(dev, "could not register acpi_dma_controller\n"); } + +static void dw_dma_acpi_controller_free (struct dw_dma *dw) +{ +struct device *dev = dw->dma.dev; + +acpi_dma_controller_free (dev); +}#else /* !CONFIG_ACPI */ static inline void dw_dma_acpi_controller_register (struct dw_dma *dw) {} +static inline void dw_dma_acpi_controller_free (struct dw_dma *dw) {}#endif /* !CONFIG_ACPI */ #ifdef CONFIG_OF
@@ -249,6 +256,9 @@ static int dw_remove(struct platform_device *pdev) {struct dw_dma_chip *chip =platform_get_drvdata (pdev); +if (ACPI_HANDLE (&pdev->dev)) +dw_dma_acpi_controller_free (chip->dw); +if (pdev->dev.of_node)of_dma_controller_free (pdev->dev.of_node);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 273/371 mac80211: minstrel_ht: fix per-group max throughput rate initialization
In reply to Sasha LevinFrom: Felix Fietkau <[email protected]>
[ Upstream commit 56dd918ff06e3ee24d8067e93ed12b2a39e71394 ]
The group number needs to be multiplied by the number of rates per group to get the full rate index
--- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -529,7 +529,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)/* (re)Initialize group rate indexes */ for (j =0 ; j <MAX_THR_RATES ; j++) - tmp_group_tp_rate[j] = group; + tmp_group_tp_rate[j] =MCS_GROUP_RATES * group;for (i =0 ; i <MCS_GROUP_RATES ; i++) {if (!(mi->supported[group] &BIT (i)))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 274/371 media: atmel: atmel-isi: fix timeout value for stop streaming
In reply to Sasha LevinFrom: Alexandre Kroupski <[email protected]>
[ Upstream commit 623fd246bb40234fe68dd4e7c1f1f081f9c45a3d ]
In case of sensor malfunction, stop streaming timeout takes much longer than expected. This is due to conversion of time to jiffies: milliseconds multiplied with HZ (ticks/second) gives out a value of jiffies with 10^3 greater. We need to also divide by 10^3 to obtain the right jiffies value. In other words FRAME_INTERVAL_MILLI_SEC must be in seconds in order to multiply by HZ and get the right jiffies value to add to the current jiffies for the timeout expire time.
--- drivers/media/platform/atmel/atmel-isi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/atmel/atmel-isi.c +1 -1
@@ -496,7 +496,7 @@ static void stop_streaming(struct vb2_queue *vq)spin_unlock_irq (&isi->irqlock);if (!isi->enable_preview_path) { - timeout = jiffies +FRAME_INTERVAL_MILLI_SEC *HZ ; + timeout = jiffies + (FRAME_INTERVAL_MILLI_SEC *HZ ) /1000 ;/* Wait until the end of the current frame. */ while ((isi_readl (isi,ISI_STATUS ) &ISI_CTRL_CDC ) &&time_before (jiffies, timeout))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 275/371 rtc: pcf2127: bugfix: read rtc disables watchdog
In reply to Sasha LevinFrom: Bruno Thomsen <[email protected]>
[ Upstream commit 7f43020e3bdb63d65661ed377682702f8b34d3ea ]
The previous fix listed bulk read of registers as root cause of accendential disabling of watchdog, since the watchdog counter register (WD_VAL) was zeroed.
Tested with the same PCF2127 chip as Sean reveled root cause of WD_VAL register value zeroing was caused by reading CTRL2 register which is one of the watchdog feature control registers.
So the solution is to not read the first two control registers (CTRL1 and CTRL2) in pcf2127_rtc_read_time as they are not needed anyway. Size of local buf variable is kept to allow easy usage of register defines to improve readability of code.
Debug trace line was updated after CTRL1 and CTRL2 are no longer read from the chip. Also replaced magic numbers in buf access with register defines.
--- drivers/rtc/rtc-pcf2127.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)
drivers/rtc/rtc-pcf2127.c +12 -20
@@ -52,20 +52,14 @@ static int pcf2127_rtc_read_time(struct device *dev, struct rtc_time *tm)struct pcf2127 *pcf2127 =dev_get_drvdata (dev);unsigned char buf[10 ];int ret; -int i; -for (i =0 ; i <=PCF2127_REG_CTRL3 ; i++) { - ret =regmap_read (pcf2127->regmap,PCF2127_REG_CTRL1 + i, - (unsigned int *)(buf + i)); -if (ret) { -dev_err (dev,"%s: read error\n" , __func__); -return ret; - } - } - - ret =regmap_bulk_read (pcf2127->regmap,PCF2127_REG_SC , - (buf +PCF2127_REG_SC ), -ARRAY_SIZE (buf) -PCF2127_REG_SC ); +/* +* Avoid reading CTRL2 register as it causes WD_VAL register +* value to reset to 0 which means watchdog is stopped. +*/ + ret =regmap_bulk_read (pcf2127->regmap,PCF2127_REG_CTRL3 , + (buf +PCF2127_REG_CTRL3 ), +ARRAY_SIZE (buf) -PCF2127_REG_CTRL3 );if (ret) {dev_err (dev,"%s: read error\n" , __func__);return ret;
@@ -86,14 +80,12 @@ static int pcf2127_rtc_read_time(struct device *dev, struct rtc_time *tm) }dev_dbg (dev, -"%s: raw data is cr1=%02x, cr2=%02x, cr3=%02x, " -"sec=%02x, min=%02x, hr=%02x, " +"%s: raw data is cr3=%02x, sec=%02x, min=%02x, hr=%02x, " "mday=%02x, wday=%02x, mon=%02x, year=%02x\n" , - __func__, - buf[0 ], buf[1 ], buf[2 ], - buf[3 ], buf[4 ], buf[5 ], - buf[6 ], buf[7 ], buf[8 ], buf[9 ]); - + __func__, buf[PCF2127_REG_CTRL3 ], buf[PCF2127_REG_SC ], + buf[PCF2127_REG_MN ], buf[PCF2127_REG_HR ], + buf[PCF2127_REG_DM ], buf[PCF2127_REG_DW ], + buf[PCF2127_REG_MO ], buf[PCF2127_REG_YR ]); tm->tm_sec =bcd2bin (buf[PCF2127_REG_SC ] &0x7F ); tm->tm_min =bcd2bin (buf[PCF2127_REG_MN ] &0x7F );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 276/371 mips: avoid explicit UB in assignment of mips_io_port_base
In reply to Sasha LevinFrom: Nick Desaulniers <[email protected]>
[ Upstream commit 12051b318bc3ce5b42d6d786191008284b067d83 ]
The code in question is modifying a variable declared const through pointer manipulation. Such code is explicitly undefined behavior, and is the lone issue preventing malta_defconfig from booting when built with Clang:
If an attempt is made to modify an object defined with a const-qualified type through use of an lvalue with non-const-qualified type, the behavior is undefined.
LLVM is removing such assignments. A simple fix is to not declare variables const that you plan on modifying. Limiting the scope would be a better method of preventing unwanted writes to such a variable.
Further, the code in question mentions "compiler bugs" without any links to bug reports, so it is difficult to know if the issue is resolved in GCC. The patch was authored in 2006, which would have been GCC 4.0.3 or 4.1.1. The minimal supported version of GCC in the Linux kernel is currently 4.6.
For what its worth, there was UB before the commit in question, it just added a barrier and got lucky IRT codegen. I don't think there's any actual compiler bugs related, just runtime bugs due to UB.
--- arch/mips/include/asm/io.h | 14 ++------------ arch/mips/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-)
arch/mips/include/asm/io.h +2 -12
@@ -60,21 +60,11 @@* instruction, so the lower 16 bits must be zero. Should be true on * on any sane architecture; generic code does not use this assumption. */ -extern const unsigned long mips_io_port_base; +extern unsigned long mips_io_port_base; -/* -* Gcc will generate code to load the value of mips_io_port_base after each -* function call which may be fairly wasteful in some cases. So we don't -* play quite by the book. We tell gcc mips_io_port_base is a long variable -* which solves the code generation issue. Now we need to violate the -* aliasing rules a little to make initialization possible and finally we -* will need the barrier() to fight side effects of the aliasing chat. -* This trickery will eventually collapse under gcc's optimizer. Oh well. -*/ static inline void set_io_port_base (unsigned long base) { - * (unsigned long *) &mips_io_port_base = base; -barrier (); + mips_io_port_base = base; }/*
arch/mips/kernel/setup.c +1 -1
@@ -75,7 +75,7 @@ static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;* mips_io_port_base is the begin of the address space to which x86 style * I/O ports are mapped. */ -const unsigned long mips_io_port_base =-1 ; +unsigned long mips_io_port_base =-1 ;EXPORT_SYMBOL (mips_io_port_base);static struct resource code_resource = { .name ="Kernel code" , };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 277/371 iommu/mediatek: Fix iova_to_phys PA start for 4GB mode
In reply to Sasha LevinFrom: Yong Wu <[email protected]>
[ Upstream commit 76ce65464fcd2c21db84391572b7938b716aceb0 ]
In M4U 4GB mode, the physical address is remapped as below:
CPU Physical address:
====================
0 1G 2G 3G 4G 5G |---A---|---B---|---C---|---D---|---E---|
+--I/O--+------------Memory-------------+
IOMMU output physical address:
=============================
4G 5G 6G 7G 8G
|---E---|---B---|---C---|---D---|
+------------Memory-------------+The Region 'A'(I/O) can not be mapped by M4U; For Region 'B'/'C'/'D', the bit32 of the CPU physical address always is needed to set, and for Region 'E', the CPU physical address keep as is. something looks like this:
CPU PA -> M4U OUTPUT PA 0x4000_0000 0x1_4000_0000 (Add bit32) 0x8000_0000 0x1_8000_0000 ... 0xc000_0000 0x1_c000_0000 ... 0x1_0000_0000 0x1_0000_0000 (No change)
Additionally, the iommu consumers always use the CPU phyiscal address.
The PA in the iova_to_phys that is got from v7s always is u32, But from the CPU point of view, PA only need add BIT(32) when PA < 0x4000_0000.
for 4GB mode")
--- drivers/iommu/mtk_iommu.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +25 -1
@@ -115,6 +115,30 @@ struct mtk_iommu_domain {static struct iommu_ops mtk_iommu_ops; +/* +* In M4U 4GB mode, the physical address is remapped as below: +* +* CPU Physical address: +* ==================== +* +* 0 1G 2G 3G 4G 5G +* |---A---|---B---|---C---|---D---|---E---| +* +--I/O--+------------Memory-------------+ +* +* IOMMU output physical address: +* ============================= +* +* 4G 5G 6G 7G 8G +* |---E---|---B---|---C---|---D---| +* +------------Memory-------------+ +* +* The Region 'A'(I/O) can NOT be mapped by M4U; For Region 'B'/'C'/'D', the +* bit32 of the CPU physical address always is needed to set, and for Region +* 'E', the CPU physical address keep as is. +* Additionally, The iommu consumers always use the CPU phyiscal address. +*/ +#define MTK_IOMMU_4GB_MODE_REMAP_BASE 0x40000000 +static LIST_HEAD (m4ulist);/* List all the M4U HWs */ #define for_each_m4u (data) list_for_each_entry(data, &m4ulist, list)
@@ -404,7 +428,7 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, pa = dom->iop->iova_to_phys (dom->iop, iova);spin_unlock_irqrestore (&dom->pgtlock, flags); -if (data->enable_4GB) +if (data->enable_4GB && pa <MTK_IOMMU_4GB_MODE_REMAP_BASE ) pa |=BIT_ULL (32 );return pa;
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 278/371 ahci: Do not export local variable ahci_em_messages
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 60fc35f327e0a9e60b955c0f3c3ed623608d1baa ]
The commit ed08d40cdec4
("ahci: Changing two module params with static and __read_mostly")
moved ahci_em_messages to be static while missing the fact of exporting it.
WARNING: "ahci_em_messages" [vmlinux] is a static EXPORT_SYMBOL_GPL
Drop export for the local variable ahci_em_messages.
--- drivers/ata/libahci.c | 1 - 1 file changed, 1 deletion(-)
drivers/ata/libahci.c +0 -1
@@ -191,7 +191,6 @@ struct ata_port_operations ahci_pmp_retry_srst_ops = {EXPORT_SYMBOL_GPL (ahci_pmp_retry_srst_ops);static bool ahci_em_messages__read_mostly = true; -EXPORT_SYMBOL_GPL (ahci_em_messages);module_param (ahci_em_messages, bool,0444 );/* add other LED protocol types when they become supported */ MODULE_PARM_DESC(ahci_em_messages,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 279/371 Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()"
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit ab9bb6318b0967671e0c9b6537c1537d51ca4f45 ]
Commit dfe2a77fd243 ("kfifo: fix kfifo_alloc() and kfifo_init()") made the kfifo code round the number of elements up. That was good for __kfifo_alloc(), but it's actually wrong for __kfifo_init().
The difference? __kfifo_alloc() will allocate the rounded-up number of elements, but __kfifo_init() uses an allocation done by the caller. We can't just say "use more elements than the caller allocated", and have to round down.
The good news? All the normal cases will be using power-of-two arrays anyway, and most users of kfifo's don't use kfifo_init() at all, but one of the helper macros to declare a KFIFO that enforce the proper power-of-two behavior. But it looks like at least ibmvscsis might be affected.
The bad news? Will Deacon refers to an old thread and points points out that the memory ordering in kfifo's is questionable. See
https://lore.kernel.org/lkml/[email protected]/
for more.
--- lib/kfifo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/kfifo.c +2 -1
@@ -82,7 +82,8 @@ int __kfifo_init(struct __kfifo *fifo, void *buffer, { size /= esize; - size =roundup_pow_of_two (size); +if (!is_power_of_2 (size)) + size =rounddown_pow_of_two (size); fifo->in =0 ; fifo->out =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 280/371 hwmon: (lm75) Fix write operations for negative temperatures
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit 7d82fcc9d9e81241778aaa22fda7be753e237d86 ]
Writes into limit registers fail if the temperature written is negative. The regmap write operation checks the value range, regmap_write accepts an unsigned int as parameter, and the temperature value passed to regmap_write is kept in a variable declared as long. Negative values are converted large unsigned integers, which fails the range check. Fix by type casting the temperature to u16 when calling regmap_write().
--- drivers/hwmon/lm75.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/lm75.c +1 -1
@@ -165,7 +165,7 @@ static int lm75_write(struct device *dev, enum hwmon_sensor_types type, temp =DIV_ROUND_CLOSEST (temp << (resolution -8 ),1000 ) << (16 - resolution); -return regmap_write (data->regmap, reg, temp); +return regmap_write (data->regmap, reg, (u16 )temp); } static umode_t lm75_is_visible(const void *data, enum hwmon_sensor_types type,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 281/371 power: supply: Init device wakeup after device_add()
In reply to Sasha LevinFrom: Stephen Boyd <[email protected]>
[ Upstream commit 8288022284859acbcc3cf1a073a1e2692d6c2543 ]
We may want to use the device pointer in device_init_wakeup() with functions that expect the device to already be added with device_add(). For example, if we were to link the device initializing wakeup to something in sysfs such as a class for wakeups we'll run into an error. It looks like this code was written with the assumption that the device would be added before initializing wakeup due to the order of operations in power_supply_unregister().
Let's change the order of operations so we don't run into problems here.
--- drivers/power/supply/power_supply_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/power/supply/power_supply_core.c +5 -5
@@ -891,14 +891,14 @@ __power_supply_register(struct device *parent, }spin_lock_init (&psy->changed_lock); - rc =device_init_wakeup (dev, ws); -if (rc) - goto wakeup_init_failed; - rc =device_add (dev);if (rc) goto device_add_failed; + rc =device_init_wakeup (dev, ws); +if (rc) + goto wakeup_init_failed; + rc =psy_register_thermal (psy);if (rc) goto register_thermal_failed;
@@ -935,8 +935,8 @@ __power_supply_register(struct device *parent,psy_unregister_thermal (psy); register_thermal_failed:device_del (dev); -device_add_failed: wakeup_init_failed: +device_add_failed: check_supplies_failed: dev_set_name_failed:put_device (dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 282/371 x86, perf: Fix the dependency of the x86 insn decoder selftest
In reply to Sasha LevinFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 7720804a2ae46c90265a32c81c45fb6f8d2f4e8b ]
Since x86 instruction decoder is not only for kprobes, it should be tested when the insn.c is compiled. (e.g. perf is enabled but kprobes is disabled)
--- arch/x86/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig.debug +1 -1
@@ -189,7 +189,7 @@ config HAVE_MMIOTRACE_SUPPORT config X86_DECODER_SELFTEST bool "x86 instruction decoder selftest" - depends on DEBUG_KERNEL && KPROBES + depends on DEBUG_KERNEL && INSTRUCTION_DECODER depends on !COMPILE_TEST ---help--- Perform x86 instruction decoder selftests at build time.
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 283/371 staging: greybus: light: fix a couple double frees
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 329101244f214952606359d254ae883b7109e1a5 ]
The problem is in gb_lights_request_handler(). If we get a request to change the config then we release the light with gb_lights_light_release() and re-allocated it. However, if the allocation fails part way through then we call gb_lights_light_release() again. This can lead to a couple different double frees where we haven't cleared out the original values:
gb_lights_light_v4l2_unregister(light); ... kfree(light->channels); kfree(light->name);
I also made a small change to how we set "light->channels_count = 0;". The original code handled this part fine and did not cause a use after free but it was sort of complicated to read.
--- drivers/staging/greybus/light.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/greybus/light.c +6 -6
@@ -1103,21 +1103,21 @@ static void gb_lights_channel_release(struct gb_channel *channel)static void gb_lights_light_release (struct gb_light *light) {int i; -int count; light->ready = false; - count = light->channels_count; -if (light->has_flash)gb_lights_light_v4l2_unregister (light); + light->has_flash = false; -for (i =0 ; i < count; i++) { +for (i =0 ; i < light->channels_count; i++)gb_lights_channel_release (&light->channels[i]); - light->channels_count--; - } + light->channels_count =0 ; +kfree (light->channels); + light->channels =NULL ;kfree (light->name); + light->name =NULL ; }static void gb_lights_release (struct gb_lights *glights)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 284/371 irqdomain: Add the missing assignment of domain->fwnode for named fwnode
In reply to Sasha LevinFrom: Dexuan Cui <[email protected]>
[ Upstream commit 711419e504ebd68c8f03656616829c8ad7829389 ]
Recently device pass-through stops working for Linux VM running on Hyper-V.
git-bisect shows the regression is caused by the recent commit 467a3bb97432 ("PCI: hv: Allocate a named fwnode ..."), but the root cause is that the commit d59f6617eef0 forgets to set the domain->fwnode for IRQCHIP_FWNODE_NAMED*, and as a result:
1. The domain->fwnode remains to be NULL.
2. irq_find_matching_fwspec() returns NULL since "h->fwnode == fwnode" is false, and pci_set_bus_msi_domain() sets the Hyper-V PCI root bus's msi_domain to NULL.
3. When the device is added onto the root bus, the device's dev->msi_domain is set to NULL in pci_set_msi_domain().
4. When a device driver tries to enable MSI-X, pci_msi_setup_msi_irqs() calls arch_setup_msi_irqs(), which uses the native MSI chip (i.e. arch/x86/kernel/apic/msi.c: pci_msi_controller) to set up the irqs, but actually pci_msi_setup_msi_irqs() is supposed to call msi_domain_alloc_irqs() with the hbus->irq_domain, which is created in hv_pcie_init_irq_domain() and is associated with the Hyper-V chip hv_msi_irq_chip. Consequently, the irq line is not properly set up, and the device driver can not receive any interrupt.
--- kernel/irq/irqdomain.c | 1 + 1 file changed, 1 insertion(+)
kernel/irq/irqdomain.c +1 -0
@@ -147,6 +147,7 @@ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size,switch (fwid->type) {case IRQCHIP_FWNODE_NAMED :case IRQCHIP_FWNODE_NAMED_ID : + domain->fwnode = fwnode; domain->name =kstrdup (fwid->name,GFP_KERNEL );if (!domain->name) {kfree (domain);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 285/371 bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 420c20be08a4597404d272ae9793b642401146eb ]
An earlier commit re-worked the setting of the bitmask and is now assigning v with some bit flags rather than bitwise or-ing them into v, consequently the earlier bit-settings of v are being lost. Fix this by replacing an assignment with the bitwise or instead.
Addresses-Coverity: ("Unused value")
--- drivers/bcma/driver_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bcma/driver_pci.c +2 -2
@@ -78,7 +78,7 @@ static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address) v |= (address <<BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD ); } - v =BCMA_CORE_PCI_MDIODATA_START ; + v |=BCMA_CORE_PCI_MDIODATA_START ; v |=BCMA_CORE_PCI_MDIODATA_READ ; v |=BCMA_CORE_PCI_MDIODATA_TA ;
@@ -121,7 +121,7 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device, v |= (address <<BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD ); } - v =BCMA_CORE_PCI_MDIODATA_START ; + v |=BCMA_CORE_PCI_MDIODATA_START ; v |=BCMA_CORE_PCI_MDIODATA_WRITE ; v |=BCMA_CORE_PCI_MDIODATA_TA ; v |= data;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 286/371 iio: dac: ad5380: fix incorrect assignment to val
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit b1e18768ef1214c0a8048327918a182cabe09f9d ]
Currently the pointer val is being incorrectly incremented instead of the value pointed to by val. Fix this by adding in the missing * indirection operator.
Addresses-Coverity: ("Unused value")
--- drivers/iio/dac/ad5380.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5380.c +1 -1
@@ -221,7 +221,7 @@ static int ad5380_read_raw(struct iio_dev *indio_dev,if (ret)return ret; *val >>= chan->scan_type.shift; - val -= (1 << chan->scan_type.realbits) /2 ; + *val -= (1 << chan->scan_type.realbits) /2 ;return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : *val =2 * st->vref;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 287/371 ath9k: dynack: fix possible deadlock in ath_dynack_node_{de}init
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit e1aa1a1db3b01c9890e82cf065cee99962ba1ed9 ]
Fix following lockdep warning disabling bh in
ath_dynack_node_init/ath_dynack_node_deinit
[ 75.955878] --------------------------------
[ 75.955880] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[ 75.955884] swapper/0/0 [HC0[0]:SC1[3]:HE1:SE0] takes:
[ 75.955888] 00000000792a7ee0 (&(&da->qlock)->rlock){+.?.}, at: ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.955905] {SOFTIRQ-ON-W} state was registered at:
[ 75.955912] lock_acquire+0x9a/0x160
[ 75.955917] _raw_spin_lock+0x2c/0x70
[ 75.955927] ath_dynack_node_init+0x2a/0x60 [ath9k_hw]
[ 75.955934] ath9k_sta_state+0xec/0x160 [ath9k]
[ 75.955976] drv_sta_state+0xb2/0x740 [mac80211]
[ 75.956008] sta_info_insert_finish+0x21a/0x420 [mac80211]
[ 75.956039] sta_info_insert_rcu+0x12b/0x2c0 [mac80211]
[ 75.956069] sta_info_insert+0x7/0x70 [mac80211]
[ 75.956093] ieee80211_prep_connection+0x42e/0x730 [mac80211]
[ 75.956120] ieee80211_mgd_auth.cold+0xb9/0x15c [mac80211]
[ 75.956152] cfg80211_mlme_auth+0x143/0x350 [cfg80211]
[ 75.956169] nl80211_authenticate+0x25e/0x2b0 [cfg80211]
[ 75.956172] genl_family_rcv_msg+0x198/0x400
[ 75.956174] genl_rcv_msg+0x42/0x90
[ 75.956176] netlink_rcv_skb+0x35/0xf0
[ 75.956178] genl_rcv+0x1f/0x30
[ 75.956180] netlink_unicast+0x154/0x200
[ 75.956182] netlink_sendmsg+0x1bf/0x3d0
[ 75.956186] ___sys_sendmsg+0x2c2/0x2f0
[ 75.956187] __sys_sendmsg+0x44/0x80
[ 75.956190] do_syscall_64+0x55/0x1a0
[ 75.956192] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 75.956194] irq event stamp: 2357092
[ 75.956196] hardirqs last enabled at (2357092): [<ffffffff818c62de>] _raw_spin_unlock_irqrestore+0x3e/0x50
[ 75.956199] hardirqs last disabled at (2357091): [<ffffffff818c60b1>] _raw_spin_lock_irqsave+0x11/0x80
[ 75.956202] softirqs last enabled at (2357072): [<ffffffff8106dc09>] irq_enter+0x59/0x60
[ 75.956204] softirqs last disabled at (2357073): [<ffffffff8106dcbe>] irq_exit+0xae/0xc0
[ 75.956206]
other info that might help us debug this:
[ 75.956207] Possible unsafe locking scenario:[ 75.956208] CPU0
[ 75.956209] ----
[ 75.956210] lock(&(&da->qlock)->rlock);
[ 75.956213] <Interrupt>
[ 75.956214] lock(&(&da->qlock)->rlock);
[ 75.956216]
*** DEADLOCK ***[ 75.956217] 1 lock held by swapper/0/0:
[ 75.956219] #0: 000000003bb5675c (&(&sc->sc_pcu_lock)->rlock){+.-.}, at: ath9k_tasklet+0x55/0x240 [ath9k]
[ 75.956225]
stack backtrace:
[ 75.956228] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.3.0-rc1-wdn+ #13
[ 75.956229] Hardware name: Dell Inc. Studio XPS 1340/0K183D, BIOS A11 09/08/2009
[ 75.956231] Call Trace:
[ 75.956233] <IRQ>
[ 75.956236] dump_stack+0x67/0x90
[ 75.956239] mark_lock+0x4c1/0x640
[ 75.956242] ? check_usage_backwards+0x130/0x130
[ 75.956245] ? sched_clock_local+0x12/0x80
[ 75.956247] __lock_acquire+0x484/0x7a0
[ 75.956250] ? __lock_acquire+0x3b9/0x7a0
[ 75.956252] lock_acquire+0x9a/0x160
[ 75.956259] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956262] _raw_spin_lock_bh+0x34/0x80
[ 75.956268] ? ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956275] ath_dynack_sample_ack_ts+0x4d/0xa0 [ath9k_hw]
[ 75.956280] ath_rx_tasklet+0xd09/0xe90 [ath9k]
[ 75.956286] ath9k_tasklet+0x102/0x240 [ath9k]
[ 75.956288] tasklet_action_common.isra.0+0x6d/0x170
[ 75.956291] __do_softirq+0xcc/0x425
[ 75.956294] irq_exit+0xae/0xc0
[ 75.956296] do_IRQ+0x8a/0x110
[ 75.956298] common_interrupt+0xf/0xf
[ 75.956300] </IRQ>
[ 75.956303] RIP: 0010:cpuidle_enter_state+0xb2/0x400
[ 75.956308] RSP: 0018:ffffffff82203e70 EFLAGS: 00000202 ORIG_RAX: ffffffffffffffd7
[ 75.956310] RAX: ffffffff82219800 RBX: ffffffff822bd0a0 RCX: 0000000000000000
[ 75.956312] RDX: 0000000000000046 RSI: 0000000000000006 RDI: ffffffff82219800
[ 75.956314] RBP: ffff888155a01c00 R08: 00000011af51aabe R09: 0000000000000000
[ 75.956315] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000002
[ 75.956317] R13: 00000011af51aabe R14: 0000000000000003 R15: ffffffff82219800
[ 75.956321] cpuidle_enter+0x24/0x40
[ 75.956323] do_idle+0x1ac/0x220
[ 75.956326] cpu_startup_entry+0x14/0x20
[ 75.956329] start_kernel+0x482/0x489
[ 75.956332] secondary_startup_64+0xa4/0xb0--- drivers/net/wireless/ath/ath9k/dynack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath9k/dynack.c +4 -4
@@ -300,9 +300,9 @@ void ath_dynack_node_init(struct ath_hw *ah, struct ath_node *an) an->ackto = ackto; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_add_tail (&an->list, &da->nodes); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_init);
@@ -316,9 +316,9 @@ void ath_dynack_node_deinit(struct ath_hw *ah, struct ath_node *an) {struct ath_dynack *da = &ah->dynack; -spin_lock (&da->qlock); +spin_lock_bh (&da->qlock);list_del (&an->list); -spin_unlock (&da->qlock); +spin_unlock_bh (&da->qlock); }EXPORT_SYMBOL (ath_dynack_node_deinit);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 288/371 tty: serial: fsl_lpuart: Use appropriate lpuart32_* I/O funcs
In reply to Sasha LevinFrom: Andrey Smirnov <[email protected]>
[ Upstream commit 1da17d7cf8e2c4b60163d54300f72c02f510327c ]
When dealing with 32-bit variant of LPUART IP block appropriate I/O helpers have to be used to properly deal with endianness differences. Change all of the offending code to do that.
for lpuart32.")
--- drivers/tty/serial/fsl_lpuart.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/tty/serial/fsl_lpuart.c +14 -14
@@ -532,26 +532,26 @@ static int lpuart32_poll_init(struct uart_port *port)spin_lock_irqsave (&sport->port.lock, flags);/* Disable Rx & Tx */ -writel (0 , sport->port.membase +UARTCTRL ); +lpuart32_write (&sport->port,UARTCTRL ,0 ); - temp =readl (sport->port.membase +UARTFIFO ); + temp =lpuart32_read (&sport->port,UARTFIFO );/* Enable Rx and Tx FIFO */ -writel (temp |UARTFIFO_RXFE |UARTFIFO_TXFE , - sport->port.membase +UARTFIFO ); +lpuart32_write (&sport->port,UARTFIFO , + temp |UARTFIFO_RXFE |UARTFIFO_TXFE );/* flush Tx and Rx FIFO */ -writel (UARTFIFO_TXFLUSH |UARTFIFO_RXFLUSH , - sport->port.membase +UARTFIFO ); +lpuart32_write (&sport->port,UARTFIFO , +UARTFIFO_TXFLUSH |UARTFIFO_RXFLUSH );/* explicitly clear RDRF */ -if (readl (sport->port.membase +UARTSTAT ) &UARTSTAT_RDRF ) { -readl (sport->port.membase +UARTDATA ); -writel (UARTFIFO_RXUF , sport->port.membase +UARTFIFO ); +if (lpuart32_read (&sport->port,UARTSTAT ) &UARTSTAT_RDRF ) { +lpuart32_read (&sport->port,UARTDATA ); +lpuart32_write (&sport->port,UARTFIFO ,UARTFIFO_RXUF ); }/* Enable Rx and Tx */ -writel (UARTCTRL_RE |UARTCTRL_TE , sport->port.membase +UARTCTRL ); +lpuart32_write (&sport->port,UARTCTRL ,UARTCTRL_RE |UARTCTRL_TE );spin_unlock_irqrestore (&sport->port.lock, flags);return 0 ;
@@ -559,18 +559,18 @@ static int lpuart32_poll_init(struct uart_port *port)static void lpuart32_poll_put_char (struct uart_port *port,unsigned char c) { -while (!(readl (port->membase +UARTSTAT ) &UARTSTAT_TDRE )) +while (!(lpuart32_read (port,UARTSTAT ) &UARTSTAT_TDRE ))barrier (); -writel (c, port->membase +UARTDATA ); +lpuart32_write (port,UARTDATA , c); }static int lpuart32_poll_get_char (struct uart_port *port) { -if (!(readl (port->membase +UARTSTAT ) &UARTSTAT_RDRF )) +if (!(lpuart32_read (port,UARTSTAT ) &UARTSTAT_RDRF ))return NO_POLL_CHAR ; -return readl (port->membase +UARTDATA ); +return lpuart32_read (port,UARTDATA ); }#endif
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 289/371 net: sonic: return NETDEV_TX_OK if failed to map buffer
In reply to Sasha LevinFrom: Mao Wenan <[email protected]>
[ Upstream commit 6e1cdedcf0362fed3aedfe051d46bd7ee2a85fe1 ]
NETDEV_TX_BUSY really should only be used by drivers that call netif_tx_stop_queue() at the wrong moment. If dma_map_single() is failed to map tx DMA buffer, it might trigger an infinite loop. This patch use NETDEV_TX_OK instead of NETDEV_TX_BUSY, and change printk to pr_err_ratelimited.
--- drivers/net/ethernet/natsemi/sonic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/natsemi/sonic.c +2 -2
@@ -221,9 +221,9 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) { -printk (KERN_ERR "%s: failed to map tx DMA buffer.\n" , dev->name); +pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name);dev_kfree_skb (skb); -return NETDEV_TX_BUSY ; +return NETDEV_TX_OK ; }sonic_tda_put (dev, entry,SONIC_TD_STATUS ,0 );/* clear status */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 290/371 scsi: fnic: fix msix interrupt allocation
In reply to Sasha LevinFrom: Govindarajulu Varadarajan <[email protected]>
[ Upstream commit 3ec24fb4c035e9cbb2f02a48640a09aa913442a2 ]
pci_alloc_irq_vectors() returns number of vectors allocated. Fix the check for error condition.
--- drivers/scsi/fnic/fnic_isr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/fnic/fnic_isr.c +2 -2
@@ -254,7 +254,7 @@ int fnic_set_intr_mode(struct fnic *fnic)int vecs = n + m + o +1 ;if (pci_alloc_irq_vectors (fnic->pdev, vecs, vecs, -PCI_IRQ_MSIX ) <0 ) { +PCI_IRQ_MSIX ) == vecs) { fnic->rq_count = n; fnic->raw_wq_count = m; fnic->wq_copy_count = o;
@@ -280,7 +280,7 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->wq_copy_count >=1 && fnic->cq_count >=3 && fnic->intr_count >=1 && - pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) < 0) { + pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) == 1) { fnic->rq_count = 1; fnic->raw_wq_count =1 ; fnic->wq_copy_count =1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 291/371 Btrfs: fix hang when loading existing inode cache off disk
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit 7764d56baa844d7f6206394f21a0e8c1f303c476 ]
If we are able to load an existing inode cache off disk, we set the state of the cache to BTRFS_CACHE_FINISHED, but we don't wake up any one waiting for the cache to be available. This means that anyone waiting for the cache to be available, waiting on the condition that either its state is BTRFS_CACHE_FINISHED or its available free space is greather than zero, can hang forever.
This could be observed running fstests with MOUNT_OPTIONS="-o inode_cache", in particular test case generic/161 triggered it very frequently for me, producing a trace like the following:
[63795.739712] BTRFS info (device sdc): enabling inode map caching [63795.739714] BTRFS info (device sdc): disk space caching is enabled [63795.739716] BTRFS info (device sdc): has skinny extents [64036.653886] INFO: task btrfs-transacti:3917 blocked for more than 120 seconds. [64036.654079] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654143] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654232] btrfs-transacti D 0 3917 2 0x80004000 [64036.654239] Call Trace: [64036.654258] ? __schedule+0x3ae/0x7b0 [64036.654271] schedule+0x3a/0xb0 [64036.654325] btrfs_commit_transaction+0x978/0xae0 [btrfs] [64036.654339] ? remove_wait_queue+0x60/0x60 [64036.654395] transaction_kthread+0x146/0x180 [btrfs] [64036.654450] ? btrfs_cleanup_transaction+0x620/0x620 [btrfs] [64036.654456] kthread+0x103/0x140 [64036.654464] ? kthread_create_worker_on_cpu+0x70/0x70 [64036.654476] ret_from_fork+0x3a/0x50 [64036.654504] INFO: task xfs_io:3919 blocked for more than 120 seconds. [64036.654568] Not tainted 5.2.0-rc4-btrfs-next-50 #1 [64036.654617] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [64036.654685] xfs_io D 0 3919 3633 0x00000000 [64036.654691] Call Trace: [64036.654703] ? __schedule+0x3ae/0x7b0 [64036.654716] schedule+0x3a/0xb0 [64036.654756] btrfs_find_free_ino+0xa9/0x120 [btrfs] [64036.654764] ? remove_wait_queue+0x60/0x60 [64036.654809] btrfs_create+0x72/0x1f0 [btrfs] [64036.654822] lookup_open+0x6bc/0x790 [64036.654849] path_openat+0x3bc/0xc00 [64036.654854] ? __lock_acquire+0x331/0x1cb0 [64036.654869] do_filp_open+0x99/0x110 [64036.654884] ? __alloc_fd+0xee/0x200 [64036.654895] ? do_raw_spin_unlock+0x49/0xc0 [64036.654909] ? do_sys_open+0x132/0x220 [64036.654913] do_sys_open+0x132/0x220 [64036.654926] do_syscall_64+0x60/0x1d0 [64036.654933] entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix this by adding a wake_up() call right after setting the cache state to BTRFS_CACHE_FINISHED, at start_caching(), when we are able to load the cache from disk.
--- fs/btrfs/inode-map.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/inode-map.c +1 -0
@@ -159,6 +159,7 @@ static void start_caching(struct btrfs_root *root)spin_lock (&root->ino_cache_lock); root->ino_cache_state =BTRFS_CACHE_FINISHED ;spin_unlock (&root->ino_cache_lock); +wake_up (&root->ino_cache_wait);return ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 292/371 Btrfs: fix inode cache waiters hanging on failure to start caching thread
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit a68ebe0790fc88b4314d17984a2cf99ce2361901 ]
If we fail to start the inode caching thread, we print an error message and disable the inode cache, however we never wake up any waiters, so they hang forever waiting for the caching to finish. Fix this by waking them up and have them fallback to a call to btrfs_find_free_objectid().
--- fs/btrfs/inode-map.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
fs/btrfs/inode-map.c +18 -5
@@ -26,6 +26,19 @@#include "inode-map.h" #include "transaction.h" +static void fail_caching_thread (struct btrfs_root *root) +{ +struct btrfs_fs_info *fs_info = root->fs_info; + +btrfs_warn (fs_info,"failed to start inode caching task" ); +btrfs_clear_pending_and_info (fs_info,INODE_MAP_CACHE , +"disabling inode map caching" ); +spin_lock (&root->ino_cache_lock); + root->ino_cache_state =BTRFS_CACHE_ERROR ; +spin_unlock (&root->ino_cache_lock); +wake_up (&root->ino_cache_wait); +} +static int caching_kthread (void *data) {struct btrfs_root *root = data;
@@ -178,11 +191,8 @@ static void start_caching(struct btrfs_root *root) tsk =kthread_run (caching_kthread, root,"btrfs-ino-cache-%llu" , root->root_key.objectid); -if (IS_ERR (tsk)) { -btrfs_warn (fs_info,"failed to start inode caching task" ); -btrfs_clear_pending_and_info (fs_info,INODE_MAP_CACHE , -"disabling inode map caching" ); - } +if (IS_ERR (tsk)) +fail_caching_thread (root); }int btrfs_find_free_ino (struct btrfs_root *root,u64 *objectid)
@@ -200,11 +210,14 @@ int btrfs_find_free_ino(struct btrfs_root *root, u64 *objectid)wait_event (root->ino_cache_wait, root->ino_cache_state ==BTRFS_CACHE_FINISHED || + root->ino_cache_state ==BTRFS_CACHE_ERROR || root->free_ino_ctl->free_space >0 );if (root->ino_cache_state ==BTRFS_CACHE_FINISHED && root->free_ino_ctl->free_space ==0 )return -ENOSPC ; +else if (root->ino_cache_state ==BTRFS_CACHE_ERROR ) +return btrfs_find_free_objectid (root, objectid);else goto again; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 293/371 Btrfs: fix inode cache waiters hanging on path allocation failure
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit 9d123a35d7e97bb2139747b16127c9b22b6a593e ]
If the caching thread fails to allocate a path, it returns without waking up any cache waiters, leaving them hang forever. Fix this by following the same approach as when we fail to start the caching thread: print an error message, disable inode caching and make the wakers fallback to non-caching mode behaviour (calling btrfs_find_free_objectid()).
--- fs/btrfs/inode-map.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/inode-map.c +3 -1
@@ -55,8 +55,10 @@ static int caching_kthread(void *data)return 0 ; path =btrfs_alloc_path (); -if (!path) +if (!path) { +fail_caching_thread (root);return -ENOMEM ; + }/* Since the commit root is read-only, we can safely skip locking. */ path->skip_locking =1 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 294/371 btrfs: use correct count in btrfs_file_write_iter()
In reply to Sasha LevinFrom: Omar Sandoval <[email protected]>
[ Upstream commit c09767a8960ca0500fb636bf73686723337debf4 ]
generic_write_checks() may modify iov_iter_count(), so we must get the count after the call, not before. Using the wrong one has a couple of consequences:
1. We check a longer range in check_can_nocow() for nowait than we're actually writing.
2. We create extra hole extent maps in btrfs_cont_expand(). As far as I can tell, this is harmless, but I might be missing something.
These issues are pretty minor, but let's fix it before something more important trips on it.
--- fs/btrfs/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/file.c +2 -1
@@ -1882,7 +1882,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,bool sync = (file->f_flags &O_DSYNC ) ||IS_SYNC (file->f_mapping->host);ssize_t err;loff_t pos; -size_t count =iov_iter_count (from); +size_t count;loff_t oldsize;int clean_page =0 ;
@@ -1903,6 +1903,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, } pos = iocb->ki_pos; + count =iov_iter_count (from);if (iocb->ki_flags &IOCB_NOWAIT ) {/* * We will allocate space in case nodatacow is not set,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 295/371 ixgbe: sync the first fragment unconditionally
In reply to Sasha LevinFrom: Firo Yang <[email protected]>
[ Upstream commit e7ba676c6188d394a0133fc4b9bcd7ee50d54b7f ]
In Xen environment, if Xen-swiotlb is enabled, ixgbe driver could possibly allocate a page, DMA memory buffer, for the first fragment which is not suitable for Xen-swiotlb to do DMA operations. Xen-swiotlb have to internally allocate another page for doing DMA operations. This mechanism requires syncing the data from the internal page to the page which ixgbe sends to upper network stack. However, since commit f3213d932173 ("ixgbe: Update driver to make use of DMA attributes in Rx path"), the unmap operation is performed with DMA_ATTR_SKIP_CPU_SYNC. As a result, the sync is not performed. Since the sync isn't performed, the upper network stack could receive a incomplete network packet. By incomplete, it means the linear data on the first fragment(between skb->head and skb->end) is invalid. So we have to copy the data from the internal xen-swiotlb page to the page which ixgbe sends to upper network stack through the sync operation.
More details from Alexander Duyck:
Specifically since we are mapping the frame with DMA_ATTR_SKIP_CPU_SYNC we have to unmap with that as well. As a result a sync is not performed on an unmap and must be done manually as we skipped it for the first frag. As such we need to always sync before possibly performing a page unmap operation.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +9 -7
@@ -1871,13 +1871,7 @@ static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,static void ixgbe_dma_sync_frag (struct ixgbe_ring *rx_ring,struct sk_buff *skb) { -/* if the page was released unmap it, else just sync our portion */ -if (unlikely (IXGBE_CB (skb)->page_released)) { -dma_unmap_page_attrs (rx_ring->dev,IXGBE_CB (skb)->dma, -ixgbe_rx_pg_size (rx_ring), -DMA_FROM_DEVICE , -IXGBE_RX_DMA_ATTR ); - }else if (ring_uses_build_skb (rx_ring)) { +if (ring_uses_build_skb (rx_ring)) {unsigned long offset = (unsigned long )(skb->data) & ~PAGE_MASK ; dma_sync_single_range_for_cpu(rx_ring->dev,
@@ -1894,6 +1888,14 @@ static void ixgbe_dma_sync_frag(struct ixgbe_ring *rx_ring,skb_frag_size (frag), DMA_FROM_DEVICE); } + +/* If the page was released, just unmap it. */ +if (unlikely (IXGBE_CB (skb)->page_released)) { +dma_unmap_page_attrs (rx_ring->dev,IXGBE_CB (skb)->dma, +ixgbe_rx_pg_size (rx_ring), +DMA_FROM_DEVICE , +IXGBE_RX_DMA_ATTR ); + } }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 296/371 hwmon: (shtc1) fix shtc1 and shtw1 id mask
In reply to Sasha LevinFrom: Dan Robertson <[email protected]>
[ Upstream commit fdc7d8e829ec755c5cfb2f5a8d8c0cdfb664f895 ]
Fix an error in the bitmaskfor the shtc1 and shtw1 bitmask used to retrieve the chip ID from the ID register. See section 5.7 of the shtw1 or shtc1 datasheet for details.
--- drivers/hwmon/shtc1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/shtc1.c +1 -1
@@ -38,7 +38,7 @@ static const unsigned char shtc1_cmd_read_id_reg[] = { 0xef, 0xc8 };/* constants for reading the ID register */ #define SHTC1_ID 0x07 -#define SHTC1_ID_REG_MASK 0x1f +#define SHTC1_ID_REG_MASK 0x3f/* delays for non-blocking i2c commands, both in us */ #define SHTC1_NONBLOCKING_WAIT_TIME_HPM 14400
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 297/371 net: sonic: replace dev_kfree_skb in sonic_send_packet
In reply to Sasha LevinFrom: Mao Wenan <[email protected]>
[ Upstream commit 49f6c90bf6805948b597eabb499e500a47cf24be ]
sonic_send_packet will be processed in irq or non-irq context, so it would better use dev_kfree_skb_any instead of dev_kfree_skb.
--- drivers/net/ethernet/natsemi/sonic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/natsemi/sonic.c +1 -1
@@ -222,7 +222,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) laddr =dma_map_single (lp->device, skb->data, length,DMA_TO_DEVICE );if (!laddr) {pr_err_ratelimited ("%s: failed to map tx DMA buffer.\n" , dev->name); -dev_kfree_skb (skb); +dev_kfree_skb_any (skb);return NETDEV_TX_OK ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 298/371 pinctrl: iproc-gpio: Fix incorrect pinconf configurations
In reply to Sasha LevinFrom: Li Jin <[email protected]>
[ Upstream commit 398a1f50e3c731586182fd52b834103b0aa2f826 ]
Fix drive strength for AON/CRMU controller; fix pull-up/down setting for CCM/CDRU controller.
--- drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 96 +++++++++++++++++++----- 1 file changed, 77 insertions(+), 19 deletions(-)
drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +77 -19
@@ -54,8 +54,12 @@/* drive strength control for ASIU GPIO */ #define IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET 0x58 -/* drive strength control for CCM/CRMU (AON) GPIO */ -#define IPROC_GPIO_DRV0_CTRL_OFFSET 0x00 +/* pinconf for CCM GPIO */ +#define IPROC_GPIO_PULL_DN_OFFSET 0x10 +#define IPROC_GPIO_PULL_UP_OFFSET 0x14 + +/* pinconf for CRMU(aon) GPIO and CCM GPIO*/ +#define IPROC_GPIO_DRV_CTRL_OFFSET 0x00#define GPIO_BANK_SIZE 0x200#define NGPIOS_PER_BANK 32
@@ -76,6 +80,12 @@ enum iproc_pinconf_param { IPROC_PINCON_MAX, }; +enum iproc_pinconf_ctrl_type { +IOCTRL_TYPE_AON =1 , +IOCTRL_TYPE_CDRU , +IOCTRL_TYPE_INVALID , +}; +/* * Iproc GPIO core *
@@ -100,6 +110,7 @@ struct iproc_gpio {void __iomem *base;void __iomem *io_ctrl; +enum iproc_pinconf_ctrl_type io_ctrl_type;raw_spinlock_t lock;
@@ -461,20 +472,44 @@ static const struct pinctrl_ops iproc_pctrl_ops = {static int iproc_gpio_set_pull (struct iproc_gpio *chip,unsigned gpio,bool disable,bool pull_up) { +void __iomem *base;unsigned long flags; +unsigned int shift; +u32 val_1, val_2;raw_spin_lock_irqsave (&chip->lock, flags); - -if (disable) { -iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, false); +if (chip->io_ctrl_type ==IOCTRL_TYPE_CDRU ) { + base = chip->io_ctrl; + shift =IPROC_GPIO_SHIFT (gpio); + + val_1 =readl (base +IPROC_GPIO_PULL_UP_OFFSET ); + val_2 =readl (base +IPROC_GPIO_PULL_DN_OFFSET ); +if (disable) { +/* no pull-up or pull-down */ + val_1 &= ~BIT (shift); + val_2 &= ~BIT (shift); + }else if (pull_up) { + val_1 |=BIT (shift); + val_2 &= ~BIT (shift); + }else { + val_1 &= ~BIT (shift); + val_2 |=BIT (shift); + } +writel (val_1, base +IPROC_GPIO_PULL_UP_OFFSET ); +writel (val_2, base +IPROC_GPIO_PULL_DN_OFFSET ); }else { -iproc_set_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio, - pull_up); -iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, true); +if (disable) { +iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, + false); + }else { +iproc_set_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio, + pull_up); +iproc_set_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio, + true); + } }raw_spin_unlock_irqrestore (&chip->lock, flags); -dev_dbg (chip->dev,"gpio:%u set pullup:%d\n" , gpio, pull_up);return 0 ;
@@ -483,14 +518,35 @@ static int iproc_gpio_set_pull(struct iproc_gpio *chip, unsigned gpio,static void iproc_gpio_get_pull (struct iproc_gpio *chip,unsigned gpio,bool *disable,bool *pull_up) { +void __iomem *base;unsigned long flags; +unsigned int shift; +u32 val_1, val_2;raw_spin_lock_irqsave (&chip->lock, flags); - *disable = !iproc_get_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio); - *pull_up =iproc_get_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio); +if (chip->io_ctrl_type ==IOCTRL_TYPE_CDRU ) { + base = chip->io_ctrl; + shift =IPROC_GPIO_SHIFT (gpio); + + val_1 =readl (base +IPROC_GPIO_PULL_UP_OFFSET ) &BIT (shift); + val_2 =readl (base +IPROC_GPIO_PULL_DN_OFFSET ) &BIT (shift); + + *pull_up = val_1 ? true : false; + *disable = (val_1 | val_2) ? false : true; + + }else { + *disable = !iproc_get_bit (chip,IPROC_GPIO_RES_EN_OFFSET , gpio); + *pull_up =iproc_get_bit (chip,IPROC_GPIO_PAD_RES_OFFSET , gpio); + }raw_spin_unlock_irqrestore (&chip->lock, flags); } +#define DRV_STRENGTH_OFFSET (gpio, bit, type) ((type) == IOCTRL_TYPE_AON ? \ + ((2 - (bit)) * 4 + IPROC_GPIO_DRV_CTRL_OFFSET) : \ + ((type) == IOCTRL_TYPE_CDRU) ? \ + ((bit) * 4 + IPROC_GPIO_DRV_CTRL_OFFSET) : \ + ((bit) * 4 + IPROC_GPIO_REG(gpio, IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET))) +static int iproc_gpio_set_strength (struct iproc_gpio *chip,unsigned gpio,unsigned strength) {
@@ -505,11 +561,8 @@ static int iproc_gpio_set_strength(struct iproc_gpio *chip, unsigned gpio,if (chip->io_ctrl) { base = chip->io_ctrl; - offset =IPROC_GPIO_DRV0_CTRL_OFFSET ; }else { base = chip->base; - offset =IPROC_GPIO_REG (gpio, -IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET ); } shift =IPROC_GPIO_SHIFT (gpio);
@@ -520,11 +573,11 @@ static int iproc_gpio_set_strength(struct iproc_gpio *chip, unsigned gpio,raw_spin_lock_irqsave (&chip->lock, flags); strength = (strength /2 ) -1 ;for (i =0 ; i <GPIO_DRV_STRENGTH_BITS ; i++) { + offset =DRV_STRENGTH_OFFSET (gpio, i, chip->io_ctrl_type); val =readl (base + offset); val &= ~BIT (shift); val |= ((strength >> i) &0x1 ) << shift;writel (val, base + offset); - offset +=4 ; }raw_spin_unlock_irqrestore (&chip->lock, flags);
@@ -541,11 +594,8 @@ static int iproc_gpio_get_strength(struct iproc_gpio *chip, unsigned gpio,if (chip->io_ctrl) { base = chip->io_ctrl; - offset =IPROC_GPIO_DRV0_CTRL_OFFSET ; }else { base = chip->base; - offset =IPROC_GPIO_REG (gpio, -IPROC_GPIO_ASIU_DRV0_CTRL_OFFSET ); } shift =IPROC_GPIO_SHIFT (gpio);
@@ -553,10 +603,10 @@ static int iproc_gpio_get_strength(struct iproc_gpio *chip, unsigned gpio,raw_spin_lock_irqsave (&chip->lock, flags); *strength =0 ;for (i =0 ; i <GPIO_DRV_STRENGTH_BITS ; i++) { + offset =DRV_STRENGTH_OFFSET (gpio, i, chip->io_ctrl_type); val =readl (base + offset) &BIT (shift); val >>= shift; *strength += (val << i); - offset +=4 ; }/* convert to mA */
@@ -734,6 +784,7 @@ static int iproc_gpio_probe(struct platform_device *pdev)u32 ngpios, pinconf_disable_mask =0 ;int irq, ret;bool no_pinconf = false; +enum iproc_pinconf_ctrl_type io_ctrl_type =IOCTRL_TYPE_INVALID ;/* NSP does not support drive strength config */ if (of_device_is_compatible (dev->of_node,"brcm,iproc-nsp-gpio" ))
@@ -764,8 +815,15 @@ static int iproc_gpio_probe(struct platform_device *pdev)dev_err (dev,"unable to map I/O memory\n" );return PTR_ERR (chip->io_ctrl); } +if (of_device_is_compatible (dev->of_node, +"brcm,cygnus-ccm-gpio" )) + io_ctrl_type =IOCTRL_TYPE_CDRU ; +else + io_ctrl_type =IOCTRL_TYPE_AON ; } + chip->io_ctrl_type = io_ctrl_type; +if (of_property_read_u32 (dev->of_node,"ngpios" , &ngpios)) {dev_err (&pdev->dev,"missing ngpios DT property\n" );return -ENODEV ;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 299/371 ath10k: adjust skb length in ath10k_sdio_mbox_rx_packet
In reply to Sasha LevinFrom: Nicolas Boichat <[email protected]>
[ Upstream commit b7139960832eb56fa15d390a4b5c8c5739bd0d1a ]
When the FW bundles multiple packets, pkt->act_len may be incorrect as it refers to the first packet only (however, the FW will only bundle packets that fit into the same pkt->alloc_len).
Before this patch, the skb length would be set (incorrectly) to pkt->act_len in ath10k_sdio_mbox_rx_packet, and then later manually adjusted in ath10k_sdio_mbox_rx_process_packet.
The first problem is that ath10k_sdio_mbox_rx_process_packet does not use proper skb_put commands to adjust the length (it directly changes skb->len), so we end up with a mismatch between skb->head + skb->tail and skb->data + skb->len. This is quite serious, and causes corruptions in the TCP stack, as the stack tries to coalesce packets, and relies on skb->tail being correct (that is, skb_tail_pointer must point to the first byte_after_ the data).
Instead of re-adjusting the size in ath10k_sdio_mbox_rx_process_packet, this moves the code to ath10k_sdio_mbox_rx_packet, and also add a bounds check, as skb_put would crash the kernel if not enough space is available.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/sdio.c | 29 +++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath10k/sdio.c +21 -8
@@ -392,16 +392,11 @@ static int ath10k_sdio_mbox_rx_process_packet(struct ath10k *ar,struct ath10k_htc_hdr *htc_hdr = (struct ath10k_htc_hdr *)skb->data;bool trailer_present = htc_hdr->flags &ATH10K_HTC_FLAG_TRAILER_PRESENT ;enum ath10k_htc_ep_id eid; -u16 payload_len;u8 *trailer;int ret; - payload_len =le16_to_cpu (htc_hdr->len); - skb->len = payload_len +sizeof (struct ath10k_htc_hdr ); -if (trailer_present) { - trailer = skb->data +sizeof (*htc_hdr) + - payload_len - htc_hdr->trailer_len; + trailer = skb->data + skb->len - htc_hdr->trailer_len; eid =pipe_id_to_eid (htc_hdr->eid);
@@ -635,13 +630,31 @@ static int ath10k_sdio_mbox_rx_packet(struct ath10k *ar, {struct ath10k_sdio *ar_sdio =ath10k_sdio_priv (ar);struct sk_buff *skb = pkt->skb; +struct ath10k_htc_hdr *htc_hdr;int ret; ret =ath10k_sdio_readsb (ar, ar_sdio->mbox_info.htc_addr, skb->data, pkt->alloc_len); +if (ret) + goto out; + +/* Update actual length. The original length may be incorrect, +* as the FW will bundle multiple packets as long as their sizes +* fit within the same aligned length (pkt->alloc_len). +*/ + htc_hdr = (struct ath10k_htc_hdr *)skb->data; + pkt->act_len =le16_to_cpu (htc_hdr->len) +sizeof (*htc_hdr); +if (pkt->act_len > pkt->alloc_len) { +ath10k_warn (ar,"rx packet too large (%zu > %zu)\n" , + pkt->act_len, pkt->alloc_len); + ret = -EMSGSIZE ; + goto out; + } + +skb_put (skb, pkt->act_len); + +out: pkt->status = ret; -if (!ret) -skb_put (skb, pkt->act_len);return ret; }
Signature · 7 lines
2.20.1 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Sasha Levin
maintainerPATCH 300/371 RDMA/cma: Fix false error message
In reply to Sasha LevinFrom: Håkon Bugge <[email protected]>
[ Upstream commit a6e4d254c19b541a58caced322111084b27a7788 ]
In addr_handler(), assuming status == 0 and the device already has been acquired (id_priv->cma_dev != NULL), we get the following incorrect "error" message:
RDMA CM: ADDR_ERROR: failed to resolve IP. status 0
--- drivers/infiniband/core/cma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/cma.c +1 -1
@@ -2789,7 +2789,7 @@ static void addr_handler(int status, struct sockaddr *src_addr,if (status)pr_debug_ratelimited ("RDMA CM: ADDR_ERROR: failed to acquire device. status %d\n" , status); - }else { + }else if (status) {pr_debug_ratelimited ("RDMA CM: ADDR_ERROR: failed to resolve IP. status %d\n" , status); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 301/371 net/rds: Fix 'ib_evt_handler_call' element in 'rds_ib_stat_names'
In reply to Sasha LevinFrom: Gerd Rausch <[email protected]>
[ Upstream commit 05a82481a3024b94db00b8c816bb3d526b5209e0 ]
All entries in 'rds_ib_stat_names' are stringified versions of the corresponding "struct rds_ib_statistics" element without the "s_"-prefix.
Fix entry 'ib_evt_handler_call' to do the same.
--- net/rds/ib_stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rds/ib_stats.c +1 -1
@@ -42,7 +42,7 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats);static const char *const rds_ib_stat_names[] = {"ib_connect_raced" ,"ib_listen_closed_stale" , -"s_ib_evt_handler_call" , +"ib_evt_handler_call" ,"ib_tasklet_call" ,"ib_tx_cq_event" ,"ib_tx_ring_full" ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 302/371 iommu/amd: Wait for completion of IOTLB flush in attach_device
In reply to Sasha LevinFrom: Filippo Sironi <[email protected]>
[ Upstream commit 0b15e02f0cc4fb34a9160de7ba6db3a4013dc1b7 ]
To make sure the domain tlb flush completes before the function returns, explicitly wait for its completion.
--- drivers/iommu/amd_iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/amd_iommu.c +2 -0
@@ -2160,6 +2160,8 @@ static int attach_device(struct device *dev,*/ domain_flush_tlb_pde (domain); +domain_flush_complete (domain); +return ret; }
Signature · 6 lines
2.20.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 303/371 net: aquantia: Fix aq_vec_isr_legacy() return value
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 31aefe14bc9f56566041303d733fda511d3a1c3e ]
The irqreturn_t type is an enum or an unsigned int in GCC. That creates to problems because it can't detect if the self->aq_hw_ops->hw_irq_read() call fails and at the end the function always returns IRQ_HANDLED.
drivers/net/ethernet/aquantia/atlantic/aq_vec.c:316 aq_vec_isr_legacy() warn: unsigned 'err' is never less than zero. drivers/net/ethernet/aquantia/atlantic/aq_vec.c:329 aq_vec_isr_legacy() warn: always true condition '(err >= 0) => (0-u32max >= 0)'
--- drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +6 -9
@@ -310,15 +310,13 @@ irqreturn_t aq_vec_isr_legacy(int irq, void *private) {struct aq_vec_s *self = private;u64 irq_mask =0U ; -irqreturn_t err =0 ; +int err; -if (!self) { - err = -EINVAL ; - goto err_exit; - } +if (!self) +return IRQ_NONE ; err = self->aq_hw_ops->hw_irq_read (self->aq_hw, &irq_mask);if (err <0 ) - goto err_exit; +return IRQ_NONE ;if (irq_mask) { self->aq_hw_ops->hw_irq_disable(self->aq_hw,
@@ -326,11 +324,10 @@ irqreturn_t aq_vec_isr_legacy(int irq, void *private)napi_schedule (&self->napi); }else { self->aq_hw_ops->hw_irq_enable (self->aq_hw,1U ); - err =IRQ_NONE ; +return IRQ_NONE ; } -err_exit: -return err >=0 ?IRQ_HANDLED :IRQ_NONE ; +return IRQ_HANDLED ; }cpumask_t *aq_vec_get_affinity_mask (struct aq_vec_s *self)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 304/371 net: hisilicon: Fix signedness bug in hix5hd2_dev_probe()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 002dfe8085255b7bf1e0758c3d195c5412d35be9 ]
The "priv->phy_mode" variable is an enum and in this context GCC will treat it as unsigned to the error handling will never trigger.
--- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +1 -1
@@ -1202,7 +1202,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) goto err_free_mdio; priv->phy_mode =of_get_phy_mode (node); -if (priv->phy_mode <0 ) { +if ((int )priv->phy_mode <0 ) {netdev_err (ndev,"not find phy-mode\n" ); ret = -EINVAL ; goto err_mdiobus;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 305/371 net: broadcom/bcmsysport: Fix signedness in bcm_sysport_probe()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 25a584955f020d6ec499c513923fb220f3112d2b ]
The "priv->phy_interface" variable is an enum and in this context GCC will treat it as unsigned so the error handling will never be triggered.
--- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -2116,7 +2116,7 @@ static int bcm_sysport_probe(struct platform_device *pdev) priv->phy_interface =of_get_phy_mode (dn);/* Default to GMII interface mode */ -if (priv->phy_interface <0 ) +if ((int )priv->phy_interface <0 ) priv->phy_interface =PHY_INTERFACE_MODE_GMII ;/* In the case of a fixed PHY, the DT node associated
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 306/371 net: stmmac: dwmac-meson8b: Fix signedness bug in probe
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit f10210517a2f37feea2edf85eb34c98977265c16 ]
The "dwmac->phy_mode" is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +1 -1
@@ -285,7 +285,7 @@ static int meson8b_dwmac_probe(struct platform_device *pdev) dwmac->pdev = pdev; dwmac->phy_mode =of_get_phy_mode (pdev->dev.of_node); -if (dwmac->phy_mode <0 ) { +if ((int )dwmac->phy_mode <0 ) {dev_err (&pdev->dev,"missing phy-mode property\n" ); ret = -EINVAL ; goto err_remove_config_dt;
Signature · 7 lines
2.20.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 307/371 net: axienet: fix a signedness bug in probe
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 73e211e11be86715d66bd3c9d38b3c34b05fca9a ]
The "lp->phy_mode" is an enum but in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +1 -1
@@ -1574,7 +1574,7 @@ static int axienet_probe(struct platform_device *pdev) } }else { lp->phy_mode =of_get_phy_mode (pdev->dev.of_node); -if (lp->phy_mode <0 ) { +if ((int )lp->phy_mode <0 ) { ret = -EINVAL ; goto free_netdev; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 308/371 of: mdio: Fix a signedness bug in of_phy_get_and_connect()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit d7eb651212fdbafa82d485d8e76095ac3b14c193 ]
The "iface" variable is an enum and in this context GCC treats it as an unsigned int so the error handling is never triggered.
--- drivers/of/of_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/of_mdio.c +1 -1
@@ -358,7 +358,7 @@ struct phy_device *of_phy_get_and_connect(struct net_device *dev,struct phy_device *phy; iface =of_get_phy_mode (np); -if (iface <0 ) +if ((int )iface <0 )return NULL ; phy_np =of_parse_phandle (np,"phy-handle" ,0 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 309/371 net: ethernet: stmmac: Fix signedness bug in ipq806x_gmac_of_parse()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 231042181dc9d6122c6faba64e99ccb25f13cc6c ]
The "gmac->phy_mode" variable is an enum and in this context GCC will treat it as an unsigned int so the error handling will never be triggered.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c +1 -1
@@ -203,7 +203,7 @@ static int ipq806x_gmac_of_parse(struct ipq806x_gmac *gmac)struct device *dev = &gmac->pdev->dev; gmac->phy_mode =of_get_phy_mode (dev->of_node); -if (gmac->phy_mode <0 ) { +if ((int )gmac->phy_mode <0 ) {dev_err (dev,"missing phy mode property\n" );return -EINVAL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 310/371 ipv6: Handle race in addrconf_dad_work
In reply to Sasha LevinFrom: David Ahern <[email protected]>
[ Upstream commit a3ce2a21bb8969ae27917281244fa91bf5f286d7 ]
Rajendra reported a kernel panic when a link was taken down:
[ 6870.263084] BUG: unable to handle kernel NULL pointer dereference at 00000000000000a8 [ 6870.271856] IP: [<ffffffff8efc5764>] __ipv6_ifa_notify+0x154/0x290
<snip>
[ 6870.570501] Call Trace: [ 6870.573238] [<ffffffff8efc58c6>] ? ipv6_ifa_notify+0x26/0x40 [ 6870.579665] [<ffffffff8efc98ec>] ? addrconf_dad_completed+0x4c/0x2c0 [ 6870.586869] [<ffffffff8efe70c6>] ? ipv6_dev_mc_inc+0x196/0x260 [ 6870.593491] [<ffffffff8efc9c6a>] ? addrconf_dad_work+0x10a/0x430 [ 6870.600305] [<ffffffff8f01ade4>] ? __switch_to_asm+0x34/0x70 [ 6870.606732] [<ffffffff8ea93a7a>] ? process_one_work+0x18a/0x430 [ 6870.613449] [<ffffffff8ea93d6d>] ? worker_thread+0x4d/0x490 [ 6870.619778] [<ffffffff8ea93d20>] ? process_one_work+0x430/0x430 [ 6870.626495] [<ffffffff8ea99dd9>] ? kthread+0xd9/0xf0 [ 6870.632145] [<ffffffff8f01ade4>] ? __switch_to_asm+0x34/0x70 [ 6870.638573] [<ffffffff8ea99d00>] ? kthread_park+0x60/0x60 [ 6870.644707] [<ffffffff8f01ae77>] ? ret_from_fork+0x57/0x70 [ 6870.650936] Code: 31 c0 31 d2 41 b9 20 00 08 02 b9 09 00 00 0
addrconf_dad_work is kicked to be scheduled when a device is brought up. There is a race between addrcond_dad_work getting scheduled and taking the rtnl lock and a process taking the link down (under rtnl). The latter removes the host route from the inet6_addr as part of addrconf_ifdown which is run for NETDEV_DOWN. The former attempts to use the host route in ipv6_ifa_notify. If the down event removes the host route due to the race to the rtnl, then the BUG listed above occurs.
This scenario does not occur when the ipv6 address is not kept (net.ipv6.conf.all.keep_addr_on_down = 0) as addrconf_ifdown sets the state of the ifp to DEAD. Handle when the addresses are kept by checking IF_READY which is reset by addrconf_ifdown.
The 'dead' flag for an inet6_addr is set only under rtnl, in addrconf_ifdown and it means the device is getting removed (or IPv6 is disabled). The interesting cases for changing the idev flag are addrconf_notify (NETDEV_UP and NETDEV_CHANGE) and addrconf_ifdown (reset the flag). The former does not have the idev lock - only rtnl; the latter has both. Based on that the existing dead + IF_READY check can be moved to right after the rtnl_lock in addrconf_dad_work.
--- net/ipv6/addrconf.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/ipv6/addrconf.c +6 -5
@@ -3908,6 +3908,12 @@ static void addrconf_dad_work(struct work_struct *w)rtnl_lock (); +/* check if device was taken down before this delayed work +* function could be canceled +*/ +if (idev->dead || !(idev->if_flags &IF_READY )) + goto out; +spin_lock_bh (&ifp->lock);if (ifp->state ==INET6_IFADDR_STATE_PREDAD ) { action =DAD_BEGIN ;
@@ -3953,11 +3959,6 @@ static void addrconf_dad_work(struct work_struct *w) goto out;write_lock_bh (&idev->lock); -if (idev->dead || !(idev->if_flags &IF_READY )) { -write_unlock_bh (&idev->lock); - goto out; - } -spin_lock (&ifp->lock);if (ifp->state ==INET6_IFADDR_STATE_DEAD ) {spin_unlock (&ifp->lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 311/371 nvme: retain split access workaround for capability reads
In reply to Sasha LevinFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 3a8ecc935efabdad106b5e06d07b150c394b4465 ]
Commit 7fd8930f26be4
"nvme: add a common helper to read Identify Controller data"
has re-introduced an issue that we have attempted to work around in the past, in commit a310acd7a7ea ("NVMe: use split lo_hi_{read,write}q").
The problem is that some PCIe NVMe controllers do not implement 64-bit outbound accesses correctly, which is why the commit above switched to using lo_hi_[read|write]q for all 64-bit BAR accesses occuring in the code.
In the mean time, the NVMe subsystem has been refactored, and now calls into the PCIe support layer for NVMe via a .reg_read64() method, which fails to use lo_hi_readq(), and thus reintroduces the problem that the workaround above aimed to address.
Given that, at the moment, .reg_read64() is only used to read the capability register [which is known to tolerate split reads], let's switch .reg_read64() to lo_hi_readq() as well.
This fixes a boot issue on some ARM boxes with NVMe behind a Synopsys DesignWare PCIe host controller.
--- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +1 -1
@@ -2274,7 +2274,7 @@ static int nvme_pci_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val)static int nvme_pci_reg_read64 (struct nvme_ctrl *ctrl,u32 off,u64 *val) { - *val =readq (to_nvme_dev (ctrl)->bar + off); + *val =lo_hi_readq (to_nvme_dev (ctrl)->bar + off);return 0 ; }
Signature · 7 lines
2.20.1 _______________________________________________ linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sasha Levin
maintainerPATCH 312/371 net: stmmac: gmac4+: Not all Unicast addresses may be available
In reply to Sasha LevinFrom: Jose Abreu <[email protected]>
[ Upstream commit 25683bab09a70542b9f8e3e28f79b3369e56701f ]
Some setups may not have all Unicast addresses filters available. Check the number of available filters before trying to setup it.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +1 -1
@@ -438,7 +438,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw, }/* Handle multiple unicast addresses */ -if (netdev_uc_count (dev) >GMAC_MAX_PERFECT_ADDRESSES ) { +if (netdev_uc_count (dev) > hw->unicast_filter_entries) {/* Switch to promiscuous mode if more than 128 addrs * are required */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 313/371 mac80211: accept deauth frames in IBSS mode
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit 95697f9907bfe3eab0ef20265a766b22e27dde64 ]
We can process deauth frames and all, but we drop them very early in the RX path today - this could never have worked.
--- net/mac80211/rx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/mac80211/rx.c +10 -1
@@ -3227,9 +3227,18 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)case cpu_to_le16 (IEEE80211_STYPE_PROBE_RESP ):/* process for all: mesh, mlme, ibss */ break ; +case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ): +if (is_multicast_ether_addr (mgmt->da) && + !is_broadcast_ether_addr (mgmt->da)) +return RX_DROP_MONITOR ; + +/* process only for station/IBSS */ +if (sdata->vif.type !=NL80211_IFTYPE_STATION && + sdata->vif.type !=NL80211_IFTYPE_ADHOC ) +return RX_DROP_MONITOR ; +break ;case cpu_to_le16 (IEEE80211_STYPE_ASSOC_RESP ):case cpu_to_le16 (IEEE80211_STYPE_REASSOC_RESP ): -case cpu_to_le16 (IEEE80211_STYPE_DEAUTH ):case cpu_to_le16 (IEEE80211_STYPE_DISASSOC ):if (is_multicast_ether_addr (mgmt->da) && !is_broadcast_ether_addr (mgmt->da))
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 314/371 llc: fix another potential sk_buff leak in llc_ui_sendmsg()
In reply to Sasha LevinFrom: Eric Biggers <[email protected]>
[ Upstream commit fc8d5db10cbe1338a52ebc74e7feab9276721774 ]
All callers of llc_conn_state_process() except llc_build_and_send_pkt() (via llc_ui_sendmsg() -> llc_ui_send_data()) assume that it always consumes a reference to the skb. Fix this caller to do the same.
--- net/llc/af_llc.c | 34 ++++++++++++++++++++-------------- net/llc/llc_conn.c | 2 ++ net/llc/llc_if.c | 12 ++++++++---- 3 files changed, 30 insertions(+), 18 deletions(-)
net/llc/af_llc.c +20 -14
@@ -113,22 +113,26 @@ static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr)* * Send data via reliable llc2 connection. * Returns 0 upon success, non-zero if action did not succeed. +* +* This function always consumes a reference to the skb. */ static int llc_ui_send_data (struct sock * sk,struct sk_buff *skb,int noblock) {struct llc_sock * llc =llc_sk (sk); -int rc =0 ;if (unlikely (llc_data_accept_state (llc->state) || llc->remote_busy_flag || llc->p_flag)) {long timeout =sock_sndtimeo (sk, noblock); +int rc; rc =llc_ui_wait_for_busy_core (sk, timeout); +if (rc) { +kfree_skb (skb); +return rc; + } } -if (unlikely (!rc)) - rc =llc_build_and_send_pkt (sk, skb); -return rc; +return llc_build_and_send_pkt (sk, skb); }static void llc_ui_sk_init (struct socket *sock,struct sock *sk)
@@ -900,7 +904,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) DECLARE_SOCKADDR(struct sockaddr_llc *, addr, msg->msg_name);int flags = msg->msg_flags;int noblock = flags &MSG_DONTWAIT ; -struct sk_buff *skb; +struct sk_buff *skb =NULL ;size_t size =0 ;int rc = -EINVAL , copied =0 , hdrlen;
@@ -909,10 +913,10 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)lock_sock (sk);if (addr) {if (msg->msg_namelen <sizeof (*addr)) - goto release; + goto out; }else {if (llc_ui_addr_null (&llc->addr)) - goto release; + goto out; addr = &llc->addr; }/* must bind connection to sap if user hasn't done it. */
@@ -920,7 +924,7 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)/* bind to sap with null dev, exclusive. */ rc =llc_ui_autobind (sock, addr);if (rc) - goto release; + goto out; } hdrlen = llc->dev->hard_header_len +llc_ui_header_len (sk, addr); size = hdrlen + len;
@@ -929,12 +933,12 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) copied = size - hdrlen; rc = -EINVAL ;if (copied <0 ) - goto release; + goto out;release_sock (sk); skb =sock_alloc_send_skb (sk, size, noblock, &rc);lock_sock (sk);if (!skb) - goto release; + goto out; skb->dev = llc->dev; skb->protocol =llc_proto_type (addr->sllc_arphrd);skb_reserve (skb, hdrlen);
@@ -944,29 +948,31 @@ static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)if (sk->sk_type ==SOCK_DGRAM || addr->sllc_ua) {llc_build_and_send_ui_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_test) {llc_build_and_send_test_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; }if (addr->sllc_xid) {llc_build_and_send_xid_pkt (llc->sap, skb, addr->sllc_mac, addr->sllc_sap); + skb =NULL ; goto out; } rc = -ENOPROTOOPT ;if (!(sk->sk_type ==SOCK_STREAM && !addr->sllc_ua)) goto out; rc =llc_ui_send_data (sk, skb, noblock); + skb =NULL ; out: -if (rc) { -kfree_skb (skb); -release: +kfree_skb (skb); +if (rc)dprintk ("%s: failed sending from %02X to %02X: %d\n" , __func__, llc->laddr.lsap, llc->daddr.lsap, rc); - }release_sock (sk);return rc ? : copied; }
net/llc/llc_conn.c +2 -0
@@ -55,6 +55,8 @@ int sysctl_llc2_busy_timeout = LLC2_BUSY_TIME * HZ;* (executing it's actions and changing state), upper layer will be * indicated or confirmed, if needed. Returns 0 for success, 1 for * failure. The socket lock has to be held before calling this function. +* +* This function always consumes a reference to the skb. */ int llc_conn_state_process (struct sock *sk,struct sk_buff *skb) {
net/llc/llc_if.c +8 -4
@@ -38,6 +38,8 @@* closed and -EBUSY when sending data is not permitted in this state or * LLC has send an I pdu with p bit set to 1 and is waiting for it's * response. +* +* This function always consumes a reference to the skb. */ int llc_build_and_send_pkt (struct sock *sk,struct sk_buff *skb) {
@@ -46,20 +48,22 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)struct llc_sock *llc =llc_sk (sk);if (unlikely (llc->state ==LLC_CONN_STATE_ADM )) - goto out; + goto out_free; rc = -EBUSY ;if (unlikely (llc_data_accept_state (llc->state) ||/* data_conn_refuse */ llc->p_flag)) { llc->failed_data_req =1 ; - goto out; + goto out_free; } ev =llc_conn_ev (skb); ev->type =LLC_CONN_EV_TYPE_PRIM ; ev->prim =LLC_DATA_PRIM ; ev->prim_type =LLC_PRIM_TYPE_REQ ; skb->dev = llc->dev; - rc =llc_conn_state_process (sk, skb); -out: +return llc_conn_state_process (sk, skb); + +out_free: +kfree_skb (skb);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 315/371 llc: fix sk_buff refcounting in llc_conn_state_process()
In reply to Sasha LevinFrom: Eric Biggers <[email protected]>
[ Upstream commit 36453c852816f19947ca482a595dffdd2efa4965 ]
If llc_conn_state_process() sees that llc_conn_service() put the skb on a list, it will drop one fewer references to it. This is wrong because the current behavior is that llc_conn_service() never consumes a reference to the skb.
The code also makes the number of skb references being dropped conditional on which of ind_prim and cfm_prim are nonzero, yet neither of these affects how many references are *acquired*. So there is extra code that tries to fix this up by sometimes taking another reference.
Remove the unnecessary/broken refcounting logic and instead just add an skb_get() before the only two places where an extra reference is actually consumed.
--- net/llc/llc_conn.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-)
net/llc/llc_conn.c +6 -27
@@ -64,12 +64,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)struct llc_sock *llc =llc_sk (skb->sk);struct llc_conn_state_ev *ev =llc_conn_ev (skb); -/* -* We have to hold the skb, because llc_conn_service will kfree it in -* the sending path and we need to look at the skb->cb, where we encode -* llc_conn_state_ev. -*/ -skb_get (skb); ev->ind_prim = ev->cfm_prim =0 ;/* * Send event to state machine
@@ -77,21 +71,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) rc =llc_conn_service (skb->sk, skb);if (unlikely (rc !=0 )) {printk (KERN_ERR "%s: llc_conn_service failed\n" , __func__); - goto out_kfree_skb; - } - -if (unlikely (!ev->ind_prim && !ev->cfm_prim)) { -/* indicate or confirm not required */ -if (!skb->next) - goto out_kfree_skb; goto out_skb_put; } -if (unlikely (ev->ind_prim && ev->cfm_prim))/* Paranoia */ -skb_get (skb); -switch (ev->ind_prim) {case LLC_DATA_PRIM : +skb_get (skb);llc_save_primitive (sk, skb,LLC_DATA_PRIM );if (unlikely (sock_queue_rcv_skb (sk, skb))) {/*
@@ -108,6 +93,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)* skb->sk pointing to the newly created struct sock in * llc_conn_handler. -acme */ +skb_get (skb);skb_queue_tail (&sk->sk_receive_queue, skb); sk->sk_state_change (sk);break ;
@@ -123,7 +109,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb) sk->sk_state_change (sk); } } -kfree_skb (skb);sock_put (sk);break ;case LLC_RESET_PRIM :
@@ -132,14 +117,11 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)* RESET is not being notified to upper layers for now */ printk (KERN_INFO "%s: received a reset ind!\n" , __func__); -kfree_skb (skb);break ;default : -if (ev->ind_prim) { +if (ev->ind_prim)printk (KERN_INFO "%s: received unknown %d prim!\n" , __func__, ev->ind_prim); -kfree_skb (skb); - }/* No indication */ break ; }
@@ -181,15 +163,12 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)printk (KERN_INFO "%s: received a reset conf!\n" , __func__);break ;default : -if (ev->cfm_prim) { +if (ev->cfm_prim)printk (KERN_INFO "%s: received unknown %d prim!\n" , __func__, ev->cfm_prim); -break ; - } - goto out_skb_put;/* No confirmation */ +/* No confirmation */ +break ; } -out_kfree_skb: -kfree_skb (skb); out_skb_put:kfree_skb (skb);return rc;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 316/371 net: stmmac: fix length of PTP clock's name string
In reply to Sasha LevinFrom: Antonio Borneo <[email protected]>
[ Upstream commit 5da202c88f8c355ad79bc2e8eb582e6d433060e7 ]
The field "name" in struct ptp_clock_info has a fixed size of 16 chars and is used as zero terminated string by clock_name_show() in drivers/ptp/ptp_sysfs.c
The current initialization value requires 17 chars to fit also the null termination, and this causes overflow to the next bytes in the struct when the string is read as null terminated:
hexdump -C /sys/class/ptp/ptp0/clock_name 00000000 73 74 6d 6d 61 63 5f 70 74 70 5f 63 6c 6f 63 6b |stmmac_ptp_clock| 00000010 a0 ac b9 03 0a |.....|
where the extra 4 bytes (excluding the newline) after the string represent the integer 0x03b9aca0 = 62500000 assigned to the field "max_adj" that follows "name" in the same struct.
There is no strict requirement for the "name" content and in the comment in ptp_clock_kernel.h it's reported it should just be 'A short "friendly name" to identify the clock'.
Replace it with "stmmac ptp".
--- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +1 -1
@@ -154,7 +154,7 @@ static int stmmac_enable(struct ptp_clock_info *ptp,/* structure describing a PTP hardware clock */ static const struct ptp_clock_info stmmac_ptp_clock_ops = { .owner =THIS_MODULE , - .name ="stmmac_ptp_clock" , + .name ="stmmac ptp" , .max_adj =62500000 , .n_alarm =0 , .n_ext_ts =0 ,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 317/371 act_mirred: Fix mirred_init_module error handling
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 11c9a7d38af524217efb7a176ad322b97ac2f163 ]
If tcf_register_action failed, mirred_device_notifier should be unregistered.
--- net/sched/act_mirred.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/sched/act_mirred.c +5 -1
@@ -371,7 +371,11 @@ static int __init mirred_init_module(void)return err;pr_info ("Mirror/redirect action on\n" ); -return tcf_register_action (&act_mirred_ops, &mirred_net_ops); + err =tcf_register_action (&act_mirred_ops, &mirred_net_ops); +if (err) +unregister_netdevice_notifier (&mirred_device_notifier); + +return err; } static void __exit mirred_cleanup_module(void)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 318/371 net: avoid possible false sharing in sk_leave_memory_pressure()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 503978aca46124cd714703e180b9c8292ba50ba7 ]
As mentioned in https://github.com/google/ktsan/wiki/READ_ONCE-and-WRITE_ONCE#it-may-improve-performance
a C compiler can legally transform :
if (memory_pressure && *memory_pressure)
*memory_pressure = 0;
to :
if (memory_pressure)
*memory_pressure = 0;
--- net/core/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/sock.c +2 -2
@@ -2165,8 +2165,8 @@ static void sk_leave_memory_pressure(struct sock *sk) }else {unsigned long *memory_pressure = sk->sk_prot->memory_pressure; -if (memory_pressure && *memory_pressure) - *memory_pressure =0 ; +if (memory_pressure &&READ_ONCE (*memory_pressure)) +WRITE_ONCE (*memory_pressure,0 ); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 319/371 net: add {READ|WRITE}_ONCE() annotations on ->rskq_accept_head
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 60b173ca3d1cd1782bd0096dc17298ec242f6fb1 ]
reqsk_queue_empty() is called from inet_csk_listen_poll() while other cpus might write ->rskq_accept_head value.
Use {READ|WRITE}_ONCE() to avoid compiler tricks
and potential KCSAN splats.
--- drivers/xen/pvcalls-back.c | 2 +- include/net/request_sock.h | 4 ++-- net/ipv4/inet_connection_sock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/xen/pvcalls-back.c +1 -1
@@ -792,7 +792,7 @@ static int pvcalls_back_poll(struct xenbus_device *dev, mappass->reqcopy = *req; icsk =inet_csk (mappass->sock->sk); queue = &icsk->icsk_accept_queue; - data = queue->rskq_accept_head !=NULL ; + data =READ_ONCE (queue->rskq_accept_head) !=NULL ;if (data) { mappass->reqcopy.cmd =0 ; ret =0 ;
include/net/request_sock.h +2 -2
@@ -181,7 +181,7 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req,static inline bool reqsk_queue_empty (const struct request_sock_queue *queue) { -return queue->rskq_accept_head ==NULL ; +return READ_ONCE (queue->rskq_accept_head) ==NULL ; } static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue *queue,
@@ -193,7 +193,7 @@ static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue req = queue->rskq_accept_head;if (req) {sk_acceptq_removed (parent); - queue->rskq_accept_head = req->dl_next; +WRITE_ONCE (queue->rskq_accept_head, req->dl_next);if (queue->rskq_accept_head ==NULL ) queue->rskq_accept_tail =NULL ; }
net/ipv4/inet_connection_sock.c +1 -1
@@ -936,7 +936,7 @@ struct sock *inet_csk_reqsk_queue_add(struct sock *sk, req->sk = child; req->dl_next =NULL ;if (queue->rskq_accept_head ==NULL ) - queue->rskq_accept_head = req; +WRITE_ONCE (queue->rskq_accept_head, req);else queue->rskq_accept_tail->dl_next = req; queue->rskq_accept_tail = req;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 320/371 tcp: annotate lockless access to tcp_memory_pressure
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 1f142c17d19a5618d5a633195a46f2c8be9bf232 ]
tcp_memory_pressure is read without holding any lock, and its value could be changed on other cpus.
Use READ_ONCE() to annotate these lockless reads.
The write side is already using atomic ops.
--- include/net/tcp.h | 2 +- net/ipv4/tcp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
include/net/tcp.h +1 -1
@@ -289,7 +289,7 @@ static inline bool tcp_under_memory_pressure(const struct sock *sk) mem_cgroup_under_socket_pressure(sk->sk_memcg))return true; -return tcp_memory_pressure; +return READ_ONCE (tcp_memory_pressure); }/* * The next routines deal with comparing 32 bit unsigned ints
net/ipv4/tcp.c +2 -2
@@ -328,7 +328,7 @@ void tcp_enter_memory_pressure(struct sock *sk) {unsigned long val; -if (tcp_memory_pressure) +if (READ_ONCE (tcp_memory_pressure))return ; val = jiffies;
@@ -343,7 +343,7 @@ void tcp_leave_memory_pressure(struct sock *sk) {unsigned long val; -if (!tcp_memory_pressure) +if (!READ_ONCE (tcp_memory_pressure))return ; val =xchg (&tcp_memory_pressure,0 );if (val)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 321/371 USB: usb-skeleton: fix use-after-free after driver unbind
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 6353001852776e7eeaab4da78922d4c6f2b076af ]
The driver failed to stop its read URB on disconnect, something which could lead to a use-after-free in the completion handler after driver unbind in case the character device has been closed.
--- drivers/usb/usb-skeleton.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/usb-skeleton.c +1 -0
@@ -575,6 +575,7 @@ static void skel_disconnect(struct usb_interface *interface) dev->disconnected =1 ;mutex_unlock (&dev->io_mutex); +usb_kill_urb (dev->bulk_in_urb);usb_kill_anchored_urbs (&dev->submitted);/* decrement our usage count */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 322/371 drm/msm/dsi: Implement reset correctly
In reply to Sasha LevinFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 78e31c42261779a01bc73472d0f65f15378e9de3 ]
On msm8998, vblank timeouts are observed because the DSI controller is not reset properly, which ends up stalling the MDP. This is because the reset logic is not correct per the hardware documentation.
The documentation states that after asserting reset, software should wait some time (no indication of how long), or poll the status register until it returns 0 before deasserting reset.
wmb() is insufficient for this purpose since it just ensures ordering, not timing between writes. Since asserting and deasserting reset occurs on the same register, ordering is already guaranteed by the architecture, making the wmb extraneous.
Since we would define a timeout for polling the status register to avoid a possible infinite loop, lets just use a static delay of 20 ms, since 16.666 ms is the time available to process one frame at 60 fps.
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +4 -2
@@ -34,6 +34,8 @@#include "dsi_cfg.h" #include "msm_kms.h" +#define DSI_RESET_TOGGLE_DELAY_MS 20 +static int dsi_get_version (const void __iomem *base,u32 *major,u32 *minor) {u32 ver;
@@ -906,7 +908,7 @@ static void dsi_sw_reset(struct msm_dsi_host *msm_host)wmb ();/* clocks need to be enabled before reset */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (DSI_RESET_TOGGLE_DELAY_MS );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 ); }
@@ -1288,7 +1290,7 @@ static void dsi_sw_reset_restore(struct msm_dsi_host *msm_host)/* dsi controller can only be reset while clocks are running */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (DSI_RESET_TOGGLE_DELAY_MS );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 );wmb ();/* controller out of reset */ dsi_write (msm_host,REG_DSI_CTRL , data0);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 323/371 dmaengine: imx-sdma: fix size check for sdma script_number
In reply to Sasha LevinFrom: Robin Gong <[email protected]>
[ Upstream commit bd73dfabdda280fc5f05bdec79b6721b4b2f035f ]
Illegal memory will be touch if SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3
(41) exceed the size of structure sdma_script_start_addrs(40), thus cause memory corrupt such as slob block header so that kernel trap into while() loop forever in slob_free(). Please refer to below code piece in imx-sdma.c:
for (i = 0; i < sdma->script_number; i++)
if (addr_arr[i] > 0) saddr_arr[i] = addr_arr[i]; /* memory corrupt here */
That issue was brought by commit a572460be9cf ("dmaengine: imx-sdma: Add support for version 3 firmware") because SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 (38->41 3 scripts added) not align with script number added in sdma_script_start_addrs(2 scripts).
--- drivers/dma/imx-sdma.c | 8 ++++++++ include/linux/platform_data/dma-imx-sdma.h | 3 +++ 2 files changed, 11 insertions(+)
drivers/dma/imx-sdma.c +8 -0
@@ -1441,6 +1441,14 @@ static void sdma_add_scripts(struct sdma_engine *sdma,if (!sdma->script_number) sdma->script_number =SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 ; +if (sdma->script_number >sizeof (struct sdma_script_start_addrs ) + /sizeof (s32)) { +dev_err (sdma->dev, +"SDMA script number %d not match with firmware.\n" , + sdma->script_number); +return ; + } +for (i =0 ; i < sdma->script_number; i++)if (addr_arr[i] >0 ) saddr_arr[i] = addr_arr[i];
include/linux/platform_data/dma-imx-sdma.h +3 -0
@@ -51,7 +51,10 @@ struct sdma_script_start_addrs {/* End of v2 array */ s32 zcanfd_2_mcu_addr;s32 zqspi_2_mcu_addr; +s32 mcu_2_ecspi_addr;/* End of v3 array */ +s32 mcu_2_zqspi_addr; +/* End of v4 array */ };/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 324/371 net: netem: fix error path for corrupted GSO frames
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit a7fa12d15855904aff1716e1fc723c03ba38c5cc ]
To corrupt a GSO frame we first perform segmentation. We then proceed using the first segment instead of the full GSO skb and requeue the rest of the segments as separate packets.
If there are any issues with processing the first segment we still want to process the rest, therefore we jump to the finish_segs label.
Commit 177b8007463c ("net: netem: fix backlog accounting for corrupted GSO frames") started using the pointer to the first segment in the "rest of segments processing", but as mentioned above the first segment may had already been freed at this point.
Backlog corrections for parent qdiscs have to be adjusted.
--- net/sched/sch_netem.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/sched/sch_netem.c +6 -3
@@ -504,6 +504,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,if (skb->ip_summed ==CHECKSUM_PARTIAL &&skb_checksum_help (skb)) {qdisc_drop (skb, sch, to_free); + skb =NULL ; goto finish_segs; }
@@ -580,9 +581,10 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, finish_segs:if (segs) {unsigned int len, last_len; -int nb =0 ; +int nb; - len = skb->len; + len = skb ? skb->len :0 ; + nb = skb ?1 :0 ;while (segs) { skb2 = segs->next;
@@ -599,7 +601,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, } segs = skb2; } -qdisc_tree_reduce_backlog (sch, -nb, prev_len - len); +/* Parent qdiscs accounted for 1 skb of size @prev_len */ +qdisc_tree_reduce_backlog (sch, -(nb -1 ), -(len - prev_len)); }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 325/371 net: netem: correct the parent's backlog when corrupted packet was dropped
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit e0ad032e144731a5928f2d75e91c2064ba1a764c ]
If packet corruption failed we jump to finish_segs and return NET_XMIT_SUCCESS. Seeing success will make the parent qdisc increment its backlog, that's incorrect - we need to return NET_XMIT_DROP.
--- net/sched/sch_netem.c | 2 ++ 1 file changed, 2 insertions(+)
net/sched/sch_netem.c +2 -0
@@ -603,6 +603,8 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, }/* Parent qdiscs accounted for 1 skb of size @prev_len */ qdisc_tree_reduce_backlog (sch, -(nb -1 ), -(len - prev_len)); + }else if (!skb) { +return NET_XMIT_DROP ; }return NET_XMIT_SUCCESS ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 326/371 net: qca_spi: Move reset_count to struct qcaspi
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit bc19c32904e36548335b35fdce6ce734e20afc0a ]
The reset counter is specific for every QCA700x chip. So move this into the private driver struct. Otherwise we get unpredictable reset behavior in setups with multiple QCA700x chips.
--- drivers/net/ethernet/qualcomm/qca_spi.c | 9 ++++----- drivers/net/ethernet/qualcomm/qca_spi.h | 1 + 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/qualcomm/qca_spi.c +4 -5
@@ -475,7 +475,6 @@ qcaspi_qca7k_sync(struct qcaspi *qca, int event)u16 signature =0 ;u16 spi_config;u16 wrbuf_space =0 ; -static u16 reset_count;if (event ==QCASPI_EVENT_CPUON ) {/* Read signature twice, if not valid
@@ -528,13 +527,13 @@ qcaspi_qca7k_sync(struct qcaspi *qca, int event) qca->sync =QCASPI_SYNC_RESET ; qca->stats.trig_reset++; - reset_count =0 ; + qca->reset_count =0 ;break ;case QCASPI_SYNC_RESET : - reset_count++; + qca->reset_count++;netdev_dbg (qca->net_dev,"sync: waiting for CPU on, count %u.\n" , - reset_count); -if (reset_count >=QCASPI_RESET_TIMEOUT ) { + qca->reset_count); +if (qca->reset_count >=QCASPI_RESET_TIMEOUT ) {/* reset did not seem to take place, try again */ qca->sync =QCASPI_SYNC_UNKNOWN ; qca->stats.reset_timeout++;
drivers/net/ethernet/qualcomm/qca_spi.h +1 -0
@@ -92,6 +92,7 @@ struct qcaspi {unsigned int intr_req;unsigned int intr_svc; +u16 reset_count;#ifdef CONFIG_DEBUG_FS struct dentry *device_root;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 327/371 afs: Fix large file support
In reply to Sasha LevinFrom: Marc Dionne <[email protected]>
[ Upstream commit b485275f1aca8a9da37fd35e4fad673935e827da ]
By default s_maxbytes is set to MAX_NON_LFS, which limits the usable file size to 2GB, enforced by the vfs.
Commit b9b1f8d5930a ("AFS: write support fixes") added support for the 64-bit fetch and store server operations, but did not change this value. As a result, attempts to write past the 2G mark result in EFBIG errors:
$ dd if=/dev/zero of=foo bs=1M count=1 seek=2048 dd: error writing 'foo': File too large
Set s_maxbytes to MAX_LFS_FILESIZE.
--- fs/afs/super.c | 1 + 1 file changed, 1 insertion(+)
fs/afs/super.c +1 -0
@@ -359,6 +359,7 @@ static int afs_fill_super(struct super_block *sb,/* fill in the superblock */ sb->s_blocksize =PAGE_SIZE ; sb->s_blocksize_bits =PAGE_SHIFT ; + sb->s_maxbytes =MAX_LFS_FILESIZE ; sb->s_magic =AFS_FS_MAGIC ; sb->s_op = &afs_super_ops; sb->s_xattr = afs_xattr_handlers;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 328/371 ioat: ioat_alloc_ring() failure handling.
In reply to Sasha LevinFrom: "[email protected]" <[email protected]>
[ Upstream commit b0b5ce1010ffc50015eaec72b0028aaae3f526bb ]
If dma_alloc_coherent() returns NULL in ioat_alloc_ring(), ring allocation must not proceed.
Until now, if the first call to dma_alloc_coherent() in ioat_alloc_ring() returned NULL, the processing could proceed, failing with NULL-pointer dereferencing further down the line.
--- drivers/dma/ioat/dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/dma/ioat/dma.c +2 -1
@@ -388,10 +388,11 @@ ioat_alloc_ring(struct dma_chan *c, int order, gfp_t flags) descs->virt =dma_alloc_coherent (to_dev (ioat_chan),SZ_2M , &descs->hw, flags); -if (!descs->virt && (i >0 )) { +if (!descs->virt) {int idx;for (idx =0 ; idx < i; idx++) { + descs = &ioat_chan->descs[idx];dma_free_coherent (to_dev (ioat_chan),SZ_2M , descs->virt, descs->hw); descs->virt =NULL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 329/371 mt7601u: fix bbp version check in mt7601u_wait_bbp_ready
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 15e14f76f85f4f0eab3b8146e1cd3c58ce272823 ]
Fix bbp ready check in mt7601u_wait_bbp_ready. The issue is reported by coverity with the following error:
Logical vs. bitwise operator
The expression's value does not depend on the operands; inadvertent use of the wrong operator is a likely logic error.
Addresses-Coverity-ID: 1309441 ("Logical vs. bitwise operator")
--- drivers/net/wireless/mediatek/mt7601u/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt7601u/phy.c +1 -1
@@ -221,7 +221,7 @@ int mt7601u_wait_bbp_ready(struct mt7601u_dev *dev)do { val =mt7601u_bbp_rr (dev,MT_BBP_REG_VERSION ); -if (val && ~val) +if (val && val !=0xff )break ; }while (--i);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 330/371 media: ov6650: Fix incorrect use of JPEG colorspace
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 12500731895ef09afc5b66b86b76c0884fb9c7bf ]
Since its initial submission, the driver selects V4L2_COLORSPACE_JPEG for supported formats other than V4L2_MBUS_FMT_SBGGR8_1X8. According to v4l2-compliance test program, V4L2_COLORSPACE_JPEG applies exclusively to V4L2_PIX_FMT_JPEG. Since the sensor does not support JPEG format, fix it to always select V4L2_COLORSPACE_SRGB.
--- drivers/media/i2c/ov6650.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/media/i2c/ov6650.c +2 -11
@@ -203,7 +203,6 @@ struct ov6650 {unsigned long pclk_max;/* from resolution and format */ struct v4l2_fract tpf;/* as requested with s_parm */ u32 code; -enum v4l2_colorspace colorspace; };
@@ -520,7 +519,7 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd, mf->width = priv->rect.width >> priv->half_scale; mf->height = priv->rect.height >> priv->half_scale; mf->code = priv->code; - mf->colorspace = priv->colorspace; + mf->colorspace =V4L2_COLORSPACE_SRGB ; mf->field =V4L2_FIELD_NONE ;return 0 ;
@@ -627,11 +626,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) priv->pclk_max =8000000 ; } -if (code ==MEDIA_BUS_FMT_SBGGR8_1X8 ) - priv->colorspace =V4L2_COLORSPACE_SRGB ; -else if (code !=0 ) - priv->colorspace =V4L2_COLORSPACE_JPEG ; -if (half_scale) {dev_dbg (&client->dev,"max resolution: QCIF\n" ); coma_set |=COMA_QCIF ;
@@ -666,7 +660,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) priv->code = code;if (!ret) { - mf->colorspace = priv->colorspace; mf->width = priv->rect.width >> half_scale; mf->height = priv->rect.height >> half_scale; }
@@ -689,6 +682,7 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd, &mf->height, 2, H_CIF, 1, 0); mf->field =V4L2_FIELD_NONE ; + mf->colorspace =V4L2_COLORSPACE_SRGB ;switch (mf->code) {case MEDIA_BUS_FMT_Y10_1X10 :
@@ -699,13 +693,11 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,case MEDIA_BUS_FMT_YUYV8_2X8 :case MEDIA_BUS_FMT_VYUY8_2X8 :case MEDIA_BUS_FMT_UYVY8_2X8 : - mf->colorspace =V4L2_COLORSPACE_JPEG ;break ;default : mf->code =MEDIA_BUS_FMT_SBGGR8_1X8 ;/* fall through */ case MEDIA_BUS_FMT_SBGGR8_1X8 : - mf->colorspace =V4L2_COLORSPACE_SRGB ;break ; }
@@ -1020,7 +1012,6 @@ static int ov6650_probe(struct i2c_client *client, priv->rect.height =H_CIF ; priv->half_scale = false; priv->code =MEDIA_BUS_FMT_YUYV8_2X8 ; - priv->colorspace =V4L2_COLORSPACE_JPEG ; ret =ov6650_video_probe (client);if (ret)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 331/371 media: ov6650: Fix some format attributes not under control
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 1c6a2b63095154bbf9e8f38d79487a728331bf65 ]
User arguments passed to .get/set_fmt() pad operation callbacks may contain unsupported values. The driver takes control over frame size and pixel code as well as colorspace and field attributes but has never cared for remainig format attributes, i.e., ycbcr_enc, quantization and xfer_func, introduced by commit 11ff030c7365 ("[media]
v4l2-mediabus: improve colorspace support"). Fix it.
Set up a static v4l2_mbus_framefmt structure with attributes initialized to reasonable defaults and use it for updating content of user provided arguments. In case of V4L2_SUBDEV_FORMAT_ACTIVE, postpone frame size update, now performed from inside ov6650_s_fmt() helper, util the user argument is first updated in ov6650_set_fmt() with default frame format content. For V4L2_SUBDEV_FORMAT_TRY, don't copy all attributes to pad config, only those handled by the driver, then fill the response with the default frame format updated with resulting pad config format code and frame size.
--- drivers/media/i2c/ov6650.c | 51 +++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 12 deletions(-)
drivers/media/i2c/ov6650.c +39 -12
@@ -215,6 +215,17 @@ static u32 ov6650_codes[] = { MEDIA_BUS_FMT_Y8_1X8, }; +static const struct v4l2_mbus_framefmt ov6650_def_fmt = { + .width =W_CIF , + .height =H_CIF , + .code =MEDIA_BUS_FMT_SBGGR8_1X8 , + .colorspace =V4L2_COLORSPACE_SRGB , + .field =V4L2_FIELD_NONE , + .ycbcr_enc =V4L2_YCBCR_ENC_DEFAULT , + .quantization =V4L2_QUANTIZATION_DEFAULT , + .xfer_func =V4L2_XFER_FUNC_DEFAULT , +}; +/* read a register */ static int ov6650_reg_read (struct i2c_client *client,u8 reg,u8 *val) {
@@ -516,11 +527,13 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd,if (format->pad)return -EINVAL ; +/* initialize response with default media bus frame format */ + *mf = ov6650_def_fmt; + +/* update media bus format code and frame size */ mf->width = priv->rect.width >> priv->half_scale; mf->height = priv->rect.height >> priv->half_scale; mf->code = priv->code; - mf->colorspace =V4L2_COLORSPACE_SRGB ; - mf->field =V4L2_FIELD_NONE ;return 0 ; }
@@ -659,10 +672,6 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)if (!ret) priv->code = code; -if (!ret) { - mf->width = priv->rect.width >> half_scale; - mf->height = priv->rect.height >> half_scale; - }return ret; }
@@ -681,9 +690,6 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,v4l_bound_align_image (&mf->width,2 ,W_CIF ,1 , &mf->height,2 ,H_CIF ,1 ,0 ); - mf->field =V4L2_FIELD_NONE ; - mf->colorspace =V4L2_COLORSPACE_SRGB ; -switch (mf->code) {case MEDIA_BUS_FMT_Y10_1X10 : mf->code =MEDIA_BUS_FMT_Y8_1X8 ;
@@ -701,10 +707,31 @@ static int ov6650_set_fmt(struct v4l2_subdev *sd,break ; } -if (format->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) -return ov6650_s_fmt (sd, mf); - cfg->try_fmt = *mf; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { +/* store media bus format code and frame size in pad config */ + cfg->try_fmt.width = mf->width; + cfg->try_fmt.height = mf->height; + cfg->try_fmt.code = mf->code; +/* return default mbus frame format updated with pad config */ + *mf = ov6650_def_fmt; + mf->width = cfg->try_fmt.width; + mf->height = cfg->try_fmt.height; + mf->code = cfg->try_fmt.code; + + }else { +/* apply new media bus format code and frame size */ +int ret =ov6650_s_fmt (sd, mf); + +if (ret) +return ret; + +/* return default format updated with active size and code */ + *mf = ov6650_def_fmt; + mf->width = priv->rect.width >> priv->half_scale; + mf->height = priv->rect.height >> priv->half_scale; + mf->code = priv->code; + }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 332/371 media: ov6650: Fix .get_fmt() V4L2_SUBDEV_FORMAT_TRY support
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 39034bb0c26b76a2c3abc54aa28c185f18b40c2f ]
Commit da298c6d98d5 ("[media] v4l2: replace video op g_mbus_fmt by pad op get_fmt") converted a former ov6650_g_fmt() video operation callback to an ov6650_get_fmt() pad operation callback. However, the converted function disregards a format->which flag that pad operations should obey and always returns active frame format settings.
That can be fixed by always responding to V4L2_SUBDEV_FORMAT_TRY with -EINVAL, or providing the response from a pad config argument, likely updated by a former user call to V4L2_SUBDEV_FORMAT_TRY .set_fmt(). Since implementation of the latter is trivial, go for it.
--- drivers/media/i2c/ov6650.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/media/i2c/ov6650.c +9 -3
@@ -531,10 +531,16 @@ static int ov6650_get_fmt(struct v4l2_subdev *sd, *mf = ov6650_def_fmt;/* update media bus format code and frame size */ - mf->width = priv->rect.width >> priv->half_scale; - mf->height = priv->rect.height >> priv->half_scale; - mf->code = priv->code; +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { + mf->width = cfg->try_fmt.width; + mf->height = cfg->try_fmt.height; + mf->code = cfg->try_fmt.code; + }else { + mf->width = priv->rect.width >> priv->half_scale; + mf->height = priv->rect.height >> priv->half_scale; + mf->code = priv->code; + }return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 333/371 cw1200: Fix a signedness bug in cw1200_load_firmware()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4a50d454502f1401171ff061a5424583f91266db ]
The "priv->hw_type" is an enum and in this context GCC will treat it as an unsigned int so the error handling will never trigger.
--- drivers/net/wireless/st/cw1200/fwio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/st/cw1200/fwio.c +3 -3
@@ -323,12 +323,12 @@ int cw1200_load_firmware(struct cw1200_common *priv) goto out; } - priv->hw_type =cw1200_get_hw_type (val32, &major_revision); -if (priv->hw_type <0 ) { + ret =cw1200_get_hw_type (val32, &major_revision); +if (ret <0 ) {pr_err ("Can't deduce hardware type.\n" ); - ret = -ENOTSUPP ; goto out; } + priv->hw_type = ret;/* Set DPLL Reg value, and read back to confirm writes work */ ret = cw1200_reg_write_32(priv, ST90TDS_TSET_GEN_R_W_REG_ID,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 334/371 pinctl: ti: iodelay: fix error checking on pinctrl_count_index_with_args call
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 5ff8aca906f3a7a7db79fad92f2a4401107ef50d ]
The call to pinctrl_count_index_with_args checks for a -EINVAL return however this function calls pinctrl_get_list_and_count and this can return -ENOENT. Rather than check for a specific error, fix this by checking for any error return to catch the -ENOENT case.
Addresses-Coverity: ("Improper use of negative")
--- drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/ti/pinctrl-ti-iodelay.c +1 -1
@@ -496,7 +496,7 @@ static int ti_iodelay_dt_node_to_map(struct pinctrl_dev *pctldev,return -EINVAL ; rows =pinctrl_count_index_with_args (np, name); -if (rows == -EINVAL ) +if (rows <0 )return rows; *map =devm_kzalloc (iod->dev,sizeof (**map),GFP_KERNEL );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 335/371 arm64: dts: meson-gxl-s905x-khadas-vim: fix gpio-keys-polled node
In reply to Sasha LevinFrom: Christian Hewitt <[email protected]>
[ Upstream commit d5f6fa904ecbadbb8e9fa6302b0fc165bec0559a ]
Fix DTC warnings:
arch/arm/dts/meson-gxl-s905x-khadas-vim.dtb: Warning (avoid_unnecessary_addr_size):
/gpio-keys-polled: unnecessary #address-cells/#size-cells
without "ranges" or child "reg" property
--- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +1 -3
@@ -33,11 +33,9 @@ gpio-keys-polled { compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; poll-interval = <100>; - button@0 { + power-button { label = "power"; linux,code = <KEY_POWER>; gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 336/371 arm64: dts: apq8096-db820c: Increase load on l21 for SDCARD
In reply to Sasha LevinFrom: Loic Poulain <[email protected]>
[ Upstream commit e38161bd325ea541ef2f258d8e28281077dde524 ]
In the same way as for msm8974-hammerhead, l21 load, used for SDCARD VMMC, needs to be increased in order to prevent any voltage drop issues (due to limited current) happening with some SDCARDS or during specific operations (e.g. write).
--- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +2 -0
@@ -262,6 +262,8 @@ l21 { regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; + regulator-allow-set-load; + regulator-system-load = <200000>; }; l22 { regulator-min-microvolt = <3300000>;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 337/371 spi: atmel: fix handling of cs_change set on non-last xfer
In reply to Sasha LevinFrom: Mans Rullgard <[email protected]>
[ Upstream commit fed8d8c7a6dc2a76d7764842853d81c770b0788e ]
The driver does the wrong thing when cs_change is set on a non-last xfer in a message. When cs_change is set, the driver deactivates the CS and leaves it off until a later xfer again has cs_change set whereas it should be briefly toggling CS off and on again.
This patch brings the behaviour of the driver back in line with the documentation and common sense. The delay of 10 us is the same as is used by the default spi_transfer_one_message() function in spi.c.
--- drivers/spi/spi-atmel.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/spi/spi-atmel.c +3 -7
@@ -301,7 +301,6 @@ struct atmel_spi {bool use_cs_gpios;bool keep_cs; -bool cs_active;u32 fifo_size; };
@@ -1338,11 +1337,9 @@ static int atmel_spi_one_transfer(struct spi_master *master, &msg->transfers)) { as->keep_cs = true; }else { - as->cs_active = !as->cs_active; -if (as->cs_active) -cs_activate (as, msg->spi); -else -cs_deactivate (as, msg->spi); +cs_deactivate (as, msg->spi); +udelay (10 ); +cs_activate (as, msg->spi); } }
@@ -1365,7 +1362,6 @@ static int atmel_spi_transfer_one_message(struct spi_master *master,atmel_spi_lock (as);cs_activate (as, spi); - as->cs_active = true; as->keep_cs = false; msg->status =0 ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 338/371 rtlwifi: Remove unnecessary NULL check in rtl_regd_init
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 091c6e9c083f7ebaff00b37ad13562d51464d175 ]
When building with Clang + -Wtautological-pointer-compare:
drivers/net/wireless/realtek/rtlwifi/regd.c:389:33: warning: comparison of address of 'rtlpriv->regd' equal to a null pointer is always false [-Wtautological-pointer-compare]
if (wiphy == NULL || &rtlpriv->regd == NULL)
~~~~~~~~~^~~~ ~~~~1 warning generated.
The address of an array member is never NULL unless it is the first struct member so remove the unnecessary check. This was addressed in the staging version of the driver in commit f986978b32b3 ("Staging:
rtlwifi: remove unnecessary NULL check").
While we are here, fix the following checkpatch warning:
CHECK: Comparison to NULL could be written "!wiphy" 35: FILE: drivers/net/wireless/realtek/rtlwifi/regd.c:389:
+ if (wiphy == NULL)
--- drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/regd.c +1 -1
@@ -427,7 +427,7 @@ int rtl_regd_init(struct ieee80211_hw *hw,struct wiphy *wiphy = hw->wiphy;struct country_code_to_enum_rd *country =NULL ; -if (wiphy ==NULL || &rtlpriv->regd ==NULL ) +if (!wiphy)return -EINVAL ;/* init country_code from efuse channel plan */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 339/371 scsi: esas2r: unlock on error in esas2r_nvram_read_direct()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 906ca6353ac09696c1bf0892513c8edffff5e0a6 ]
This error path is missing an unlock.
--- drivers/scsi/esas2r/esas2r_flash.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/esas2r/esas2r_flash.c +1 -0
@@ -1197,6 +1197,7 @@ bool esas2r_nvram_read_direct(struct esas2r_adapter *a)if (!esas2r_read_flash_block (a, a->nvram,FLS_OFFSET_NVR ,sizeof (struct esas2r_sas_nvram ))) {esas2r_hdebug ("NVRAM read failed, using defaults" ); +up (&a->nvram_semaphore);return false; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 340/371 clk: samsung: exynos5420: Preserve CPU clocks configuration during suspend/resume
In reply to Sasha LevinFrom: Marian Mihailescu <[email protected]>
[ Upstream commit e21be0d1d7bd7f78a77613f6bcb6965e72b22fc1 ]
Save and restore top PLL related configuration registers for big (APLL) and LITTLE (KPLL) cores during suspend/resume cycle. So far, CPU clocks were reset to default values after suspend/resume cycle and performance after system resume was affected when performance governor has been selected.
--- drivers/clk/samsung/clk-exynos5420.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/samsung/clk-exynos5420.c +2 -0
@@ -170,6 +170,8 @@ static const unsigned long exynos5x_clk_regs[] __initconst = {GATE_BUS_CPU ,GATE_SCLK_CPU ,CLKOUT_CMU_CPU , +APLL_CON0 , +KPLL_CON0 ,CPLL_CON0 ,DPLL_CON0 , EPLL_CON0,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 341/371 RDMA/mlx5: Return proper error value
In reply to Sasha LevinFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 546d30099ed204792083f043cd7e016de86016a3 ]
Returned value from mlx5_mr_cache_alloc() is checked to be error or real pointer. Return proper error code instead of NULL which is not checked later.
--- drivers/infiniband/hw/mlx5/mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/mr.c +1 -1
@@ -460,7 +460,7 @@ struct mlx5_ib_mr *mlx5_mr_cache_alloc(struct mlx5_ib_dev *dev, int entry)if (entry <0 || entry >=MAX_MR_CACHE_ENTRIES ) {mlx5_ib_err (dev,"cache entry %d is out of range\n" , entry); -return NULL ; +return ERR_PTR (-EINVAL ); } ent = &cache->ent[entry];
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 342/371 scsi: core: scsi_trace: Use get_unaligned_be*()
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit b1335f5b0486f61fb66b123b40f8e7a98e49605d ]
This patch fixes an unintended sign extension on left shifts. From Colin
King: "Shifting a u8 left will cause the value to be promoted to an integer. If the top bit of the u8 is set then the following conversion to an u64 will sign extend the value causing the upper 32 bits to be set in the result."
Fix this by using get_unaligned_be*() instead.
--- drivers/scsi/scsi_trace.c | 113 +++++++++++--------------------------- 1 file changed, 33 insertions(+), 80 deletions(-)
drivers/scsi/scsi_trace.c +33 -80
@@ -21,7 +21,7 @@#include <trace/events/scsi.h> #define SERVICE_ACTION16 (cdb) (cdb[1] & 0x1f) -#define SERVICE_ACTION32 (cdb) ((cdb[8] << 8) | cdb[9]) +#define SERVICE_ACTION32 (cdb) (get_unaligned_be16(&cdb[8]))static const char *scsi_trace_misc (struct trace_seq *,unsigned char *,int );
@@ -51,17 +51,12 @@ static const char * scsi_trace_rw10(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -sector_t lba =0 , txlen =0 ; +u32 lba, txlen; - lba |= (cdb[2 ] <<24 ); - lba |= (cdb[3 ] <<16 ); - lba |= (cdb[4 ] <<8 ); - lba |= cdb[5 ]; - txlen |= (cdb[7 ] <<8 ); - txlen |= cdb[8 ]; + lba =get_unaligned_be32 (&cdb[2 ]); + txlen =get_unaligned_be16 (&cdb[7 ]); -trace_seq_printf (p,"lba=%llu txlen=%llu protect=%u" , - (unsigned long long )lba, (unsigned long long )txlen, +trace_seq_printf (p,"lba=%u txlen=%u protect=%u" , lba, txlen, cdb[1 ] >>5 );if (cdb[0 ] ==WRITE_SAME )
@@ -76,19 +71,12 @@ static const char * scsi_trace_rw12(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -sector_t lba =0 , txlen =0 ; - - lba |= (cdb[2 ] <<24 ); - lba |= (cdb[3 ] <<16 ); - lba |= (cdb[4 ] <<8 ); - lba |= cdb[5 ]; - txlen |= (cdb[6 ] <<24 ); - txlen |= (cdb[7 ] <<16 ); - txlen |= (cdb[8 ] <<8 ); - txlen |= cdb[9 ]; - -trace_seq_printf (p,"lba=%llu txlen=%llu protect=%u" , - (unsigned long long )lba, (unsigned long long )txlen, +u32 lba, txlen; + + lba =get_unaligned_be32 (&cdb[2 ]); + txlen =get_unaligned_be32 (&cdb[6 ]); + +trace_seq_printf (p,"lba=%u txlen=%u protect=%u" , lba, txlen, cdb[1 ] >>5 );trace_seq_putc (p,0 );
@@ -99,23 +87,13 @@ static const char * scsi_trace_rw16(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -sector_t lba =0 , txlen =0 ; - - lba |= ((u64 )cdb[2 ] <<56 ); - lba |= ((u64 )cdb[3 ] <<48 ); - lba |= ((u64 )cdb[4 ] <<40 ); - lba |= ((u64 )cdb[5 ] <<32 ); - lba |= (cdb[6 ] <<24 ); - lba |= (cdb[7 ] <<16 ); - lba |= (cdb[8 ] <<8 ); - lba |= cdb[9 ]; - txlen |= (cdb[10 ] <<24 ); - txlen |= (cdb[11 ] <<16 ); - txlen |= (cdb[12 ] <<8 ); - txlen |= cdb[13 ]; - -trace_seq_printf (p,"lba=%llu txlen=%llu protect=%u" , - (unsigned long long )lba, (unsigned long long )txlen, +u64 lba; +u32 txlen; + + lba =get_unaligned_be64 (&cdb[2 ]); + txlen =get_unaligned_be32 (&cdb[10 ]); + +trace_seq_printf (p,"lba=%llu txlen=%u protect=%u" , lba, txlen, cdb[1 ] >>5 );if (cdb[0 ] ==WRITE_SAME_16 )
@@ -130,8 +108,8 @@ static const char * scsi_trace_rw32(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p), *cmd; -sector_t lba =0 , txlen =0 ; -u32 ei_lbrt =0 ; +u64 lba; +u32 ei_lbrt, txlen;switch (SERVICE_ACTION32 (cdb)) {case READ_32 :
@@ -151,26 +129,12 @@ scsi_trace_rw32(struct trace_seq *p, unsigned char *cdb, int len) goto out; } - lba |= ((u64 )cdb[12 ] <<56 ); - lba |= ((u64 )cdb[13 ] <<48 ); - lba |= ((u64 )cdb[14 ] <<40 ); - lba |= ((u64 )cdb[15 ] <<32 ); - lba |= (cdb[16 ] <<24 ); - lba |= (cdb[17 ] <<16 ); - lba |= (cdb[18 ] <<8 ); - lba |= cdb[19 ]; - ei_lbrt |= (cdb[20 ] <<24 ); - ei_lbrt |= (cdb[21 ] <<16 ); - ei_lbrt |= (cdb[22 ] <<8 ); - ei_lbrt |= cdb[23 ]; - txlen |= (cdb[28 ] <<24 ); - txlen |= (cdb[29 ] <<16 ); - txlen |= (cdb[30 ] <<8 ); - txlen |= cdb[31 ]; - -trace_seq_printf (p,"%s_32 lba=%llu txlen=%llu protect=%u ei_lbrt=%u" , - cmd, (unsigned long long )lba, - (unsigned long long )txlen, cdb[10 ] >>5 , ei_lbrt); + lba =get_unaligned_be64 (&cdb[12 ]); + ei_lbrt =get_unaligned_be32 (&cdb[20 ]); + txlen =get_unaligned_be32 (&cdb[28 ]); + +trace_seq_printf (p,"%s_32 lba=%llu txlen=%u protect=%u ei_lbrt=%u" , + cmd, lba, txlen, cdb[10 ] >>5 , ei_lbrt);if (SERVICE_ACTION32 (cdb) ==WRITE_SAME_32 )trace_seq_printf (p," unmap=%u" , cdb[10 ] >>3 &1 );
@@ -185,7 +149,7 @@ static const char * scsi_trace_unmap(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -unsigned int regions = cdb[7 ] <<8 | cdb[8 ]; +unsigned int regions =get_unaligned_be16 (&cdb[7 ]);trace_seq_printf (p,"regions=%u" , (regions -8 ) /16 );trace_seq_putc (p,0 );
@@ -197,8 +161,8 @@ static const char * scsi_trace_service_action_in(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p), *cmd; -sector_t lba =0 ; -u32 alloc_len =0 ; +u64 lba; +u32 alloc_len;switch (SERVICE_ACTION16 (cdb)) {case SAI_READ_CAPACITY_16 :
@@ -212,21 +176,10 @@ scsi_trace_service_action_in(struct trace_seq *p, unsigned char *cdb, int len) goto out; } - lba |= ((u64 )cdb[2 ] <<56 ); - lba |= ((u64 )cdb[3 ] <<48 ); - lba |= ((u64 )cdb[4 ] <<40 ); - lba |= ((u64 )cdb[5 ] <<32 ); - lba |= (cdb[6 ] <<24 ); - lba |= (cdb[7 ] <<16 ); - lba |= (cdb[8 ] <<8 ); - lba |= cdb[9 ]; - alloc_len |= (cdb[10 ] <<24 ); - alloc_len |= (cdb[11 ] <<16 ); - alloc_len |= (cdb[12 ] <<8 ); - alloc_len |= cdb[13 ]; - -trace_seq_printf (p,"%s lba=%llu alloc_len=%u" , cmd, - (unsigned long long )lba, alloc_len); + lba =get_unaligned_be64 (&cdb[2 ]); + alloc_len =get_unaligned_be32 (&cdb[10 ]); + +trace_seq_printf (p,"%s lba=%llu alloc_len=%u" , cmd, lba, alloc_len); out:trace_seq_putc (p,0 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 343/371 MIPS: Loongson: Fix return value of loongson_hwmon_init
In reply to Sasha LevinFrom: Tiezhu Yang <[email protected]>
[ Upstream commit dece3c2a320b0a6d891da6ff774ab763969b6860 ]
When call function hwmon_device_register failed, use the actual return value instead of always -ENOMEM.
--- drivers/platform/mips/cpu_hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/mips/cpu_hwmon.c +1 -1
@@ -158,7 +158,7 @@ static int __init loongson_hwmon_init(void) cpu_hwmon_dev =hwmon_device_register (NULL );if (IS_ERR (cpu_hwmon_dev)) { - ret = -ENOMEM ; + ret =PTR_ERR (cpu_hwmon_dev);pr_err ("hwmon_device_register fail!\n" ); goto fail_hwmon_device_register; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 344/371 media: exynos4-is: Fix recursive locking in isp_video_release()
In reply to Sasha LevinFrom: Seung-Woo Kim <[email protected]>
[ Upstream commit 704c6c80fb471d1bb0ef0d61a94617d1d55743cd ]
Quoted 1 line
From
isp_video_release(),&isp->video_lockis held and subsequent
vb2_fop_release() tries to lock vdev->lock which is same with the previous one. Replace vb2_fop_release() with _vb2_fop_release() to fix the recursive locking.
--- drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/exynos4-is/fimc-isp-video.c +1 -1
@@ -316,7 +316,7 @@ static int isp_video_release(struct file *file) ivc->streaming =0 ; } -vb2_fop_release (file); +_vb2_fop_release (file,NULL );if (v4l2_fh_is_singular_file (file)) {fimc_pipeline_call (&ivc->ve, close);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 345/371 hv_netvsc: flag software created hash value
In reply to Sasha LevinFrom: Stephen Hemminger <[email protected]>
[ Upstream commit df9f540ca74297a84bafacfa197e9347b20beea5 ]
When the driver needs to create a hash value because it was not done at higher level, then the hash should be marked as a software not hardware hash.
--- drivers/net/hyperv/netvsc_drv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/hyperv/netvsc_drv.c +3 -4
@@ -282,9 +282,9 @@ static inline u32 netvsc_get_hash(else if (flow.basic.n_proto ==htons (ETH_P_IPV6 )) hash =jhash2 ((u32 *)&flow.addrs.v6addrs,8 , hashrnd);else - hash =0 ; +return 0 ; -skb_set_hash (skb, hash,PKT_HASH_TYPE_L3 ); +__skb_set_sw_hash (skb, hash, false); }return hash;
@@ -802,8 +802,7 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net, skb->protocol == htons(ETH_P_IP))netvsc_comp_ipcsum (skb); -/* Do L4 checksum offload if enabled and present. -*/ +/* Do L4 checksum offload if enabled and present. */ if (csum_info && (net->features &NETIF_F_RXCSUM )) {if (csum_info->receive.tcp_checksum_succeeded || csum_info->receive.udp_checksum_succeeded)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 346/371 net: neigh: use long type to store jiffies delta
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9d027e3a83f39b819e908e4e09084277a2e45e95 ]
A difference of two unsigned long needs long storage.
--- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/neighbour.c +2 -2
@@ -1877,8 +1877,8 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl, goto nla_put_failure; {unsigned long now = jiffies; -unsigned int flush_delta = now - tbl->last_flush; -unsigned int rand_delta = now - tbl->last_rand; +long flush_delta = now - tbl->last_flush; +long rand_delta = now - tbl->last_rand;struct neigh_hash_table *nht;struct ndt_config ndc = { .ndtc_key_len = tbl->key_len,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 347/371 regulator: ab8500: Remove SYSCLKREQ from enum ab8505_regulator_id
In reply to Sasha LevinFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 458ea3ad033fc86e291712ce50cbe60c3428cf30 ]
Those regulators are not actually supported by the AB8500 regulator driver. There is no ab8500_regulator_info for them and no entry in ab8505_regulator_match.
As such, they cannot be registered successfully, and looking them up in ab8505_regulator_match causes an out-of-bounds array read.
--- include/linux/regulator/ab8500.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/regulator/ab8500.h +0 -2
@@ -43,8 +43,6 @@ enum ab8505_regulator_id {AB8505_LDO_ANAMIC2 ,AB8505_LDO_AUX8 ,AB8505_LDO_ANA , -AB8505_SYSCLKREQ_2 , -AB8505_SYSCLKREQ_4 , AB8505_NUM_REGULATORS, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 348/371 f2fs: fix potential overflow
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit a9af3fdcc4258af406879eca63d82e9d6baa892e ]
In build_sit_entries(), if valid_blocks in SIT block is smaller than valid_blocks in journal, for below calculation:
sbi->discard_blks += old_valid_blocks - se->valid_blocks;
There will be two times potential overflow:
- old_valid_blocks - se->valid_blocks will overflow, and be a very large number.
- sbi->discard_blks += result will overflow again, comes out a correct result accidently.
Anyway, it should be fixed.
--- fs/f2fs/data.c | 2 +- fs/f2fs/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/f2fs/data.c +1 -1
@@ -1512,7 +1512,7 @@ static int __write_data_page(struct page *page, bool *submitted,loff_t i_size =i_size_read (inode);const pgoff_t end_index = ((unsigned long long ) i_size) >>PAGE_SHIFT ; -loff_t psize = (page->index +1 ) <<PAGE_SHIFT ; +loff_t psize = (loff_t)(page->index +1 ) <<PAGE_SHIFT ;unsigned offset =0 ;bool need_balance_fs = false;int err =0 ;
fs/f2fs/file.c +1 -1
@@ -1059,7 +1059,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, } dn.ofs_in_node++; i++; - new_size = (dst + i) <<PAGE_SHIFT ; + new_size = (loff_t)(dst + i) <<PAGE_SHIFT ;if (dst_inode->i_size < new_size)f2fs_i_size_write (dst_inode, new_size); }while (--ilen && (do_replace[i] || blkaddr[i] ==NULL_ADDR ));
Signature · 8 lines
2.20.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 349/371 packet: fix data-race in fanout_flow_is_huge()
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit b756ad928d98e5ef0b74af7546a6a31a8dadde00 ]
KCSAN reported the following data-race [1]
Adding a couple of READ_ONCE()/WRITE_ONCE() should silence it.
Since the report hinted about multiple cpus using the history concurrently, I added a test avoiding writing on it if the victim slot already contains the desired value.
[1]
BUG: KCSAN: data-race in fanout_demux_rollover / fanout_demux_rollover
read to 0xffff8880b01786cc of 4 bytes by task 18921 on cpu 1:
fanout_flow_is_huge net/packet/af_packet.c:1303 [inline] fanout_demux_rollover+0x33e/0x3f0 net/packet/af_packet.c:1353 packet_rcv_fanout+0x34e/0x490 net/packet/af_packet.c:1453 deliver_skb net/core/dev.c:1888 [inline] dev_queue_xmit_nit+0x15b/0x540 net/core/dev.c:1958 xmit_one net/core/dev.c:3195 [inline] dev_hard_start_xmit+0x3f5/0x430 net/core/dev.c:3215 __dev_queue_xmit+0x14ab/0x1b40 net/core/dev.c:3792 dev_queue_xmit+0x21/0x30 net/core/dev.c:3825 neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530 neigh_output include/net/neighbour.h:511 [inline] ip6_finish_output2+0x7a2/0xec0 net/ipv6/ip6_output.c:116 __ip6_finish_output net/ipv6/ip6_output.c:142 [inline] __ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127 ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152 NF_HOOK_COND include/linux/netfilter.h:294 [inline] ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175 dst_output include/net/dst.h:436 [inline] ip6_local_out+0x74/0x90 net/ipv6/output_core.c:179 ip6_send_skb+0x53/0x110 net/ipv6/ip6_output.c:1795 udp_v6_send_skb.isra.0+0x3ec/0xa70 net/ipv6/udp.c:1173 udpv6_sendmsg+0x1906/0x1c20 net/ipv6/udp.c:1471 inet6_sendmsg+0x6d/0x90 net/ipv6/af_inet6.c:576 sock_sendmsg_nosec net/socket.c:637 [inline] sock_sendmsg+0x9f/0xc0 net/socket.c:657 ___sys_sendmsg+0x2b7/0x5d0 net/socket.c:2311 __sys_sendmmsg+0x123/0x350 net/socket.c:2413 __do_sys_sendmmsg net/socket.c:2442 [inline] __se_sys_sendmmsg net/socket.c:2439 [inline] __x64_sys_sendmmsg+0x64/0x80 net/socket.c:2439 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
write to 0xffff8880b01786cc of 4 bytes by task 18922 on cpu 0:
fanout_flow_is_huge net/packet/af_packet.c:1306 [inline] fanout_demux_rollover+0x3a4/0x3f0 net/packet/af_packet.c:1353 packet_rcv_fanout+0x34e/0x490 net/packet/af_packet.c:1453 deliver_skb net/core/dev.c:1888 [inline] dev_queue_xmit_nit+0x15b/0x540 net/core/dev.c:1958 xmit_one net/core/dev.c:3195 [inline] dev_hard_start_xmit+0x3f5/0x430 net/core/dev.c:3215 __dev_queue_xmit+0x14ab/0x1b40 net/core/dev.c:3792 dev_queue_xmit+0x21/0x30 net/core/dev.c:3825 neigh_direct_output+0x1f/0x30 net/core/neighbour.c:1530 neigh_output include/net/neighbour.h:511 [inline] ip6_finish_output2+0x7a2/0xec0 net/ipv6/ip6_output.c:116 __ip6_finish_output net/ipv6/ip6_output.c:142 [inline] __ip6_finish_output+0x2d7/0x330 net/ipv6/ip6_output.c:127 ip6_finish_output+0x41/0x160 net/ipv6/ip6_output.c:152 NF_HOOK_COND include/linux/netfilter.h:294 [inline] ip6_output+0xf2/0x280 net/ipv6/ip6_output.c:175 dst_output include/net/dst.h:436 [inline] ip6_local_out+0x74/0x90 net/ipv6/output_core.c:179 ip6_send_skb+0x53/0x110 net/ipv6/ip6_output.c:1795 udp_v6_send_skb.isra.0+0x3ec/0xa70 net/ipv6/udp.c:1173 udpv6_sendmsg+0x1906/0x1c20 net/ipv6/udp.c:1471 inet6_sendmsg+0x6d/0x90 net/ipv6/af_inet6.c:576 sock_sendmsg_nosec net/socket.c:637 [inline] sock_sendmsg+0x9f/0xc0 net/socket.c:657 ___sys_sendmsg+0x2b7/0x5d0 net/socket.c:2311 __sys_sendmmsg+0x123/0x350 net/socket.c:2413 __do_sys_sendmmsg net/socket.c:2442 [inline] __se_sys_sendmmsg net/socket.c:2439 [inline] __x64_sys_sendmmsg+0x64/0x80 net/socket.c:2439 do_syscall_64+0xcc/0x370 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 18922 Comm: syz-executor.3 Not tainted 5.4.0-rc6+ #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- net/packet/af_packet.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/packet/af_packet.c +9 -3
@@ -1337,15 +1337,21 @@ static void packet_sock_destruct(struct sock *sk)static bool fanout_flow_is_huge (struct packet_sock *po,struct sk_buff *skb) { -u32 rxhash; +u32 *history = po->rollover->history; +u32 victim, rxhash;int i, count =0 ; rxhash =skb_get_hash (skb);for (i =0 ; i <ROLLOVER_HLEN ; i++) -if (po->rollover->history[i] == rxhash) +if (READ_ONCE (history[i]) == rxhash) count++; - po->rollover->history[prandom_u32 () %ROLLOVER_HLEN ] = rxhash; + victim =prandom_u32 () %ROLLOVER_HLEN ; + +/* Avoid dirtying the cache line if possible */ +if (READ_ONCE (history[victim]) != rxhash) +WRITE_ONCE (history[victim], rxhash); +return count > (ROLLOVER_HLEN >>1 ); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 350/371 mfd: intel-lpss: Add default I2C device properties for Gemini Lake
In reply to Sasha LevinFrom: Jarkko Nikula <[email protected]>
[ Upstream commit 3f31bc67e4dc6a555341dffefe328ddd58e8b431 ]
It turned out Intel Gemini Lake doesn't use the same I2C timing parameters as Broxton.
I got confirmation from the Windows team that Gemini Lake systems should use updated timing parameters that differ from those used in Broxton based systems.
--- drivers/mfd/intel-lpss-pci.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/mfd/intel-lpss-pci.c +20 -8
@@ -126,6 +126,18 @@ static const struct intel_lpss_platform_info apl_i2c_info = { .properties = apl_i2c_properties, }; +static struct property_entry glk_i2c_properties[] = { +PROPERTY_ENTRY_U32 ("i2c-sda-hold-time-ns" ,313 ), +PROPERTY_ENTRY_U32 ("i2c-sda-falling-time-ns" ,171 ), +PROPERTY_ENTRY_U32 ("i2c-scl-falling-time-ns" ,290 ), + { }, +}; + +static const struct intel_lpss_platform_info glk_i2c_info = { + .clk_rate =133000000 , + .properties = glk_i2c_properties, +}; +static const struct intel_lpss_platform_info cnl_i2c_info = { .clk_rate =216000000 , .properties = spt_i2c_properties,
@@ -165,14 +177,14 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x1ac6), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1aee), (kernel_ulong_t)&bxt_uart_info },/* GLK */ - { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b0), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b2), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b4), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b6), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31b8), (kernel_ulong_t)&bxt_i2c_info }, - { PCI_VDEVICE(INTEL, 0x31ba), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b0), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b2), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b4), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b6), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31b8), (kernel_ulong_t)&glk_i2c_info }, + { PCI_VDEVICE(INTEL, 0x31ba), (kernel_ulong_t)&glk_i2c_info }, { PCI_VDEVICE(INTEL, 0x31bc), (kernel_ulong_t)&bxt_uart_info }, { PCI_VDEVICE(INTEL, 0x31be), (kernel_ulong_t)&bxt_uart_info }, { PCI_VDEVICE(INTEL, 0x31c0), (kernel_ulong_t)&bxt_uart_info },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 351/371 tty: serial: imx: use the sg count from dma_map_sg
In reply to Sasha LevinFrom: Peng Fan <[email protected]>
[ Upstream commit 596fd8dffb745afcebc0ec6968e17fe29f02044c ]
The dmaengine_prep_slave_sg needs to use sg count returned by dma_map_sg, not use sport->dma_tx_nents, because the return value of dma_map_sg is not always same with "nents".
--- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/imx.c +1 -1
@@ -542,7 +542,7 @@ static void imx_dma_tx(struct imx_port *sport)dev_err (dev,"DMA mapping error for TX.\n" );return ; } - desc =dmaengine_prep_slave_sg (chan, sgl, sport->dma_tx_nents, + desc =dmaengine_prep_slave_sg (chan, sgl, ret,DMA_MEM_TO_DEV ,DMA_PREP_INTERRUPT );if (!desc) { dma_unmap_sg(dev, sgl, sport->dma_tx_nents,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 352/371 tty: serial: pch_uart: correct usage of dma_unmap_sg
In reply to Sasha LevinFrom: Peng Fan <[email protected]>
[ Upstream commit 74887542fdcc92ad06a48c0cca17cdf09fc8aa00 ]
Per Documentation/DMA-API-HOWTO.txt,
To unmap a scatterlist, just call:
dma_unmap_sg(dev, sglist, nents, direction);
.. note::
The 'nents' argument to the dma_unmap_sg call must be the _same_ one you passed into the dma_map_sg call, it should _NOT_ be the 'count' value _returned_ from the dma_map_sg call.
However in the driver, priv->nent is directly assigned with value returned from dma_map_sg, and dma_unmap_sg use priv->nent for unmap, this breaks the API usage.
So introduce a new entry orig_nent to remember 'nents'.
--- drivers/tty/serial/pch_uart.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/tty/serial/pch_uart.c +4 -1
@@ -247,6 +247,7 @@ struct eg20t_port {struct dma_chan *chan_rx;struct scatterlist *sg_tx_p;int nent; +int orig_nent;struct scatterlist sg_rx;int tx_dma_use;void *rx_buf_virt;
@@ -801,9 +802,10 @@ static void pch_dma_tx_complete(void *arg) } xmit->tail &=UART_XMIT_SIZE -1 ;async_tx_ack (priv->desc_tx); -dma_unmap_sg (port->dev, sg, priv->nent,DMA_TO_DEVICE ); +dma_unmap_sg (port->dev, sg, priv->orig_nent,DMA_TO_DEVICE ); priv->tx_dma_use =0 ; priv->nent =0 ; + priv->orig_nent =0 ;kfree (priv->sg_tx_p);pch_uart_hal_enable_interrupt (priv,PCH_UART_HAL_TX_INT ); }
@@ -1027,6 +1029,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)dev_err (priv->port.dev,"%s:dma_map_sg Failed\n" , __func__);return 0 ; } + priv->orig_nent = num; priv->nent = nent;for (i =0 ; i < nent; i++, sg++) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 353/371 mmc: sdio: fix wl1251 vendor id
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit e5db673e7fe2f971ec82039a28dc0811c2100e87 ]
v4.11-rc1 did introduce a patch series that rearranged the sdio quirks into a header file. Unfortunately this did forget to handle SDIO_VENDOR_ID_TI differently between wl1251 and wl1271 with the result that although the wl1251 was found on the sdio bus, the firmware did not load any more and there was no interface registration.
This patch defines separate constants to be used by sdio quirks and drivers.
--- include/linux/mmc/sdio_ids.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/mmc/sdio_ids.h +2 -0
@@ -67,6 +67,8 @@#define SDIO_VENDOR_ID_TI 0x0097#define SDIO_DEVICE_ID_TI_WL1271 0x4076 +#define SDIO_VENDOR_ID_TI_WL1251 0x104c +#define SDIO_DEVICE_ID_TI_WL1251 0x9066#define SDIO_VENDOR_ID_STE 0x0020#define SDIO_DEVICE_ID_STE_CW1200 0x2280
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 354/371 mmc: core: fix wl1251 sdio quirks
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit 16568b4a4f0c34bd35cfadac63303c7af7812764 ]
wl1251 and wl1271 have different vendor id and device id. So we need to handle both with sdio quirks.
--- drivers/mmc/core/quirks.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/core/quirks.h +7 -0
@@ -119,7 +119,14 @@ static const struct mmc_fixup mmc_ext_csd_fixups[] = {END_FIXUP }; +static const struct mmc_fixup sdio_fixup_methods[] = { +SDIO_FIXUP (SDIO_VENDOR_ID_TI_WL1251 ,SDIO_DEVICE_ID_TI_WL1251 , + add_quirk,MMC_QUIRK_NONSTD_FUNC_IF ), + +SDIO_FIXUP (SDIO_VENDOR_ID_TI_WL1251 ,SDIO_DEVICE_ID_TI_WL1251 , + add_quirk,MMC_QUIRK_DISABLE_CD ), +SDIO_FIXUP (SDIO_VENDOR_ID_TI ,SDIO_DEVICE_ID_TI_WL1271 , add_quirk,MMC_QUIRK_NONSTD_FUNC_IF ),
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 355/371 affs: fix a memory leak in affs_remount
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 450c3d4166837c496ebce03650c08800991f2150 ]
In affs_remount if data is provided it is duplicated into new_opts. The allocated memory for new_opts is only released if parse_options fails.
There's a bit of history behind new_options, originally there was save/replace options on the VFS layer so the 'data' passed must not change (thus strdup), this got cleaned up in later patches. But not completely.
There's no reason to do the strdup in cases where the filesystem does not need to reuse the 'data' again, because strsep would modify it directly.
--- fs/affs/super.c | 6 ------ 1 file changed, 6 deletions(-)
fs/affs/super.c +0 -6
@@ -559,14 +559,9 @@ affs_remount(struct super_block *sb, int *flags, char *data)int root_block;unsigned long mount_flags;int res =0 ; -char *new_opts;char volume[32 ];char *prefix =NULL ; - new_opts =kstrdup (data,GFP_KERNEL ); -if (data && !new_opts) -return -ENOMEM ; -pr_debug ("%s(flags=0x%x,opts=\"%s\")\n" , __func__, *flags, data);sync_filesystem (sb);
@@ -577,7 +572,6 @@ affs_remount(struct super_block *sb, int *flags, char *data) &blocksize, &prefix, volume, &mount_flags)) {kfree (prefix); -kfree (new_opts);return -EINVAL ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 356/371 rtc: msm6242: Fix reading of 10-hour digit
In reply to Sasha LevinFrom: Kars de Jong <[email protected]>
[ Upstream commit e34494c8df0cd96fc432efae121db3212c46ae48 ]
The driver was reading the wrong register as the 10-hour digit due to a misplaced ')'. It was in fact reading the 1-second digit register due to this bug.
Also remove the use of a magic number for the hour mask and use the define for it which was already present.
--- drivers/rtc/rtc-msm6242.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/rtc/rtc-msm6242.c +2 -1
@@ -132,7 +132,8 @@ static int msm6242_read_time(struct device *dev, struct rtc_time *tm)msm6242_read (priv,MSM6242_SECOND1 ); tm->tm_min =msm6242_read (priv,MSM6242_MINUTE10 ) *10 +msm6242_read (priv,MSM6242_MINUTE1 ); - tm->tm_hour = (msm6242_read (priv,MSM6242_HOUR10 &3 )) *10 + + tm->tm_hour = (msm6242_read (priv,MSM6242_HOUR10 ) & +MSM6242_HOUR10_HR_MASK ) *10 +msm6242_read (priv,MSM6242_HOUR1 ); tm->tm_mday =msm6242_read (priv,MSM6242_DAY10 ) *10 +msm6242_read (priv,MSM6242_DAY1 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 357/371 scsi: qla4xxx: fix double free bug
In reply to Sasha LevinFrom: Pan Bian <[email protected]>
[ Upstream commit 3fe3d2428b62822b7b030577cd612790bdd8c941 ]
The variable init_fw_cb is released twice, resulting in a double free bug. The call to the function dma_free_coherent() before goto is removed to get rid of potential double free.
--- drivers/scsi/qla4xxx/ql4_mbx.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/qla4xxx/ql4_mbx.c +0 -3
@@ -641,9 +641,6 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)if (qla4xxx_get_ifcb (ha, &mbox_cmd[0 ], &mbox_sts[0 ], init_fw_cb_dma) !=QLA_SUCCESS ) { -dma_free_coherent (&ha->pdev->dev, -sizeof (struct addr_ctrl_blk ), - init_fw_cb, init_fw_cb_dma); goto exit_init_fw_cb; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 358/371 scsi: bnx2i: fix potential use after free
In reply to Sasha LevinFrom: Pan Bian <[email protected]>
[ Upstream commit 29d28f2b8d3736ac61c28ef7e20fda63795b74d9 ]
The member hba->pcidev may be used after its reference is dropped. Move the put function to where it is never used to avoid potential use after free issues.
--- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -1
@@ -915,12 +915,12 @@ void bnx2i_free_hba(struct bnx2i_hba *hba)INIT_LIST_HEAD (&hba->ep_ofld_list);INIT_LIST_HEAD (&hba->ep_active_list);INIT_LIST_HEAD (&hba->ep_destroy_list); -pci_dev_put (hba->pcidev);if (hba->regview) {pci_iounmap (hba->pcidev, hba->regview); hba->regview =NULL ; } +pci_dev_put (hba->pcidev);bnx2i_free_mp_bdt (hba);bnx2i_release_free_cid_que (hba);iscsi_host_free (shost);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 359/371 scsi: target: core: Fix a pr_debug() argument
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit c941e0d172605731de9b4628bd4146d35cf2e7d6 ]
Print the string for which conversion failed instead of printing the function name twice.
--- drivers/target/target_core_fabric_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_fabric_lib.c +1 -1
@@ -131,7 +131,7 @@ static int srp_get_pr_transport_id(memset (buf +8 ,0 , leading_zero_bytes); rc =hex2bin (buf +8 + leading_zero_bytes, p, count);if (rc <0 ) { -pr_debug ("hex2bin failed for %s: %d\n" , __func__, rc); +pr_debug ("hex2bin failed for %s: %d\n" , p, rc);return rc; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 360/371 powerpc/powernv: Disable native PCIe port management
In reply to Sasha LevinFrom: Oliver O'Halloran <[email protected]>
[ Upstream commit 9d72dcef891030545f39ad386a30cf91df517fb2 ]
On PowerNV the PCIe topology is (currently) managed by the powernv platform code in Linux in cooperation with the platform firmware. Linux's native PCIe port service drivers operate independently of both and this can cause problems.
The main issue is that the portbus driver will conflict with the platform specific hotplug driver (pnv_php) over ownership of the MSI used to notify the host when a hotplug event occurs. The portbus driver claims this MSI on behalf of the individual port services because the same interrupt is used for hotplug events, PMEs (on root ports), and link bandwidth change notifications. The portbus driver will always claim the interrupt even if the individual port service drivers, such as pciehp, are compiled out.
The second, bigger, problem is that the hotplug port service driver fundamentally does not work on PowerNV. The platform assumes that all PCI devices have a corresponding arch-specific handle derived from the DT node for the device (pci_dn) and without one the platform will not allow a PCI device to be enabled. This problem is largely due to historical baggage, but it can't be resolved without significant re-factoring of the platform PCI support.
We can fix these problems in the interim by setting the "pcie_ports_disabled" flag during platform initialisation. The flag indicates the platform owns the PCIe ports which stops the portbus driver from being registered.
This does have the side effect of disabling all port services drivers that is: AER, PME, BW notifications, hotplug, and DPC. However, this is not a huge disadvantage on PowerNV since these services are either unused or handled through other means.
--- arch/powerpc/platforms/powernv/pci.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
arch/powerpc/platforms/powernv/pci.c +17 -0
@@ -1118,6 +1118,23 @@ void __init pnv_pci_init(void)if (!firmware_has_feature (FW_FEATURE_OPAL ))return ; +#ifdef CONFIG_PCIEPORTBUS +/* +* On PowerNV PCIe devices are (currently) managed in cooperation +* with firmware. This isn't *strictly* required, but there's enough +* assumptions baked into both firmware and the platform code that +* it's unwise to allow the portbus services to be used. +* +* We need to fix this eventually, but for now set this flag to disable +* the portbus driver. The AER service isn't required since that AER +* events are handled via EEH. The pciehp hotplug driver can't work +* without kernel changes (and portbus binding breaks pnv_php). The +* other services also require some thinking about how we're going +* to integrate them. +*/ + pcie_ports_disabled = true; +#endif +/* Look for IODA IO-Hubs. */ for_each_compatible_node (np,NULL ,"ibm,ioda-hub" ) {pnv_pci_init_ioda_hub (np);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 361/371 dmaengine: ti: edma: fix missed failure handling
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 340049d453682a9fe8d91fe794dd091730f4bb25 ]
When devm_kcalloc fails, it forgets to call edma_free_slot. Replace direct return with failure handler to fix it.
--- drivers/dma/edma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/dma/edma.c +4 -2
@@ -2340,8 +2340,10 @@ static int edma_probe(struct platform_device *pdev) ecc->tc_list =devm_kcalloc (dev, ecc->num_tc,sizeof (*ecc->tc_list),GFP_KERNEL ); -if (!ecc->tc_list) -return -ENOMEM ; +if (!ecc->tc_list) { + ret = -ENOMEM ; + goto err_reg1; + }for (i =0 ;; i++) { ret = of_parse_phandle_with_fixed_args(node, "ti,tptcs",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 362/371 crypto: sun4i-ss - fix big endian issues
In reply to Sasha LevinFrom: Corentin Labbe <[email protected]>
[ Upstream commit d1d787bcebfe122a5bd443ae565696661e2e9656 ]
When testing BigEndian kernel, the sun4i-ss was failling all crypto tests.
This patch fix endian issues with it.
--- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/crypto/sunxi-ss/sun4i-ss-hash.c +11 -10
@@ -179,7 +179,7 @@ static int sun4i_hash(struct ahash_request *areq)*/ unsigned int i =0 , end, fill, min_fill, nwait, nbw =0 , j =0 , todo;unsigned int in_i =0 ; -u32 spaces, rx_cnt =SS_RX_DEFAULT , bf[32 ] = {0 }, wb =0 , v, ivmode =0 ; +u32 spaces, rx_cnt =SS_RX_DEFAULT , bf[32 ] = {0 }, v, ivmode =0 ;struct sun4i_req_ctx *op =ahash_request_ctx (areq);struct crypto_ahash *tfm =crypto_ahash_reqtfm (areq);struct sun4i_tfm_ctx *tfmctx =crypto_ahash_ctx (tfm);
@@ -188,6 +188,7 @@ static int sun4i_hash(struct ahash_request *areq)struct sg_mapping_iter mi;int in_r, err =0 ;size_t copied =0 ; +__le32 wb =0 ; dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x", __func__, crypto_tfm_alg_name(areq->base.tfm),
@@ -399,7 +400,7 @@ static int sun4i_hash(struct ahash_request *areq) nbw = op->len -4 * nwait;if (nbw) { - wb = *(u32 *)(op->buf + nwait *4 ); + wb =cpu_to_le32 (*(u32 *)(op->buf + nwait *4 )); wb &=GENMASK ((nbw *8 ) -1 ,0 ); op->byte_count += nbw;
@@ -408,7 +409,7 @@ static int sun4i_hash(struct ahash_request *areq)/* write the remaining bytes of the nbw buffer */ wb |= ((1 <<7 ) << (nbw *8 )); - bf[j++] = wb; + bf[j++] =le32_to_cpu (wb);/* * number of space to pad to obtain 64o minus 8(size) minus 4 (final 1)
@@ -427,13 +428,13 @@ static int sun4i_hash(struct ahash_request *areq)/* write the length of data */ if (op->mode ==SS_OP_SHA1 ) { -__be64 bits =cpu_to_be64 (op->byte_count <<3 ); - bf[j++] =lower_32_bits (bits); - bf[j++] =upper_32_bits (bits); +__be64 *bits = (__be64 *)&bf[j]; + *bits =cpu_to_be64 (op->byte_count <<3 ); + j +=2 ; }else { -__le64 bits = op->byte_count <<3 ; - bf[j++] =lower_32_bits (bits); - bf[j++] =upper_32_bits (bits); +__le64 *bits = (__le64 *)&bf[j]; + *bits =cpu_to_le64 (op->byte_count <<3 ); + j +=2 ; }writesl (ss->base +SS_RXFIFO , bf, j);
@@ -475,7 +476,7 @@ static int sun4i_hash(struct ahash_request *areq) } }else {for (i =0 ; i <4 ; i++) { - v =readl (ss->base +SS_MD0 + i *4 ); + v =cpu_to_le32 (readl (ss->base +SS_MD0 + i *4 ));memcpy (areq->result + i *4 , &v,4 ); } }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 363/371 drm/radeon: fix bad DMA from INTERRUPT_CNTL2
In reply to Sasha LevinFrom: Sam Bobroff <[email protected]>
[ Upstream commit 62d91dd2851e8ae2ca552f1b090a3575a4edf759 ]
The INTERRUPT_CNTL2 register expects a valid DMA address, but is currently set with a GPU MC address. This can cause problems on systems that detect the resulting DMA read from an invalid address (found on a Power8 guest).
Instead, use the DMA address of the dummy page because it will always be safe.
--- drivers/gpu/drm/radeon/cik.c | 4 ++-- drivers/gpu/drm/radeon/r600.c | 4 ++-- drivers/gpu/drm/radeon/si.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/cik.c +2 -2
@@ -7012,8 +7012,8 @@ static int cik_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* XXX this should actually be a bus address, not an MC address. same on older asics */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
drivers/gpu/drm/radeon/r600.c +2 -2
@@ -3690,8 +3690,8 @@ int r600_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* set dummy read address to ring address */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
drivers/gpu/drm/radeon/si.c +2 -2
@@ -5993,8 +5993,8 @@ static int si_irq_init(struct radeon_device *rdev) }/* setup interrupt control */ -/* set dummy read address to ring address */ -WREG32 (INTERRUPT_CNTL2 , rdev->ih.gpu_addr >>8 ); +/* set dummy read address to dummy page address */ +WREG32 (INTERRUPT_CNTL2 , rdev->dummy_page.addr >>8 ); interrupt_cntl =RREG32 (INTERRUPT_CNTL );/* IH_DUMMY_RD_OVERRIDE=0 - dummy read disabled with msi, enabled without msi * IH_DUMMY_RD_OVERRIDE=1 - dummy read controlled by IH_DUMMY_RD_EN
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 364/371 arm64: dts: juno: Fix UART frequency
In reply to Sasha LevinFrom: Andre Przywara <[email protected]>
[ Upstream commit 39a1a8941b27c37f79508426e27a2ec29829d66c ]
Older versions of the Juno *SoC* TRM [1] recommended that the UART clock source should be 7.2738 MHz, whereas the *system* TRM [2] stated a more correct value of 7.3728 MHz. Somehow the wrong value managed to end up in our DT.
Doing a prime factorisation, a modulo divide by 115200 and trying to buy a 7.2738 MHz crystal at your favourite electronics dealer suggest that the old value was actually a typo. The actual UART clock is driven by a PLL, configured via a parameter in some board.txt file in the firmware, which reads 7.37 MHz (sic!).
Fix this to correct the baud rate divisor calculation on the Juno board.
[1] http://infocenter.arm.com/help/topic/com.arm.doc.ddi0515b.b/DDI0515B_b_juno_arm_development_platform_soc_trm.pdf
[2] http://infocenter.arm.com/help/topic/com.arm.doc.100113_0000_07_en/arm_versatile_express_juno_development_platform_(v2m_juno)_technical_reference_manual_100113_0000_07_en.pdf
--- arch/arm64/boot/dts/arm/juno-clocks.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/arm/juno-clocks.dtsi +2 -2
@@ -8,10 +8,10 @@ */ / { /* SoC fixed clocks */ - soc_uartclk: refclk7273800hz { + soc_uartclk: refclk7372800hz { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <7273800>; + clock-frequency = <7372800>; clock-output-names = "juno:uartclk"; };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 365/371 scsi: qla2xxx: fix rports not being mark as lost in sync fabric scan
In reply to Sasha LevinFrom: Martin Wilck <[email protected]>
[ Upstream commit d341e9a8f2cffe4000c610225c629f62c7489c74 ]
In qla2x00_find_all_fabric_devs(), fcport->flags & FCF_LOGIN_NEEDED is a necessary condition for logging into new rports, but not for dropping lost ones.
--- drivers/scsi/qla2xxx/qla_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +3 -3
@@ -5145,8 +5145,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)if (test_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags))break ; -if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 || - (fcport->flags &FCF_LOGIN_NEEDED ) ==0 ) +if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 )continue ;if (fcport->scan_state ==QLA_FCPORT_SCAN ) {
@@ -5171,7 +5170,8 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha) } } -if (fcport->scan_state ==QLA_FCPORT_FOUND ) +if (fcport->scan_state ==QLA_FCPORT_FOUND && + (fcport->flags &FCF_LOGIN_NEEDED ) !=0 )qla24xx_fcport_handle_login (vha, fcport); }return (rval);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 366/371 scsi: qla2xxx: Fix qla2x00_request_irqs() for MSI
In reply to Sasha LevinFrom: Huacai Chen <[email protected]>
[ Upstream commit 45dc8f2d9c94ed74a5e31e63e9136a19a7e16081 ]
Commit 4fa183455988 ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors/ pci_free_irq_vectors calls.") use pci_alloc_irq_vectors() to replace pci_enable_msi() but it didn't handle the return value correctly. This bug make qla2x00 always fail to setup MSI if MSI-X fail, so fix it.
BTW, improve the log message of return value in qla2x00_request_irqs() to avoid confusion.
--- drivers/scsi/qla2xxx/qla_isr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +3 -3
@@ -3519,7 +3519,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) skip_msix:ql_log (ql_log_info, vha,0x0037 , -"Falling back-to MSI mode -%d.\n" , ret); +"Falling back-to MSI mode -- ret=%d.\n" , ret); if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) && !IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha) &&
@@ -3527,13 +3527,13 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) goto skip_msi; ret =pci_alloc_irq_vectors (ha->pdev,1 ,1 ,PCI_IRQ_MSI ); -if (!ret) { +if (ret >0 ) {ql_dbg (ql_dbg_init, vha,0x0038 ,"MSI: Enabled.\n" ); ha->flags.msi_enabled =1 ; }else ql_log (ql_log_warn, vha,0x0039 , -"Falling back-to INTa mode -- %d.\n" , ret); +"Falling back-to INTa mode -- ret=%d.\n" , ret); skip_msi:/* Skip INTx on ISP82xx. */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 367/371 Revert "arm64: dts: juno: add dma-ranges property"
In reply to Sasha LevinFrom: Sudeep Holla <[email protected]>
[ Upstream commit 54fb3fe0f211d4729a2551cf9497bd612189af9d ]
This reverts commit 193d00a2b35ee3353813b4006a18131122087205.
Commit 951d48855d86 ("of: Make of_dma_get_range() work on bus nodes") reworked the logic such that of_dma_get_range() works correctly starting from a bus node containing "dma-ranges".
Since on Juno we don't have a SoC level bus node and "dma-ranges" is present only in the root node, we get the following error:
OF: translation of DMA address(0) to CPU address failed node(/sram@2e000000)
OF: translation of DMA address(0) to CPU address failed node(/uart@7ff80000)
...
OF: translation of DMA address(0) to CPU address failed node(/mhu@2b1f0000)
OF: translation of DMA address(0) to CPU address failed node(/iommu@2b600000)
OF: translation of DMA address(0) to CPU address failed node(/iommu@2b600000)
OF: translation of DMA address(0) to CPU address failed node(/iommu@2b600000)
So let's fix it by dropping the "dma-ranges" property for now. This should be fine since it doesn't represent any kind of device-visible restriction; it was only there for completeness, and we've since given in to the assumption that missing "dma-ranges" implies a 1:1 mapping anyway.
We can add it later with a proper SoC bus node and moving all the devices that belong there along with the "dma-ranges" if required.
--- arch/arm64/boot/dts/arm/juno-base.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/arm/juno-base.dtsi +0 -1
@@ -5,7 +5,6 @@ /* * Devices shared by all Juno boards */ - dma-ranges = <0 0 0 0 0x100 0>; memtimer: timer@2a810000 { compatible = "arm,armv7-timer-mem";
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 368/371 tipc: fix wrong timeout input for tipc_wait_for_cond()
In reply to Sasha LevinFrom: Tung Nguyen <[email protected]>
[ Upstream commit 12db3c8083fcab4270866a88191933f2d9f24f89 ]
In function __tipc_shutdown(), the timeout value passed to tipc_wait_for_cond() is not jiffies.
This commit fixes it by converting that value from milliseconds to jiffies.
--- net/tipc/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/socket.c +1 -1
@@ -487,7 +487,7 @@ static void __tipc_shutdown(struct socket *sock, int error)struct sock *sk = sock->sk;struct tipc_sock *tsk =tipc_sk (sk);struct net *net =sock_net (sk); -long timeout =CONN_TIMEOUT_DEFAULT ; +long timeout =msecs_to_jiffies (CONN_TIMEOUT_DEFAULT );u32 dnode =tsk_peer_node (tsk);struct sk_buff *skb;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 369/371 powerpc/archrandom: fix arch_get_random_seed_int()
In reply to Sasha LevinFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit b6afd1234cf93aa0d71b4be4788c47534905f0be ]
Commit 01c9348c7620ec65
powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*
updated arch_get_random_[int|long]() to be NOPs, and moved the hardware RNG backing to arch_get_random_seed_[int|long]() instead. However, it failed to take into account that arch_get_random_int() was implemented in terms of arch_get_random_long(), and so we ended up with a version of the former that is essentially a NOP as well.
Fix this by calling arch_get_random_seed_long() from arch_get_random_seed_int() instead.
--- arch/powerpc/include/asm/archrandom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/archrandom.h +1 -1
@@ -28,7 +28,7 @@ static inline int arch_get_random_seed_int(unsigned int *v)unsigned long val;int rc; - rc =arch_get_random_long (&val); + rc =arch_get_random_seed_long (&val);if (rc) *v = val;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 370/371 IB/iser: Fix dma_nents type definition
In reply to Sasha LevinFrom: Max Gurtovoy <[email protected]>
[ Upstream commit c1545f1a200f4adc4ef8dd534bf33e2f1aa22c2f ]
The retured value from ib_dma_map_sg saved in dma_nents variable. To avoid future mismatch between types, define dma_nents as an integer instead of unsigned.
--- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/ulp/iser/iscsi_iser.h +1 -1
@@ -197,7 +197,7 @@ struct iser_data_buf {struct scatterlist *sg;int size;unsigned long data_len; -unsigned int dma_nents; +int dma_nents; };/* fwd declarations */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 371/371 serial: stm32: fix clearing interrupt error flags
In reply to Sasha LevinFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit 1250ed7114a977cdc2a67a0c09d6cdda63970eb9 ]
The interrupt clear flag register is a "write 1 to clear" register. So, only writing ones allows to clear flags:
- Replace buggy stm32_clr_bits() by a simple write to clear error flags
- Replace useless read/modify/write stm32_set_bits() routine by a simple write to clear TC (transfer complete) flag.
--- drivers/tty/serial/stm32-usart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/serial/stm32-usart.c +3 -3
@@ -132,8 +132,8 @@ static void stm32_receive_chars(struct uart_port *port, bool threaded)* cleared by the sequence [read SR - read DR]. */ if ((sr &USART_SR_ERR_MASK ) && ofs->icr !=UNDEF_REG ) -stm32_clr_bits (port, ofs->icr,USART_ICR_ORECF | -USART_ICR_PECF |USART_ICR_FECF ); +writel_relaxed (sr &USART_SR_ERR_MASK , + port->membase + ofs->icr); c =stm32_get_char (port, &sr, &stm32_port->last_res); port->icount.rx++;
@@ -302,7 +302,7 @@ static void stm32_transmit_chars(struct uart_port *port)if (ofs->icr ==UNDEF_REG )stm32_clr_bits (port, ofs->isr,USART_SR_TC );else -stm32_set_bits (port, ofs->icr,USART_ICR_TCCF ); +writel_relaxed (USART_ICR_TCCF , port->membase + ofs->icr);if (stm32_port->tx_ch)stm32_transmit_chars_dma (port);
Signature · 1 line
2.20.1