leds: tlc591xx: fix return value check in tlc591xx_probe()
Subsystems (16)
Sasha Levin
maintainerPATCH 1/114 leds: tlc591xx: fix return value check in tlc591xx_probe()
From: Yang Yingliang <[email protected]>
[ Upstream commit ee522bcf026ec82ada793979c3a906274430595a ]
After device_get_match_data(), tlc591xx is not checked, add check for it and also check np after dev_of_node.
--- drivers/leds/leds-tlc591xx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/leds/leds-tlc591xx.c +6 -2
@@ -148,16 +148,20 @@ static int tlc591xx_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct device_node *np = dev_of_node(&client->dev), *child; + struct device_node *np, *child;struct device *dev = &client->dev;const struct tlc591xx *tlc591xx;struct tlc591xx_priv *priv;int err, count, reg; - tlc591xx =device_get_match_data (dev); + np =dev_of_node (dev);if (!np)return -ENODEV ; + tlc591xx =device_get_match_data (dev); +if (!tlc591xx) +return -ENODEV ; + count =of_get_available_child_count (np);if (!count || count > tlc591xx->max_leds)return -EINVAL ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 2/114 ASoC: Intel: sof_sdw: add mutual exclusion between PCH DMIC and RT715
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 35564e2bf94611c3eb51d35362addb3cb394ad54 ]
When external RT714/715 devices are used for capture, we don't want the PCH DMICs to be used.
Any information provided by the SOF platform driver or DMI quirks will be overridden.
--- sound/soc/intel/boards/sof_sdw.c | 19 +++++++++++++++++-- sound/soc/intel/boards/sof_sdw_common.h | 1 + 2 files changed, 18 insertions(+), 2 deletions(-)
sound/soc/intel/boards/sof_sdw.c +17 -2
@@ -353,6 +353,7 @@ static struct sof_sdw_codec_info codec_info_list[] = { .part_id = 0x714, .version_id = 3, .direction = {false, true}, + .ignore_pch_dmic = true, .dai_name = "rt715-aif2", .init = sof_sdw_rt715_sdca_init, },
@@ -360,6 +361,7 @@ static struct sof_sdw_codec_info codec_info_list[] = { .part_id = 0x715, .version_id = 3, .direction = {false, true}, + .ignore_pch_dmic = true, .dai_name = "rt715-aif2", .init = sof_sdw_rt715_sdca_init, },
@@ -367,6 +369,7 @@ static struct sof_sdw_codec_info codec_info_list[] = { .part_id = 0x714, .version_id = 2, .direction = {false, true}, + .ignore_pch_dmic = true, .dai_name = "rt715-aif2", .init = sof_sdw_rt715_init, },
@@ -374,6 +377,7 @@ static struct sof_sdw_codec_info codec_info_list[] = { .part_id = 0x715, .version_id = 2, .direction = {false, true}, + .ignore_pch_dmic = true, .dai_name = "rt715-aif2", .init = sof_sdw_rt715_init, },
@@ -729,7 +733,8 @@ static int create_sdw_dailink(struct device *dev, int *be_index, int *cpu_id, bool *group_generated, struct snd_soc_codec_conf *codec_conf, int codec_count, - int *codec_conf_index) + int *codec_conf_index, + bool *ignore_pch_dmic) { const struct snd_soc_acpi_link_adr *link_next;struct snd_soc_dai_link_component *codecs;
@@ -782,6 +787,9 @@ static int create_sdw_dailink(struct device *dev, int *be_index,if (codec_index <0 )return codec_index; +if (codec_info_list[codec_index].ignore_pch_dmic) + *ignore_pch_dmic = true; + cpu_dai_index = *cpu_id;for_each_pcm_streams (stream) {char *name, *cpu_name;
@@ -913,6 +921,7 @@ static int sof_card_dai_links_create(struct device *dev,const struct snd_soc_acpi_link_adr *adr_link;struct snd_soc_dai_link_component *cpus;struct snd_soc_codec_conf *codec_conf; +bool ignore_pch_dmic = false;int codec_conf_count;int codec_conf_index =0 ;bool group_generated[SDW_MAX_GROUPS ];
@@ -1019,7 +1028,8 @@ static int sof_card_dai_links_create(struct device *dev, sdw_cpu_dai_num, cpus, adr_link, &cpu_id, group_generated, codec_conf, codec_conf_count, - &codec_conf_index); + &codec_conf_index, + &ignore_pch_dmic);if (ret <0 ) {dev_err (dev,"failed to create dai link %d" , be_id);return -ENOMEM ;
@@ -1087,6 +1097,10 @@ static int sof_card_dai_links_create(struct device *dev, DMIC:/* dmic */ if (dmic_num >0 ) { +if (ignore_pch_dmic) { +dev_warn (dev,"Ignoring PCH DMIC\n" ); + goto HDMI; + } cpus[cpu_id].dai_name ="DMIC01 Pin" ; init_dai_link(dev, links + link_id, be_id, "dmic01", 0, 1, // DMIC only supports capture
@@ -1105,6 +1119,7 @@ static int sof_card_dai_links_create(struct device *dev,INC_ID (be_id, cpu_id, link_id); } +HDMI:/* HDMI */ if (hdmi_num >0 ) { idisp_components = devm_kcalloc(dev, hdmi_num,
sound/soc/intel/boards/sof_sdw_common.h +1 -0
@@ -56,6 +56,7 @@ struct sof_sdw_codec_info {int amp_num;const u8 acpi_id[ACPI_ID_LEN ];const bool direction[2 ];// playback & capture support +const bool ignore_pch_dmic;const char *dai_name;const struct snd_soc_ops *ops;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 3/114 ASoC: Intel: sof_sdw: add SOF_RT715_DAI_ID_FIX for AlderLake
In reply to Sasha LevinFrom: Libin Yang <[email protected]>
[ Upstream commit 81cd42e5174ba7918edd3d006406ce21ebaa8507 ]
AlderLake needs the flag SOF_RT715_DAI_ID_FIX if it is using the rt715 DMIC.
--- sound/soc/intel/boards/sof_sdw.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/intel/boards/sof_sdw.c +1 -0
@@ -196,6 +196,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { }, .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 | SOF_SDW_TGL_HDMI | + SOF_RT715_DAI_ID_FIX | SOF_SDW_PCH_DMIC), }, {}
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 4/114 dmaengine: fsl-qdma: check dma_set_mask return value
In reply to Sasha LevinFrom: Robin Gong <[email protected]>
[ Upstream commit f0c07993af0acf5545d5c1445798846565f4f147 ]
For fix below warning reported by static code analysis tool like Coverity from Synopsys:
Addresses-Coverity-ID: 12285639 ("Unchecked return value")
--- drivers/dma/fsl-qdma.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/dma/fsl-qdma.c +5 -1
@@ -1235,7 +1235,11 @@ static int fsl_qdma_probe(struct platform_device *pdev) fsl_qdma->dma_dev.device_synchronize = fsl_qdma_synchronize; fsl_qdma->dma_dev.device_terminate_all = fsl_qdma_terminate_all; -dma_set_mask (&pdev->dev,DMA_BIT_MASK (40 )); + ret =dma_set_mask (&pdev->dev,DMA_BIT_MASK (40 )); +if (ret) { +dev_err (&pdev->dev,"dma_set_mask failure.\n" ); +return ret; + }platform_set_drvdata (pdev, fsl_qdma);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 5/114 scsi: arcmsr: Fix the wrong CDB payload report to IOP
In reply to Sasha LevinFrom: ching Huang <[email protected]>
[ Upstream commit 5b8644968d2ca85abb785e83efec36934974b0c2 ]
This patch fixes the wrong CDB payload report to IOP.
--- drivers/scsi/arcmsr/arcmsr_hba.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/arcmsr/arcmsr_hba.c +6 -2
@@ -1923,8 +1923,12 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContrif (ccb->arc_cdb_size <=0x300 ) arc_cdb_size = (ccb->arc_cdb_size -1 ) >>6 |1 ; -else - arc_cdb_size = (((ccb->arc_cdb_size +0xff ) >>8 ) +2 ) <<1 |1 ; +else { + arc_cdb_size = ((ccb->arc_cdb_size +0xff ) >>8 ) +2 ; +if (arc_cdb_size >0xF ) + arc_cdb_size =0xF ; + arc_cdb_size = (arc_cdb_size <<1 ) |1 ; + } ccb_post_stamp = (ccb->smid | arc_cdb_size);writel (0 , &pmu->inbound_queueport_high);writel (ccb_post_stamp, &pmu->inbound_queueport_low);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 6/114 srcu: Fix broken node geometry after early ssp init
In reply to Sasha LevinFrom: Frederic Weisbecker <[email protected]>
[ Upstream commit b5befe842e6612cf894cf4a199924ee872d8b7d8 ]
An srcu_struct structure that is initialized before rcu_init_geometry() will have its srcu_node hierarchy based on CONFIG_NR_CPUS. Once rcu_init_geometry() is called, this hierarchy is compressed as needed for the actual maximum number of CPUs for this system.
Later on, that srcu_struct structure is confused, sometimes referring to its initial CONFIG_NR_CPUS-based hierarchy, and sometimes instead to the new num_possible_cpus() hierarchy. For example, each of its ->mynode fields continues to reference the original leaf rcu_node structures, some of which might no longer exist. On the other hand, srcu_for_each_node_breadth_first() traverses to the new node hierarchy.
There are at least two bad possible outcomes to this:
1) a) A callback enqueued early on an srcu_data structure (call it
*sdp) is recorded pending on sdp->mynode->srcu_data_have_cbs in
srcu_funnel_gp_start() with sdp->mynode pointing to a deep leaf
(say 3 levels). b) The grace period ends after rcu_init_geometry() shrinks the nodes level to a single one. srcu_gp_end() walks through the new srcu_node hierarchy without ever reaching the old leaves so the callback is never executed.
This is easily reproduced on an 8 CPUs machine with CONFIG_NR_CPUS >= 32 and "rcupdate.rcu_self_test=1". The srcu_barrier() after early tests verification never completes and the boot hangs:
[ 5413.141029] INFO: task swapper/0:1 blocked for more than 4915 seconds. [ 5413.147564] Not tainted 5.12.0-rc4+ #28 [ 5413.151927] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 5413.159753] task:swapper/0 state:D stack: 0 pid: 1 ppid: 0 flags:0x00004000 [ 5413.168099] Call Trace: [ 5413.170555] __schedule+0x36c/0x930 [ 5413.174057] ? wait_for_completion+0x88/0x110 [ 5413.178423] schedule+0x46/0xf0 [ 5413.181575] schedule_timeout+0x284/0x380 [ 5413.185591] ? wait_for_completion+0x88/0x110 [ 5413.189957] ? mark_held_locks+0x61/0x80 [ 5413.193882] ? mark_held_locks+0x61/0x80 [ 5413.197809] ? _raw_spin_unlock_irq+0x24/0x50 [ 5413.202173] ? wait_for_completion+0x88/0x110 [ 5413.206535] wait_for_completion+0xb4/0x110 [ 5413.210724] ? srcu_torture_stats_print+0x110/0x110 [ 5413.215610] srcu_barrier+0x187/0x200 [ 5413.219277] ? rcu_tasks_verify_self_tests+0x50/0x50 [ 5413.224244] ? rdinit_setup+0x2b/0x2b [ 5413.227907] rcu_verify_early_boot_tests+0x2d/0x40 [ 5413.232700] do_one_initcall+0x63/0x310 [ 5413.236541] ? rdinit_setup+0x2b/0x2b [ 5413.240207] ? rcu_read_lock_sched_held+0x52/0x80 [ 5413.244912] kernel_init_freeable+0x253/0x28f [ 5413.249273] ? rest_init+0x250/0x250 [ 5413.252846] kernel_init+0xa/0x110 [ 5413.256257] ret_from_fork+0x22/0x30
2) An srcu_struct structure that is initialized before rcu_init_geometry() and used afterward will always have stale rdp->mynode references, resulting in callbacks to be missed in srcu_gp_end(), just like in the previous scenario.
This commit therefore causes init_srcu_struct_nodes to initialize the geometry, if needed. This ensures that the srcu_node hierarchy is properly built and distributed from the get-go.
--- kernel/rcu/rcu.h | 2 ++ kernel/rcu/srcutree.c | 3 +++ kernel/rcu/tree.c | 16 +++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-)
kernel/rcu/rcu.h +2 -0
@@ -308,6 +308,8 @@ static inline void rcu_init_levelspread(int *levelspread, const int *levelcnt) } } +extern void rcu_init_geometry (void ); +/* Returns a pointer to the first leaf rcu_node structure. */ #define rcu_first_leaf_node () (rcu_state.level[rcu_num_lvls - 1])
kernel/rcu/srcutree.c +3 -0
@@ -90,6 +90,9 @@ static void init_srcu_struct_nodes(struct srcu_struct *ssp, bool is_static)struct srcu_node *snp;struct srcu_node *snp_first; +/* Initialize geometry if it has not already been initialized. */ +rcu_init_geometry (); +/* Work out the overall tree geometry. */ ssp->level[0 ] = &ssp->node[0 ];for (i =1 ; i < rcu_num_lvls; i++)
kernel/rcu/tree.c +15 -1
@@ -4582,11 +4582,25 @@ static void __init rcu_init_one(void)* replace the definitions in tree.h because those are needed to size * the ->node array in the rcu_state structure. */ -static void __init rcu_init_geometry (void ) +void rcu_init_geometry (void ) {ulong d;int i; +static unsigned long old_nr_cpu_ids;int rcu_capacity[RCU_NUM_LVLS ]; +static bool initialized; + +if (initialized) { +/* +* Warn if setup_nr_cpu_ids() had not yet been invoked, +* unless nr_cpus_ids == NR_CPUS, in which case who cares? +*/ +WARN_ON_ONCE (old_nr_cpu_ids != nr_cpu_ids); +return ; + } + + old_nr_cpu_ids = nr_cpu_ids; + initialized = true;/* * Initialize any unspecified boot parameters.
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 7/114 rcu: Reject RCU_LOCKDEP_WARN() false positives
In reply to Sasha LevinFrom: "Paul E. McKenney" <[email protected]>
[ Upstream commit 3066820034b5dd4e89bd74a7739c51c2d6f5e554 ]
If another lockdep report runs concurrently with an RCU lockdep report from RCU_LOCKDEP_WARN(), the following sequence of events can occur:
1. debug_lockdep_rcu_enabled() sees that lockdep is enabled
when called from (say) synchronize_rcu().
2. Lockdep is disabled by a concurrent lockdep report.
3. debug_lockdep_rcu_enabled() evaluates its lockdep-expression
argument, for example, lock_is_held(&rcu_bh_lock_map).
4. Because lockdep is now disabled, lock_is_held() plays it safe and
returns the constant 1.
5. But in this case, the constant 1 is not safe, because invoking
synchronize_rcu() under rcu_read_lock_bh() is disallowed.
6. debug_lockdep_rcu_enabled() wrongly invokes lockdep_rcu_suspicious(),
resulting in a false-positive splat.
This commit therefore changes RCU_LOCKDEP_WARN() to check debug_lockdep_rcu_enabled() after checking the lockdep expression, so that any "safe" returns from lock_is_held() are rejected by debug_lockdep_rcu_enabled(). This requires memory ordering, which is supplied by READ_ONCE(debug_locks). The resulting volatile accesses prevent the compiler from reordering and the fact that only one variable is being accessed prevents the underlying hardware from reordering. The combination works for IA64, which can reorder reads to the same location, but this is defeated by the volatile accesses, which compile to load instructions that provide ordering.
--- include/linux/rcupdate.h | 2 +- kernel/rcu/update.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/rcupdate.h +1 -1
@@ -315,7 +315,7 @@ static inline int rcu_read_lock_any_held(void)#define RCU_LOCKDEP_WARN (c, s) \ do { \ static bool __section(".data.unlikely") __warned; \ - if (debug_lockdep_rcu_enabled() && !__warned && (c)) { \ + if ((c) && debug_lockdep_rcu_enabled() && !__warned) { \ __warned = true; \ lockdep_rcu_suspicious(__FILE__, __LINE__, s); \ } \
kernel/rcu/update.c +1 -1
@@ -277,7 +277,7 @@ EXPORT_SYMBOL_GPL(rcu_callback_map); noinstr int notrace debug_lockdep_rcu_enabled(void) { -return rcu_scheduler_active !=RCU_SCHEDULER_INACTIVE && debug_locks && +return rcu_scheduler_active !=RCU_SCHEDULER_INACTIVE &&READ_ONCE (debug_locks) && current->lockdep_recursion ==0 ; }EXPORT_SYMBOL_GPL (debug_lockdep_rcu_enabled);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 8/114 soundwire: bus: only use CLOCK_STOP_MODE0 and fix confusions
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 345e9f5ca798600e44c0843646621f2804eb99f4 ]
Existing devices and implementations only support the required CLOCK_STOP_MODE0. All the code related to CLOCK_STOP_MODE1 has not been tested and is highly questionable, with a clear confusion between CLOCK_STOP_MODE1 and the simple clock stop state machine.
This patch removes all usages of CLOCK_STOP_MODE1 - which has no impact on any solution - and fixes the use of the simple clock stop state machine. The resulting code should be a lot more symmetrical and easier to maintain.
Note that CLOCK_STOP_MODE1 is not supported in the SoundWire Device Class specification so it's rather unlikely that we need to re-add this mode later.
--- drivers/soundwire/bus.c | 100 ++++++++++++++-------------------- include/linux/soundwire/sdw.h | 2 - 2 files changed, 40 insertions(+), 62 deletions(-)
drivers/soundwire/bus.c +40 -60
@@ -821,26 +821,6 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,mutex_unlock (&bus->bus_lock); } -static enum sdw_clk_stop_mode sdw_get_clk_stop_mode (struct sdw_slave *slave) -{ -enum sdw_clk_stop_mode mode; - -/* -* Query for clock stop mode if Slave implements -* ops->get_clk_stop_mode, else read from property. -*/ -if (slave->ops && slave->ops->get_clk_stop_mode) { - mode = slave->ops->get_clk_stop_mode (slave); - }else { -if (slave->prop.clk_stop_mode1) - mode =SDW_CLK_STOP_MODE1 ; -else - mode =SDW_CLK_STOP_MODE0 ; - } - -return mode; -} -static int sdw_slave_clk_stop_callback (struct sdw_slave *slave,enum sdw_clk_stop_mode mode,enum sdw_clk_stop_type type)
@@ -933,7 +913,6 @@ static int sdw_bus_wait_for_clk_prep_deprep(struct sdw_bus *bus, u16 dev_num)*/ int sdw_bus_prep_clk_stop (struct sdw_bus *bus) { -enum sdw_clk_stop_mode slave_mode;bool simple_clk_stop = true;struct sdw_slave *slave;bool is_slave = false;
@@ -955,10 +934,8 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)/* Identify if Slave(s) are available on Bus */ is_slave = true; - slave_mode =sdw_get_clk_stop_mode (slave); - slave->curr_clk_stop_mode = slave_mode; - - ret =sdw_slave_clk_stop_callback (slave, slave_mode, + ret =sdw_slave_clk_stop_callback (slave, +SDW_CLK_STOP_MODE0 ,SDW_CLK_PRE_PREPARE );if (ret <0 ) { dev_err(&slave->dev,
@@ -966,22 +943,29 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)return ret; } - ret =sdw_slave_clk_stop_prepare (slave, - slave_mode, true); -if (ret <0 ) { -dev_err (&slave->dev, -"pre-prepare failed:%d" , ret); -return ret; - } - -if (slave_mode ==SDW_CLK_STOP_MODE1 ) +/* Only prepare a Slave device if needed */ +if (!slave->prop.simple_clk_stop_capable) { simple_clk_stop = false; + + ret =sdw_slave_clk_stop_prepare (slave, +SDW_CLK_STOP_MODE0 , + true); +if (ret <0 ) { +dev_err (&slave->dev, +"pre-prepare failed:%d" , ret); +return ret; + } + } }/* Skip remaining clock stop preparation if no Slave is attached */ if (!is_slave)return ret; +/* +* Don't wait for all Slaves to be ready if they follow the simple +* state machine +*/ if (!simple_clk_stop) { ret =sdw_bus_wait_for_clk_prep_deprep (bus,SDW_BROADCAST_DEV_NUM );
@@ -998,17 +982,13 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus) slave->status != SDW_SLAVE_ALERT)continue ; - slave_mode = slave->curr_clk_stop_mode; - -if (slave_mode ==SDW_CLK_STOP_MODE1 ) { - ret =sdw_slave_clk_stop_callback (slave, - slave_mode, -SDW_CLK_POST_PREPARE ); + ret =sdw_slave_clk_stop_callback (slave, +SDW_CLK_STOP_MODE0 , +SDW_CLK_POST_PREPARE ); -if (ret <0 ) { -dev_err (&slave->dev, -"post-prepare failed:%d" , ret); - } +if (ret <0 ) { +dev_err (&slave->dev, +"post-prepare failed:%d" , ret); } }
@@ -1059,7 +1039,6 @@ EXPORT_SYMBOL(sdw_bus_clk_stop);*/ int sdw_bus_exit_clk_stop (struct sdw_bus *bus) { -enum sdw_clk_stop_mode mode;bool simple_clk_stop = true;struct sdw_slave *slave;bool is_slave = false;
@@ -1081,31 +1060,33 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus)/* Identify if Slave(s) are available on Bus */ is_slave = true; - mode = slave->curr_clk_stop_mode; - -if (mode ==SDW_CLK_STOP_MODE1 ) { - simple_clk_stop = false; -continue ; - } - - ret =sdw_slave_clk_stop_callback (slave, mode, + ret =sdw_slave_clk_stop_callback (slave,SDW_CLK_STOP_MODE0 ,SDW_CLK_PRE_DEPREPARE );if (ret <0 )dev_warn (&slave->dev,"clk stop deprep failed:%d" , ret); - ret =sdw_slave_clk_stop_prepare (slave, mode, - false); +/* Only de-prepare a Slave device if needed */ +if (!slave->prop.simple_clk_stop_capable) { + simple_clk_stop = false; -if (ret <0 ) -dev_warn (&slave->dev, -"clk stop deprep failed:%d" , ret); + ret =sdw_slave_clk_stop_prepare (slave,SDW_CLK_STOP_MODE0 , + false); + +if (ret <0 ) +dev_warn (&slave->dev, +"clk stop deprep failed:%d" , ret); + } }/* Skip remaining clock stop de-preparation if no Slave is attached */ if (!is_slave)return 0 ; +/* +* Don't wait for all Slaves to be ready if they follow the simple +* state machine +*/ if (!simple_clk_stop)sdw_bus_wait_for_clk_prep_deprep (bus,SDW_BROADCAST_DEV_NUM );
@@ -1117,8 +1098,7 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus) slave->status != SDW_SLAVE_ALERT)continue ; - mode = slave->curr_clk_stop_mode; -sdw_slave_clk_stop_callback (slave, mode, +sdw_slave_clk_stop_callback (slave,SDW_CLK_STOP_MODE0 ,SDW_CLK_POST_DEPREPARE ); }
include/linux/soundwire/sdw.h +0 -2
@@ -624,7 +624,6 @@ struct sdw_slave_ops {int (*port_prep)(struct sdw_slave *slave,struct sdw_prepare_ch *prepare_ch,enum sdw_port_prep_ops pre_ops); -int (*get_clk_stop_mode)(struct sdw_slave *slave);int (*clk_stop)(struct sdw_slave *slave,enum sdw_clk_stop_mode mode,enum sdw_clk_stop_type type);
@@ -675,7 +674,6 @@ struct sdw_slave {struct list_head node;struct completion port_ready[SDW_MAX_PORTS ];unsigned int m_port_map[SDW_MAX_PORTS ]; -enum sdw_clk_stop_mode curr_clk_stop_mode;u16 dev_num;u16 dev_num_sticky;bool probed;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 9/114 soundwire: bus: handle -ENODATA errors in clock stop/start sequences
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit b50bb8ba369cdc8814e82558117711c12ef3af3d ]
If a device lost sync and can no longer ACK a command, it may not be able to enter a lower-power state but it will still be able to resync when the clock restarts. In those cases, we want to continue with the clock stop sequence.
This patch modifies the behavior during clock stop sequences to only log errors unrelated to -ENODATA/Command_Ignored. The flow is also modified so that loops continue to prepare/deprepare other devices even when one seems to have lost sync.
When resuming the clocks, all issues are logged with a dev_warn(), previously only some of them were checked. This is the only part that now differs between the clock stop entry and clock stop exit
sequences: while we don't want to stop the suspend flow, we do want information on potential issues while resuming, as they may have ripple effects.
For consistency the log messages are also modified to be unique and self-explanatory. Errors in sdw_slave_clk_stop_callback() were removed, they are now handled in the caller.
--- drivers/soundwire/bus.c | 69 +++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 33 deletions(-)
drivers/soundwire/bus.c +36 -33
@@ -829,11 +829,8 @@ static int sdw_slave_clk_stop_callback(struct sdw_slave *slave,if (slave->ops && slave->ops->clk_stop) { ret = slave->ops->clk_stop (slave, mode, type); -if (ret <0 ) { -dev_err (&slave->dev, -"Clk Stop type =%d failed: %d\n" , type, ret); +if (ret <0 )return ret; - } }return 0 ;
@@ -860,7 +857,8 @@ static int sdw_slave_clk_stop_prepare(struct sdw_slave *slave, }else { ret =sdw_read_no_pm (slave,SDW_SCP_SYSTEMCTRL );if (ret <0 ) { -dev_err (&slave->dev,"SDW_SCP_SYSTEMCTRL read failed:%d\n" , ret); +if (ret != -ENODATA ) +dev_err (&slave->dev,"SDW_SCP_SYSTEMCTRL read failed:%d\n" , ret);return ret; } val = ret;
@@ -869,9 +867,8 @@ static int sdw_slave_clk_stop_prepare(struct sdw_slave *slave, ret =sdw_write_no_pm (slave,SDW_SCP_SYSTEMCTRL , val); -if (ret <0 ) -dev_err (&slave->dev, -"Clock Stop prepare failed for slave: %d" , ret); +if (ret <0 && ret != -ENODATA ) +dev_err (&slave->dev,"SDW_SCP_SYSTEMCTRL write failed:%d\n" , ret);return ret; }
@@ -922,6 +919,9 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)* In order to save on transition time, prepare * each Slave and then wait for all Slave(s) to be * prepared for clock stop. +* If one of the Slave devices has lost sync and +* replies with Command Ignored/-ENODATA, we continue +* the loop */ list_for_each_entry (slave, &bus->slaves, node) {if (!slave->dev_num)
@@ -937,9 +937,8 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus) ret =sdw_slave_clk_stop_callback (slave,SDW_CLK_STOP_MODE0 ,SDW_CLK_PRE_PREPARE ); -if (ret <0 ) { -dev_err (&slave->dev, -"pre-prepare failed:%d" , ret); +if (ret <0 && ret != -ENODATA ) { +dev_err (&slave->dev,"clock stop pre-prepare cb failed:%d\n" , ret);return ret; }
@@ -950,9 +949,8 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus) ret =sdw_slave_clk_stop_prepare (slave,SDW_CLK_STOP_MODE0 , true); -if (ret <0 ) { -dev_err (&slave->dev, -"pre-prepare failed:%d" , ret); +if (ret <0 && ret != -ENODATA ) { +dev_err (&slave->dev,"clock stop prepare failed:%d\n" , ret);return ret; } }
@@ -960,7 +958,7 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)/* Skip remaining clock stop preparation if no Slave is attached */ if (!is_slave) -return ret; +return 0 ;/* * Don't wait for all Slaves to be ready if they follow the simple
@@ -969,6 +967,12 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)if (!simple_clk_stop) { ret =sdw_bus_wait_for_clk_prep_deprep (bus,SDW_BROADCAST_DEV_NUM ); +/* +* if there are no Slave devices present and the reply is +* Command_Ignored/-ENODATA, we don't need to continue with the +* flow and can just return here. The error code is not modified +* and its handling left as an exercise for the caller. +*/ if (ret <0 )return ret; }
@@ -986,13 +990,13 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)SDW_CLK_STOP_MODE0 , SDW_CLK_POST_PREPARE); -if (ret <0 ) { -dev_err (&slave->dev, -"post-prepare failed:%d" , ret); +if (ret <0 && ret != -ENODATA ) { +dev_err (&slave->dev,"clock stop post-prepare cb failed:%d\n" , ret); +return ret; } } -return ret; +return 0 ; }EXPORT_SYMBOL (sdw_bus_prep_clk_stop);
@@ -1015,12 +1019,8 @@ int sdw_bus_clk_stop(struct sdw_bus *bus) ret =sdw_bwrite_no_pm (bus,SDW_BROADCAST_DEV_NUM ,SDW_SCP_CTRL ,SDW_SCP_CTRL_CLK_STP_NOW );if (ret <0 ) { -if (ret == -ENODATA ) -dev_dbg (bus->dev, -"ClockStopNow Broadcast msg ignored %d" , ret); -else -dev_err (bus->dev, -"ClockStopNow Broadcast msg failed %d" , ret); +if (ret != -ENODATA ) +dev_err (bus->dev,"ClockStopNow Broadcast msg failed %d\n" , ret);return ret; }
@@ -1063,8 +1063,7 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus) ret =sdw_slave_clk_stop_callback (slave,SDW_CLK_STOP_MODE0 ,SDW_CLK_PRE_DEPREPARE );if (ret <0 ) -dev_warn (&slave->dev, -"clk stop deprep failed:%d" , ret); +dev_warn (&slave->dev,"clock stop pre-deprepare cb failed:%d\n" , ret);/* Only de-prepare a Slave device if needed */ if (!slave->prop.simple_clk_stop_capable) {
@@ -1074,8 +1073,7 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus) false);if (ret <0 ) -dev_warn (&slave->dev, -"clk stop deprep failed:%d" , ret); +dev_warn (&slave->dev,"clock stop deprepare failed:%d\n" , ret); } }
@@ -1087,8 +1085,11 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus)* Don't wait for all Slaves to be ready if they follow the simple * state machine */ -if (!simple_clk_stop) -sdw_bus_wait_for_clk_prep_deprep (bus,SDW_BROADCAST_DEV_NUM ); +if (!simple_clk_stop) { + ret =sdw_bus_wait_for_clk_prep_deprep (bus,SDW_BROADCAST_DEV_NUM ); +if (ret <0 ) +dev_warn (&slave->dev,"clock stop deprepare wait failed:%d\n" , ret); + }list_for_each_entry (slave, &bus->slaves, node) {if (!slave->dev_num)
@@ -1098,8 +1099,10 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus) slave->status != SDW_SLAVE_ALERT)continue ; -sdw_slave_clk_stop_callback (slave,SDW_CLK_STOP_MODE0 , -SDW_CLK_POST_DEPREPARE ); + ret =sdw_slave_clk_stop_callback (slave,SDW_CLK_STOP_MODE0 , +SDW_CLK_POST_DEPREPARE ); +if (ret <0 ) +dev_warn (&slave->dev,"clock stop post-deprepare cb failed:%d\n" , ret); }return 0 ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 10/114 usb: dwc3: pci: Fix DEFINE for Intel Elkhart Lake
In reply to Sasha LevinFrom: Raymond Tan <[email protected]>
[ Upstream commit 457d22850b27de3aea336108272d08602c55fdf7 ]
There's no separate low power (LP) version of Elkhart Lake, thus this patch updates the PCI Device ID DEFINE to indicate this.
--- drivers/usb/dwc3/dwc3-pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/dwc3/dwc3-pci.c +4 -4
@@ -36,7 +36,7 @@#define PCI_DEVICE_ID_INTEL_CNPH 0xa36e#define PCI_DEVICE_ID_INTEL_CNPV 0xa3b0#define PCI_DEVICE_ID_INTEL_ICLLP 0x34ee -#define PCI_DEVICE_ID_INTEL_EHLLP 0x4b7e +#define PCI_DEVICE_ID_INTEL_EHL 0x4b7e#define PCI_DEVICE_ID_INTEL_TGPLP 0xa0ee#define PCI_DEVICE_ID_INTEL_TGPH 0x43ee#define PCI_DEVICE_ID_INTEL_JSP 0x4dee
@@ -167,7 +167,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)if (pdev->vendor ==PCI_VENDOR_ID_INTEL ) {if (pdev->device ==PCI_DEVICE_ID_INTEL_BXT || pdev->device ==PCI_DEVICE_ID_INTEL_BXT_M || - pdev->device ==PCI_DEVICE_ID_INTEL_EHLLP ) { + pdev->device ==PCI_DEVICE_ID_INTEL_EHL ) {guid_parse (PCI_INTEL_BXT_DSM_GUID , &dwc->guid); dwc->has_dsm_for_pm = true; }
@@ -375,8 +375,8 @@ static const struct pci_device_id dwc3_pci_id_table[] = { {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_ICLLP ), (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP), - (kernel_ulong_t) &dwc3_pci_intel_swnode }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHL), + (kernel_ulong_t) &dwc3_pci_intel_swnode, }, { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP), (kernel_ulong_t) &dwc3_pci_intel_swnode, },
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 11/114 tty: serial: fsl_lpuart: fix the potential risk of division or modulo by zero
In reply to Sasha LevinFrom: Sherry Sun <[email protected]>
[ Upstream commit fcb10ee27fb91b25b68d7745db9817ecea9f1038 ]
We should be very careful about the register values that will be used for division or modulo operations, althrough the possibility that the UARTBAUD register value is zero is very low, but we had better to deal with the "bad data" of hardware in advance to avoid division or modulo by zero leading to undefined kernel behavior.
--- drivers/tty/serial/fsl_lpuart.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/fsl_lpuart.c +3 -0
@@ -2414,6 +2414,9 @@ lpuart32_console_get_options(struct lpuart_port *sport, int *baud, bd =lpuart32_read (&sport->port,UARTBAUD ); bd &=UARTBAUD_SBR_MASK ; +if (!bd) +return ; + sbr = bd; uartclk =lpuart_get_baud_clk_rate (sport);/*
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 12/114 serial: fsl_lpuart: disable DMA for console and fix sysrq
In reply to Sasha LevinFrom: Michael Walle <[email protected]>
[ Upstream commit 8cac2f6eb8548245e6f8fb893fc7f2a714952654 ]
SYSRQ doesn't work with DMA. This is because there is no error indication whether a symbol had a framing error or not. Actually, this is not completely correct, there is a bit in the data register which is set in this case, but we'd have to read change the DMA access to 16 bit and we'd need to post process the data, thus make the DMA pointless in the first place.
--- drivers/tty/serial/fsl_lpuart.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/tty/serial/fsl_lpuart.c +6 -0
@@ -1581,6 +1581,9 @@ static void lpuart_tx_dma_startup(struct lpuart_port *sport)u32 uartbaud;int ret; +if (uart_console (&sport->port)) + goto err; +if (!sport->dma_tx_chan) goto err;
@@ -1610,6 +1613,9 @@ static void lpuart_rx_dma_startup(struct lpuart_port *sport)int ret;unsigned char cr3; +if (uart_console (&sport->port)) + goto err; +if (!sport->dma_rx_chan) goto err;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 13/114 serial: 8250: of: Check for CONFIG_SERIAL_8250_BCM7271
In reply to Sasha LevinFrom: Jim Quinlan <[email protected]>
[ Upstream commit f5b08386dee439c7a9e60ce0a4a4a705f3a60dff ]
Our SoC's have always had a NS16650A UART core and older SoC's would have a compatible string of: 'compatible = ""ns16550a"' and use the 8250_of driver. Our newer SoC's have added enhancements to the base core to add support for DMA and accurate high speed baud rates and use this newer 8250_bcm7271 driver. The Device Tree node for our enhanced UARTs has a compatible string of: 'compatible = "brcm,bcm7271-uart", "ns16550a"''. With both drivers running and the link order setup so that the 8250_bcm7217 driver is initialized before the 8250_of driver, we should bind the 8250_bcm7271 driver to the enhanced UART, or for upstream kernels that don't have the 8250_bcm7271 driver, we bind to the 8250_of driver.
The problem is that when both the 8250_of and 8250_bcm7271 drivers were running, occasionally the 8250_of driver would be bound to the enhanced UART instead of the 8250_bcm7271 driver. This was happening because we use SCMI based clocks which come up late in initialization and cause probe DEFER's when the two drivers get their clocks.
Occasionally the SCMI clock would become ready between the 8250_bcm7271 probe and the 8250_of probe and the 8250_of driver would be bound. To fix this we decided to config only our 8250_bcm7271 driver and added "ns16665a0" to the compatible string so the driver would work on our older system.
This commit has of_platform_serial_probe() check specifically for the "brcm,bcm7271-uart" and whether its companion driver is enabled. If it is the case, and the clock provider is not ready, we want to make sure that when the 8250_bcm7271.c driver returns EPROBE_DEFER, we are not getting the UART registered via 8250_of.c.
--- drivers/tty/serial/8250/8250_of.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/8250/8250_of.c +4 -0
@@ -192,6 +192,10 @@ static int of_platform_serial_probe(struct platform_device *ofdev)u32 tx_threshold;int ret; +if (IS_ENABLED (CONFIG_SERIAL_8250_BCM7271 ) && +of_device_is_compatible (ofdev->dev.of_node,"brcm,bcm7271-uart" )) +return -ENODEV ; + port_type = (unsigned long )of_device_get_match_data (&ofdev->dev);if (port_type ==PORT_UNKNOWN )return -EINVAL ;
Signature · 1 line
2.30.2
Re: [PATCH AUTOSEL 5.13 013/114] serial: 8250: of: Check for CONFIG_SERIAL_8250_BCM7271
Quoted 34 lines · Sasha Levin
From: Jim Quinlan <[email protected]>
[ Upstream commit
f5b08386dee439c7a9e60ce0a4a4a705f3a60dff]Our SoC's have always had a NS16650A UART core and older SoC's would have a compatible string of: 'compatible = ""ns16550a"' and use the 8250_of driver. Our newer SoC's have added enhancements to the base core to add support for DMA and accurate high speed baud rates and use this newer 8250_bcm7271 driver. The Device Tree node for our enhanced UARTs has a compatible string of: 'compatible = "brcm,bcm7271-uart", "ns16550a"''. With both drivers running and the link order setup so that the 8250_bcm7217 driver is initialized before the 8250_of driver, we should bind the 8250_bcm7271 driver to the enhanced UART, or for upstream kernels that don't have the 8250_bcm7271 driver, we bind to the 8250_of driver.
The problem is that when both the 8250_of and 8250_bcm7271 drivers were running, occasionally the 8250_of driver would be bound to the enhanced UART instead of the 8250_bcm7271 driver. This was happening because we use SCMI based clocks which come up late in initialization and cause probe DEFER's when the two drivers get their clocks.
Occasionally the SCMI clock would become ready between the 8250_bcm7271 probe and the 8250_of probe and the 8250_of driver would be bound. To fix this we decided to config only our 8250_bcm7271 driver and added "ns16665a0" to the compatible string so the driver would work on our older system.
This commit has
of_platform_serial_probe()check specifically for the "brcm,bcm7271-uart" and whether its companion driver is enabled. If it is the case, and the clock provider is not ready, we want to make sure that when the8250_bcm7271.cdriver returnsEPROBE_DEFER, we are not getting the UART registered via8250_of.c.
Quoted 7 lines
Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Jim Quinlan <[email protected]>Signed-off-by Al Cooper <[email protected]>Signed-off-by Florian Fainelli <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Sasha Levin <[email protected]>
This commit is only relevant with 41a469482de257ea8db43cf74b6311bd055de030 ("serial: 8250: Add new 8250-core based Broadcom STB driver") which is included in v5.13 and newer. You would want to drop that commit from the 5.12, 5.10 and 5.4 auto-selection.
Thanks!
Signature · 1 line
Florian
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.13 013/114] serial: 8250: of: Check for CONFIG_SERIAL_8250_BCM7271
Quoted 45 lines · Florian Fainelli
Quoted 34 lines · Sasha Levin
From: Jim Quinlan <[email protected]>
[ Upstream commit
f5b08386dee439c7a9e60ce0a4a4a705f3a60dff]Our SoC's have always had a NS16650A UART core and older SoC's would have a compatible string of: 'compatible = ""ns16550a"' and use the 8250_of driver. Our newer SoC's have added enhancements to the base core to add support for DMA and accurate high speed baud rates and use this newer 8250_bcm7271 driver. The Device Tree node for our enhanced UARTs has a compatible string of: 'compatible = "brcm,bcm7271-uart", "ns16550a"''. With both drivers running and the link order setup so that the 8250_bcm7217 driver is initialized before the 8250_of driver, we should bind the 8250_bcm7271 driver to the enhanced UART, or for upstream kernels that don't have the 8250_bcm7271 driver, we bind to the 8250_of driver.
The problem is that when both the 8250_of and 8250_bcm7271 drivers were running, occasionally the 8250_of driver would be bound to the enhanced UART instead of the 8250_bcm7271 driver. This was happening because we use SCMI based clocks which come up late in initialization and cause probe DEFER's when the two drivers get their clocks.
Occasionally the SCMI clock would become ready between the 8250_bcm7271 probe and the 8250_of probe and the 8250_of driver would be bound. To fix this we decided to config only our 8250_bcm7271 driver and added "ns16665a0" to the compatible string so the driver would work on our older system.
This commit has
of_platform_serial_probe()check specifically for the "brcm,bcm7271-uart" and whether its companion driver is enabled. If it is the case, and the clock provider is not ready, we want to make sure that when the8250_bcm7271.cdriver returnsEPROBE_DEFER, we are not getting the UART registered via8250_of.c.Quoted 7 lines
Reviewed-by Andy Shevchenko <[email protected]>Signed-off-by Jim Quinlan <[email protected]>Signed-off-by Al Cooper <[email protected]>Signed-off-by Florian Fainelli <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 1 line
This commit is only relevant with
41a469482de257ea8db43cf74b6311bd055de030("serial: 8250: Add new 8250-core based Broadcom STB driver") which is included in v5.13 and newer. You would want to drop that commit from the 5.12, 5.10 and 5.4 auto-selection.
I'll drop it from 5.12 and older, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 14/114 misc/libmasm/module: Fix two use after free in ibmasm_init_one
In reply to Sasha LevinFrom: Lv Yunlong <[email protected]>
[ Upstream commit 7272b591c4cb9327c43443f67b8fbae7657dd9ae ]
In ibmasm_init_one, it calls ibmasm_init_remote_input_dev(). Inside ibmasm_init_remote_input_dev, mouse_dev and keybd_dev are allocated by input_allocate_device(), and assigned to sp->remote.mouse_dev and sp->remote.keybd_dev respectively.
In the err_free_devices error branch of ibmasm_init_one, mouse_dev and keybd_dev are freed by input_free_device(), and return error. Then the execution runs into error_send_message error branch of ibmasm_init_one, where ibmasm_free_remote_input_dev(sp) is called to unregister the freed sp->remote.mouse_dev and sp->remote.keybd_dev.
My patch add a "error_init_remote" label to handle the error of ibmasm_init_remote_input_dev(), to avoid the uaf bugs.
--- drivers/misc/ibmasm/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/misc/ibmasm/module.c +3 -2
@@ -111,7 +111,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) result =ibmasm_init_remote_input_dev (sp);if (result) {dev_err (sp->dev,"Failed to initialize remote queue\n" ); - goto error_send_message; + goto error_init_remote; } result =ibmasm_send_driver_vpd (sp);
@@ -131,8 +131,9 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)return 0 ; error_send_message: -disable_sp_interrupts (sp->base_address);ibmasm_free_remote_input_dev (sp); +error_init_remote: +disable_sp_interrupts (sp->base_address);free_irq (sp->irq, (void *)sp); error_request_irq:iounmap (sp->base_address);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 15/114 misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge
In reply to Sasha LevinFrom: Tong Zhang <[email protected]>
[ Upstream commit 3ce3e45cc333da707d4d6eb433574b990bcc26f5 ]
There is an issue with the ASPM(optional) capability checking function. A device might be attached to root complex directly, in this case, bus->self(bridge) will be NULL, thus priv->parent_pdev is NULL. Since alcor_pci_init_check_aspm(priv->parent_pdev) checks the PCI link's ASPM capability and populate parent_cap_off, which will be used later by alcor_pci_aspm_ctrl() to dynamically turn on/off device, what we can do here is to avoid checking the capability if we are on the root complex. This will make pdev_cap_off 0 and alcor_pci_aspm_ctrl() will simply return when bring called, effectively disable ASPM for the device.
[ 1.246492] BUG: kernel NULL pointer dereference, address: 00000000000000c0 [ 1.248731] RIP: 0010:pci_read_config_byte+0x5/0x40 [ 1.253998] Call Trace: [ 1.254131] ? alcor_pci_find_cap_offset.isra.0+0x3a/0x100 [alcor_pci] [ 1.254476] alcor_pci_probe+0x169/0x2d5 [alcor_pci]
--- drivers/misc/cardreader/alcor_pci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/misc/cardreader/alcor_pci.c +7 -1
@@ -139,7 +139,13 @@ static void alcor_pci_init_check_aspm(struct alcor_pci_priv *priv)u32 val32; priv->pdev_cap_off =alcor_pci_find_cap_offset (priv, priv->pdev); - priv->parent_cap_off =alcor_pci_find_cap_offset (priv, +/* +* A device might be attached to root complex directly and +* priv->parent_pdev will be NULL. In this case we don't check its +* capability and disable ASPM completely. +*/ +if (!priv->parent_pdev) + priv->parent_cap_off =alcor_pci_find_cap_offset (priv, priv->parent_pdev);if ((priv->pdev_cap_off ==0 ) || (priv->parent_cap_off ==0 )) {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 16/114 ASoC: intel/boards: add missing MODULE_DEVICE_TABLE
In reply to Sasha LevinFrom: Zou Wei <[email protected]>
[ Upstream commit a75e5cdf4dd1307bb1541edbb0c008f40896644c ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- sound/soc/intel/boards/sof_da7219_max98373.c | 1 + sound/soc/intel/boards/sof_rt5682.c | 1 + 2 files changed, 2 insertions(+)
sound/soc/intel/boards/sof_da7219_max98373.c +1 -0
@@ -440,6 +440,7 @@ static const struct platform_device_id board_ids[] = { }, { } }; +MODULE_DEVICE_TABLE (platform, board_ids);static struct platform_driver audio = { .probe = audio_probe,
sound/soc/intel/boards/sof_rt5682.c +1 -0
@@ -968,6 +968,7 @@ static const struct platform_device_id board_ids[] = { }, { } }; +MODULE_DEVICE_TABLE (platform, board_ids);static struct platform_driver sof_audio = { .probe = sof_audio_probe,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 17/114 partitions: msdos: fix one-byte get_unaligned()
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1b1774998b2dec837a57d729d1a22e5eb2d6d206 ]
A simplification of get_unaligned() clashes with callers that pass in a character pointer, causing a harmless warning like:
block/partitions/msdos.c: In function 'msdos_partition':include/asm-generic/unaligned.h:13:22: warning: 'packed' attribute ignored for field of type 'u8' {aka 'unsigned char'} [-Wattributes]
Remove the SYS_IND() macro with the get_unaligned() call and just use the ->ind field directly.
--- block/partitions/ldm.c | 2 +- block/partitions/ldm.h | 3 --- block/partitions/msdos.c | 24 +++++++++++------------- 3 files changed, 12 insertions(+), 17 deletions(-)
block/partitions/ldm.c +1 -1
@@ -510,7 +510,7 @@ static bool ldm_validate_partition_table(struct parsed_partitions *state) p = (struct msdos_partition *)(data +0x01BE );for (i =0 ; i <4 ; i++, p++) -if (SYS_IND (p) ==LDM_PARTITION ) { +if (p->sys_ind ==LDM_PARTITION ) { result = true;break ; }
block/partitions/ldm.h +0 -3
@@ -84,9 +84,6 @@ struct parsed_partitions;#define TOC_BITMAP1 "config"/* Names of the two defined */ #define TOC_BITMAP2 "log"/* bitmaps in the TOCBLOCK. */ -/* Borrowed from msdos.c */ -#define SYS_IND (p) (get_unaligned(&(p)->sys_ind)) -struct frag {/* VBLK Fragment handling */ struct list_head list;u32 group;
block/partitions/msdos.c +11 -13
@@ -38,8 +38,6 @@*/ #include <asm/unaligned.h> -#define SYS_IND (p) get_unaligned(&p->sys_ind) -static inline sector_t nr_sects (struct msdos_partition *p) {return (sector_t )get_unaligned_le32 (&p->nr_sects);
@@ -52,9 +50,9 @@ static inline sector_t start_sect(struct msdos_partition *p)static inline int is_extended_partition (struct msdos_partition *p) { -return (SYS_IND (p) ==DOS_EXTENDED_PARTITION || -SYS_IND (p) ==WIN98_EXTENDED_PARTITION || -SYS_IND (p) ==LINUX_EXTENDED_PARTITION ); +return (p->sys_ind ==DOS_EXTENDED_PARTITION || + p->sys_ind ==WIN98_EXTENDED_PARTITION || + p->sys_ind ==LINUX_EXTENDED_PARTITION ); }#define MSDOS_LABEL_MAGIC1 0x55
@@ -193,7 +191,7 @@ static void parse_extended(struct parsed_partitions *state,put_partition (state, state->next, next, size);set_info (state, state->next, disksig); -if (SYS_IND (p) ==LINUX_RAID_PARTITION ) +if (p->sys_ind ==LINUX_RAID_PARTITION ) state->parts[state->next].flags =ADDPART_FLAG_RAID ; loopct =0 ;if (++state->next == state->limit)
@@ -546,7 +544,7 @@ static void parse_minix(struct parsed_partitions *state,* a secondary MBR describing its subpartitions, or * the normal boot sector. */ if (msdos_magic_present (data +510 ) && -SYS_IND (p) ==MINIX_PARTITION ) {/* subpartition table present */ + p->sys_ind ==MINIX_PARTITION ) {/* subpartition table present */ char tmp[1 +BDEVNAME_SIZE +10 +9 +1 ];snprintf (tmp,sizeof (tmp)," %s%d: <minix:" , state->name, origin);
@@ -555,7 +553,7 @@ static void parse_minix(struct parsed_partitions *state,if (state->next == state->limit)break ;/* add each partition in use */ -if (SYS_IND (p) ==MINIX_PARTITION ) +if (p->sys_ind ==MINIX_PARTITION )put_partition (state, state->next++,start_sect (p),nr_sects (p)); }
@@ -643,7 +641,7 @@ int msdos_partition(struct parsed_partitions *state) p = (struct msdos_partition *) (data +0x1be );for (slot =1 ; slot <=4 ; slot++, p++) {/* If this is an EFI GPT disk, msdos should ignore it. */ -if (SYS_IND (p) ==EFI_PMBR_OSTYPE_EFI_GPT ) { +if (p->sys_ind ==EFI_PMBR_OSTYPE_EFI_GPT ) {put_dev_sector (sect);return 0 ; }
@@ -685,11 +683,11 @@ int msdos_partition(struct parsed_partitions *state) }put_partition (state, slot, start, size);set_info (state, slot, disksig); -if (SYS_IND (p) ==LINUX_RAID_PARTITION ) +if (p->sys_ind ==LINUX_RAID_PARTITION ) state->parts[slot].flags =ADDPART_FLAG_RAID ; -if (SYS_IND (p) ==DM6_PARTITION ) +if (p->sys_ind ==DM6_PARTITION )strlcat (state->pp_buf,"[DM]" ,PAGE_SIZE ); -if (SYS_IND (p) ==EZD_PARTITION ) +if (p->sys_ind ==EZD_PARTITION )strlcat (state->pp_buf,"[EZD]" ,PAGE_SIZE ); }
@@ -698,7 +696,7 @@ int msdos_partition(struct parsed_partitions *state)/* second pass - output for each on a separate line */ p = (struct msdos_partition *) (0x1be + data);for (slot =1 ; slot <=4 ; slot++, p++) { -unsigned char id =SYS_IND (p); +unsigned char id = p->sys_ind;int n;if (!nr_sects (p))
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 18/114 iio: imu: st_lsm6dsx: correct ODR in header
In reply to Sasha LevinFrom: Sean Nyekjaer <[email protected]>
[ Upstream commit f7d5c18a8c371c306d73757547c2e0d6cfc764b3 ]
Fix wrongly stated 13 Hz ODR for accelerometers, the correct ODR is 12.5 Hz
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +3 -3
@@ -15,19 +15,19 @@* * Supported sensors: * - LSM6DS3: -* - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416 +* - Accelerometer/Gyroscope supported ODR [Hz]: 12.5, 26, 52, 104, 208, 416 * - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16 * - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000 * - FIFO size: 8KB * * - LSM6DS3H/LSM6DSL/LSM6DSM/ISM330DLC/LSM6DS3TR-C: -* - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416 +* - Accelerometer/Gyroscope supported ODR [Hz]: 12.5, 26, 52, 104, 208, 416 * - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16 * - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000 * - FIFO size: 4KB * * - LSM6DSO/LSM6DSOX/ASM330LHH/LSM6DSR/ISM330DHCX/LSM6DST/LSM6DSOP: -* - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416, +* - Accelerometer/Gyroscope supported ODR [Hz]: 12.5, 26, 52, 104, 208, 416, * 833 * - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16 * - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 19/114 iio: gyro: fxa21002c: Balance runtime pm + use pm_runtime_resume_and_get().
In reply to Sasha LevinFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 41120ebbb1eb5e9dec93320e259d5b2c93226073 ]
In both the probe() error path and remove() pm_runtime_put_noidle() is called which will decrement the runtime pm reference count. However, there is no matching function to have raised the reference count. Not this isn't a fix as the runtime pm core will stop the reference count going negative anyway.
An alternative would have been to raise the count in these paths, but it is not clear why that would be necessary.
Whilst we are here replace some boilerplate with pm_runtime_resume_and_get() Found using coccicheck script under review at:
https://lore.kernel.org/lkml/[email protected]/
--- drivers/iio/gyro/fxas21002c_core.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/iio/gyro/fxas21002c_core.c +1 -10
@@ -366,14 +366,7 @@ static int fxas21002c_write(struct fxas21002c_data *data,static int fxas21002c_pm_get (struct fxas21002c_data *data) { -struct device *dev =regmap_get_device (data->regmap); -int ret; - - ret =pm_runtime_get_sync (dev); -if (ret <0 ) -pm_runtime_put_noidle (dev); - -return ret; +return pm_runtime_resume_and_get (regmap_get_device (data->regmap)); }static int fxas21002c_pm_put (struct fxas21002c_data *data)
@@ -1004,7 +997,6 @@ int fxas21002c_core_probe(struct device *dev, struct regmap *regmap, int irq, pm_disable:pm_runtime_disable (dev);pm_runtime_set_suspended (dev); -pm_runtime_put_noidle (dev);return ret; }
@@ -1018,7 +1010,6 @@ void fxas21002c_core_remove(struct device *dev)pm_runtime_disable (dev);pm_runtime_set_suspended (dev); -pm_runtime_put_noidle (dev); }EXPORT_SYMBOL_GPL (fxas21002c_core_remove);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 20/114 iio: magn: bmc150: Balance runtime pm + use pm_runtime_resume_and_get()
In reply to Sasha LevinFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 264da512431495e542fcaf56ffe75e7df0e7db74 ]
probe() error paths after runtime pm is enabled, should disable it. remove() should not call pm_runtime_put_noidle() as there is no matching get() to have raised the reference count. This case has no affect a the runtime pm core protects against going negative.
Whilst here use pm_runtime_resume_and_get() to tidy things up a little. coccicheck script didn't get this one due to complex code structure so found by inspection.
--- drivers/iio/magnetometer/bmc150_magn.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/iio/magnetometer/bmc150_magn.c +4 -6
@@ -262,7 +262,7 @@ static int bmc150_magn_set_power_state(struct bmc150_magn_data *data, bool on)int ret;if (on) { - ret =pm_runtime_get_sync (data->dev); + ret =pm_runtime_resume_and_get (data->dev); }else {pm_runtime_mark_last_busy (data->dev); ret =pm_runtime_put_autosuspend (data->dev);
@@ -271,9 +271,6 @@ static int bmc150_magn_set_power_state(struct bmc150_magn_data *data, bool on)if (ret <0 ) {dev_err (data->dev,"failed to change power state to %d\n" , on); -if (on) -pm_runtime_put_noidle (data->dev); -return ret; }#endif
@@ -963,12 +960,14 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap, ret =iio_device_register (indio_dev);if (ret <0 ) {dev_err (dev,"unable to register iio device\n" ); - goto err_buffer_cleanup; + goto err_disable_runtime_pm; }dev_dbg (dev,"Registered device %s\n" , name);return 0 ; +err_disable_runtime_pm: +pm_runtime_disable (dev); err_buffer_cleanup:iio_triggered_buffer_cleanup (indio_dev); err_free_irq:
@@ -992,7 +991,6 @@ int bmc150_magn_remove(struct device *dev)pm_runtime_disable (dev);pm_runtime_set_suspended (dev); -pm_runtime_put_noidle (dev);iio_triggered_buffer_cleanup (indio_dev);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 21/114 ALSA: usx2y: Avoid camelCase
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit bae3ce4942980d5f7b2b9855f4a2db0c00f9dfbd ]
For improving readability, convert camelCase fields, variables and functions to the plain names with underscore. Also align the macros to be capital letters.
All done via sed, no functional changes.
Note that you'll still see many coding style issues even after this patch; the fixes will follow.
--- sound/usb/usx2y/usX2Yhwdep.c | 56 ++-- sound/usb/usx2y/usX2Yhwdep.h | 2 +- sound/usb/usx2y/usbus428ctldefs.h | 102 +++---- sound/usb/usx2y/usbusx2y.c | 218 +++++++-------- sound/usb/usx2y/usbusx2y.h | 58 ++-- sound/usb/usx2y/usbusx2yaudio.c | 448 +++++++++++++++--------------- sound/usb/usx2y/usx2yhwdeppcm.c | 410 +++++++++++++-------------- sound/usb/usx2y/usx2yhwdeppcm.h | 4 +- 8 files changed, 649 insertions(+), 649 deletions(-)
sound/usb/usx2y/usX2Yhwdep.c +28 -28
@@ -29,7 +29,7 @@ static vm_fault_t snd_us428ctls_vm_fault(struct vm_fault *vmf) vmf->pgoff); offset = vmf->pgoff <<PAGE_SHIFT ; - vaddr = (char *)((struct usX2Ydev *)vmf->vma->vm_private_data)->us428ctls_sharedmem + offset; + vaddr = (char *)((struct usx2ydev *)vmf->vma->vm_private_data)->us428ctls_sharedmem + offset; page =virt_to_page (vaddr);get_page (page); vmf->page = page;
@@ -47,7 +47,7 @@ static const struct vm_operations_struct us428ctls_vm_ops = {static int snd_us428ctls_mmap (struct snd_hwdep * hw,struct file *filp,struct vm_area_struct *area) {unsigned long size = (unsigned long )(area->vm_end - area->vm_start); -struct usX2Ydev *us428 = hw->private_data; +struct usx2ydev *us428 = hw->private_data;// FIXME this hwdep interface is used twice: fpga download and mmap for controlling Lights etc. Maybe better using 2 hwdep devs? // so as long as the device isn't fully initialised yet we return -EBUSY here.
@@ -66,7 +66,7 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct vif (!us428->us428ctls_sharedmem)return -ENOMEM ;memset (us428->us428ctls_sharedmem,-1 ,sizeof (struct us428ctls_sharedmem )); - us428->us428ctls_sharedmem->CtlSnapShotLast =-2 ; + us428->us428ctls_sharedmem->ctl_snapshot_last =-2 ; } area->vm_ops = &us428ctls_vm_ops; area->vm_flags |=VM_DONTEXPAND |VM_DONTDUMP ;
@@ -77,21 +77,21 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct vstatic __poll_t snd_us428ctls_poll (struct snd_hwdep *hw,struct file *file,poll_table *wait) {__poll_t mask =0 ; -struct usX2Ydev *us428 = hw->private_data; +struct usx2ydev *us428 = hw->private_data;struct us428ctls_sharedmem *shm = us428->us428ctls_sharedmem;if (us428->chip_status &USX2Y_STAT_CHIP_HUP )return EPOLLHUP ;poll_wait (file, &us428->us428ctls_wait_queue_head, wait); -if (shm !=NULL && shm->CtlSnapShotLast != shm->CtlSnapShotRed) +if (shm !=NULL && shm->ctl_snapshot_last != shm->ctl_snapshot_red) mask |=EPOLLIN ;return mask; } -static int snd_usX2Y_hwdep_dsp_status (struct snd_hwdep *hw, +static int snd_usx2y_hwdep_dsp_status (struct snd_hwdep *hw,struct snd_hwdep_dsp_status *info) {static const char *const type_ids[USX2Y_TYPE_NUMS ] = {
@@ -99,7 +99,7 @@ static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw, [USX2Y_TYPE_224] = "us224", [USX2Y_TYPE_428] = "us428", }; -struct usX2Ydev *us428 = hw->private_data; +struct usx2ydev *us428 = hw->private_data;int id =-1 ;switch (le16_to_cpu (us428->dev->descriptor.idProduct)) {
@@ -124,7 +124,7 @@ static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw, } -static int usX2Y_create_usbmidi (struct snd_card *card) +static int usx2y_create_usbmidi (struct snd_card *card) {static const struct snd_usb_midi_endpoint_info quirk_data_1 = { .out_ep =0x06 ,
@@ -152,28 +152,28 @@ static int usX2Y_create_usbmidi(struct snd_card *card) .type = QUIRK_MIDI_FIXED_ENDPOINT, .data = &quirk_data_2 }; -struct usb_device *dev =usX2Y (card)->dev; +struct usb_device *dev =usx2y (card)->dev;struct usb_interface *iface =usb_ifnum_to_if (dev,0 );const struct snd_usb_audio_quirk *quirk =le16_to_cpu (dev->descriptor.idProduct) ==USB_ID_US428 ? &quirk_2 : &quirk_1; -snd_printdd ("usX2Y_create_usbmidi \n" ); -return snd_usbmidi_create (card, iface, &usX2Y (card)->midi_list, quirk); +snd_printdd ("usx2y_create_usbmidi \n" ); +return snd_usbmidi_create (card, iface, &usx2y (card)->midi_list, quirk); } -static int usX2Y_create_alsa_devices (struct snd_card *card) +static int usx2y_create_alsa_devices (struct snd_card *card) {int err; do { - if ((err = usX2Y_create_usbmidi(card)) < 0) { - snd_printk(KERN_ERR "usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err); + if ((err = usx2y_create_usbmidi(card)) < 0) { + snd_printk(KERN_ERR "usx2y_create_alsa_devices: usx2y_create_usbmidi error %i \n", err); break; } - if ((err = usX2Y_audio_create(card)) < 0) + if ((err = usx2y_audio_create(card)) < 0) break; - if ((err = usX2Y_hwdep_pcm_new(card)) < 0) + if ((err = usx2y_hwdep_pcm_new(card)) < 0) break; if ((err = snd_card_register(card)) < 0) break;
@@ -182,10 +182,10 @@ static int usX2Y_create_alsa_devices(struct snd_card *card)return err; } -static int snd_usX2Y_hwdep_dsp_load (struct snd_hwdep *hw, +static int snd_usx2y_hwdep_dsp_load (struct snd_hwdep *hw,struct snd_hwdep_dsp_image *dsp) { -struct usX2Ydev *priv = hw->private_data; +struct usx2ydev *priv = hw->private_data;struct usb_device * dev = priv->dev;int lret, err;char *buf;
@@ -206,19 +206,19 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,return err;if (dsp->index ==1 ) {msleep (250 );// give the device some time - err =usX2Y_AsyncSeq04_init (priv); + err =usx2y_async_seq04_init (priv);if (err) { -snd_printk (KERN_ERR "usX2Y_AsyncSeq04_init error \n" ); +snd_printk (KERN_ERR "usx2y_async_seq04_init error \n" );return err; } - err =usX2Y_In04_init (priv); + err =usx2y_in04_init (priv);if (err) { -snd_printk (KERN_ERR "usX2Y_In04_init error \n" ); +snd_printk (KERN_ERR "usx2y_in04_init error \n" );return err; } - err =usX2Y_create_alsa_devices (hw->card); + err =usx2y_create_alsa_devices (hw->card);if (err) { -snd_printk (KERN_ERR "usX2Y_create_alsa_devices error %i \n" , err); +snd_printk (KERN_ERR "usx2y_create_alsa_devices error %i \n" , err);snd_card_free (hw->card);return err; }
@@ -229,7 +229,7 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw, } -int usX2Y_hwdep_new (struct snd_card *card,struct usb_device * device) +int usx2y_hwdep_new (struct snd_card *card,struct usb_device * device) {int err;struct snd_hwdep *hw;
@@ -238,9 +238,9 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)return err; hw->iface =SNDRV_HWDEP_IFACE_USX2Y ; - hw->private_data =usX2Y (card); - hw->ops.dsp_status = snd_usX2Y_hwdep_dsp_status; - hw->ops.dsp_load = snd_usX2Y_hwdep_dsp_load; + hw->private_data =usx2y (card); + hw->ops.dsp_status = snd_usx2y_hwdep_dsp_status; + hw->ops.dsp_load = snd_usx2y_hwdep_dsp_load; hw->ops.mmap = snd_us428ctls_mmap; hw->ops.poll = snd_us428ctls_poll; hw->exclusive =1 ;
sound/usb/usx2y/usX2Yhwdep.h +1 -1
@@ -2,6 +2,6 @@#ifndef USX2YHWDEP_H #define USX2YHWDEP_H -int usX2Y_hwdep_new (struct snd_card *card,struct usb_device * device); +int usx2y_hwdep_new (struct snd_card *card,struct usb_device * device);#endif
sound/usb/usx2y/usbus428ctldefs.h +51 -51
132 lines not on this page · raw message
sound/usb/usx2y/usbusx2y.c +109 -109
399 lines not on this page · raw message
sound/usb/usx2y/usbusx2y.h +29 -29
102 lines not on this page · raw message
sound/usb/usx2y/usbusx2yaudio.c +224 -224
952 lines not on this page · raw message
sound/usb/usx2y/usx2yhwdeppcm.c +205 -205
821 lines not on this page · raw message
sound/usb/usx2y/usx2yhwdeppcm.h +2 -2
@@ -4,7 +4,7 @@#define MAXSTRIDE 3#define SSS (((MAXPACK*MAXBUFFERMS*MAXSTRIDE + 4096) / 4096) * 4096) -struct snd_usX2Y_hwdep_pcm_shm { +struct snd_usx2y_hwdep_pcm_shm {char playback[SSS ];char capture0x8[SSS ];char capture0xA[SSS ];
@@ -20,4 +20,4 @@ struct snd_usX2Y_hwdep_pcm_shm {int capture_iso_start; }; -int usX2Y_hwdep_pcm_new (struct snd_card *card); +int usx2y_hwdep_pcm_new (struct snd_card *card);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 22/114 ALSA: usx2y: Don't call free_pages_exact() with NULL address
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit cae0cf651adccee2c3f376e78f30fbd788d0829f ]
Unlike some other functions, we can't pass NULL pointer to free_pages_exact(). Add a proper NULL check for avoiding possible Oops.
--- sound/usb/usx2y/usb_stream.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/usb/usx2y/usb_stream.c +5 -2
@@ -142,8 +142,11 @@ void usb_stream_free(struct usb_stream_kernel *sk)if (!s)return ; -free_pages_exact (sk->write_page, s->write_size); - sk->write_page =NULL ; +if (sk->write_page) { +free_pages_exact (sk->write_page, s->write_size); + sk->write_page =NULL ; + } +free_pages_exact (s, s->read_size); sk->s =NULL ; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 23/114 Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro"
In reply to Sasha LevinFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit 5d6fb80a142b5994355ce675c517baba6089d199 ]
This reverts commit 0edabdfe89581669609eaac5f6a8d0ae6fe95e7f.
I've explained that optional FireWire card for d.2 is also built-in to d.2 Pro, however it's wrong. The optional card uses DM1000 ASIC and has 'Mackie DJ Mixer' in its model name of configuration ROM. On the other hand, built-in FireWire card for d.2 Pro and d.4 Pro uses OXFW971 ASIC and has 'd.Pro' in its model name according to manuals and user experiences. The former card is not the card for d.2 Pro. They are similar in appearance but different internally.
--- sound/firewire/Kconfig | 4 ++-- sound/firewire/bebob/bebob.c | 2 +- sound/firewire/oxfw/oxfw.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
sound/firewire/Kconfig +2 -2
@@ -38,7 +38,7 @@ config SND_OXFW * Mackie(Loud) Onyx 1640i (former model) * Mackie(Loud) Onyx Satellite * Mackie(Loud) Tapco Link.Firewire - * Mackie(Loud) d.4 pro + * Mackie(Loud) d.2 pro/d.4 pro (built-in FireWire card with OXFW971 ASIC) * Mackie(Loud) U.420/U.420d * TASCAM FireOne * Stanton Controllers & Systems 1 Deck/Mixer
@@ -84,7 +84,7 @@ config SND_BEBOB * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394 * BridgeCo RDAudio1/Audio5 * Mackie Onyx 1220/1620/1640 (FireWire I/O Card) - * Mackie d.2 (FireWire Option) and d.2 Pro + * Mackie d.2 (optional FireWire card with DM1000 ASIC) * Stanton FinalScratch 2 (ScratchAmp) * Tascam IF-FW/DM * Behringer XENIX UFX 1204/1604
sound/firewire/bebob/bebob.c +1 -1
@@ -387,7 +387,7 @@ static const struct ieee1394_device_id bebob_id_table[] = {SND_BEBOB_DEV_ENTRY (VEN_BRIDGECO ,0x00010049 , &spec_normal),/* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ SND_BEBOB_DEV_ENTRY (VEN_MACKIE2 ,0x00010065 , &spec_normal), -// Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in). +// Mackie, d.2 (optional Firewire card with DM1000). SND_BEBOB_DEV_ENTRY (VEN_MACKIE1 ,0x00010067 , &spec_normal),/* Stanton, ScratchAmp */ SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),
sound/firewire/oxfw/oxfw.c +1 -1
@@ -355,7 +355,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = {* Onyx-i series (former models): 0x081216 * Mackie Onyx Satellite: 0x00200f * Tapco LINK.firewire 4x6: 0x000460 -* d.4 pro: Unknown +* d.2 pro/d.4 pro (built-in card): Unknown * U.420: Unknown * U.420d: Unknown */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 24/114 usb: common: usb-conn-gpio: fix NULL pointer dereference of charger
In reply to Sasha LevinFrom: Chunfeng Yun <[email protected]>
[ Upstream commit 880287910b1892ed2cb38977893b947382a09d21 ]
When power on system with OTG cable, IDDIG's interrupt arises before the charger registration, it will cause a NULL pointer dereference, fix the issue by registering the power supply before requesting IDDIG/VBUS irq.
--- drivers/usb/common/usb-conn-gpio.c | 44 ++++++++++++++++++------------ 1 file changed, 26 insertions(+), 18 deletions(-)
drivers/usb/common/usb-conn-gpio.c +26 -18
@@ -149,14 +149,32 @@ static int usb_charger_get_property(struct power_supply *psy,return 0 ; } -static int usb_conn_probe (struct platform_device *pdev) +static int usb_conn_psy_register (struct usb_conn_info *info) { -struct device *dev = &pdev->dev; -struct power_supply_desc *desc; -struct usb_conn_info *info; +struct device *dev = info->dev; +struct power_supply_desc *desc = &info->desc;struct power_supply_config cfg = { .of_node = dev->of_node, }; + + desc->name ="usb-charger" ; + desc->properties = usb_charger_properties; + desc->num_properties =ARRAY_SIZE (usb_charger_properties); + desc->get_property = usb_charger_get_property; + desc->type =POWER_SUPPLY_TYPE_USB ; + cfg.drv_data = info; + + info->charger =devm_power_supply_register (dev, desc, &cfg); +if (IS_ERR (info->charger)) +dev_err (dev,"Unable to register charger\n" ); + +return PTR_ERR_OR_ZERO (info->charger); +} + +static int usb_conn_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct usb_conn_info *info;bool need_vbus = true;int ret =0 ;
@@ -218,6 +236,10 @@ static int usb_conn_probe(struct platform_device *pdev)return PTR_ERR (info->role_sw); } + ret =usb_conn_psy_register (info); +if (ret) + goto put_role_sw; +if (info->id_gpiod) { info->id_irq =gpiod_to_irq (info->id_gpiod);if (info->id_irq <0 ) {
@@ -252,20 +274,6 @@ static int usb_conn_probe(struct platform_device *pdev) } } - desc = &info->desc; - desc->name ="usb-charger" ; - desc->properties = usb_charger_properties; - desc->num_properties =ARRAY_SIZE (usb_charger_properties); - desc->get_property = usb_charger_get_property; - desc->type =POWER_SUPPLY_TYPE_USB ; - cfg.drv_data = info; - - info->charger =devm_power_supply_register (dev, desc, &cfg); -if (IS_ERR (info->charger)) { -dev_err (dev,"Unable to register charger\n" ); -return PTR_ERR (info->charger); - } -platform_set_drvdata (pdev, info);/* Perform initial detection */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 25/114 ASoC: SOF: topology: fix assignment to use le32_to_cpu
In reply to Sasha LevinFrom: Jaska Uimonen <[email protected]>
[ Upstream commit ccaea61a8d1b8180cc3c470e383381884e4bc1f2 ]
Fix sparse warning by using le32_to_cpu.
--- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/topology.c +1 -1
@@ -3335,7 +3335,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index,/* Copy common data to all config ipc structs */ for (i =0 ; i < num_conf; i++) { config[i].hdr.cmd =SOF_IPC_GLB_DAI_MSG |SOF_IPC_DAI_CONFIG ; - config[i].format = hw_config[i].fmt; + config[i].format =le32_to_cpu (hw_config[i].fmt); config[i].type = common_config.type; config[i].dai_index = common_config.dai_index; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 26/114 w1: ds2438: fixing bug that would always get page0
In reply to Sasha LevinFrom: Luiz Sampaio <[email protected]>
[ Upstream commit 1f5e7518f063728aee0679c5086b92d8ea429e11 ]
The purpose of the w1_ds2438_get_page function is to get the register values at the page passed as the pageno parameter. However, the page0 was hardcoded, such that the function always returned the page0 contents. Fixed so that the function can retrieve any page.
--- drivers/w1/slaves/w1_ds2438.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/w1/slaves/w1_ds2438.c +2 -2
@@ -62,13 +62,13 @@ static int w1_ds2438_get_page(struct w1_slave *sl, int pageno, u8 *buf)if (w1_reset_select_slave (sl))continue ; w1_buf[0 ] =W1_DS2438_RECALL_MEMORY ; - w1_buf[1 ] =0x00 ; + w1_buf[1 ] = (u8 )pageno;w1_write_block (sl->master, w1_buf,2 );if (w1_reset_select_slave (sl))continue ; w1_buf[0 ] =W1_DS2438_READ_SCRATCH ; - w1_buf[1 ] =0x00 ; + w1_buf[1 ] = (u8 )pageno;w1_write_block (sl->master, w1_buf,2 ); count =w1_read_block (sl->master, buf,DS2438_PAGE_SIZE +1 );
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 27/114 ASoC: Intel: sof_sdw: add quirk support for Brya and BT-offload
In reply to Sasha LevinFrom: Vamshi Krishna Gopal <[email protected]>
[ Upstream commit 03effde3a2ea1d82c4dd6b634fc6174545d2c34f ]
Brya is another ADL-P product.
AlderLake has support for Bluetooth audio offload capability. Enable the BT-offload quirk for ADL-P Brya and the Intel RVP.
--- sound/soc/intel/boards/sof_sdw.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
sound/soc/intel/boards/sof_sdw.c +15 -1
@@ -197,7 +197,21 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 | SOF_SDW_TGL_HDMI | SOF_RT715_DAI_ID_FIX | - SOF_SDW_PCH_DMIC), + SOF_SDW_PCH_DMIC | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + DMI_MATCH(DMI_PRODUCT_NAME, "Brya"), + }, + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + SOF_SDW_PCH_DMIC | + SOF_SDW_FOUR_SPK | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), }, {} };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 28/114 scsi: arcmsr: Fix doorbell status being updated late on ARC-1886
In reply to Sasha LevinFrom: ching Huang <[email protected]>
[ Upstream commit d9a231226f28261a787535e08d0c78669e1ad010 ]
It is possible for the IOP to be delayed in updating the doorbell status. The doorbell status should not be 0 so loop until the value changes.
--- drivers/scsi/arcmsr/arcmsr_hba.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/scsi/arcmsr/arcmsr_hba.c +9 -2
@@ -2419,10 +2419,17 @@ static void arcmsr_hbaD_doorbell_isr(struct AdapterControlBlock *pACB)static void arcmsr_hbaE_doorbell_isr (struct AdapterControlBlock *pACB) { -uint32_t outbound_doorbell, in_doorbell, tmp; +uint32_t outbound_doorbell, in_doorbell, tmp, i;struct MessageUnit_E __iomem *reg = pACB->pmuE; - in_doorbell =readl (®->iobound_doorbell); +if (pACB->adapter_type ==ACB_ADAPTER_TYPE_F ) { +for (i =0 ; i <5 ; i++) { + in_doorbell =readl (®->iobound_doorbell); +if (in_doorbell !=0 ) +break ; + } + }else + in_doorbell =readl (®->iobound_doorbell); outbound_doorbell = in_doorbell ^ pACB->in_doorbell; do { writel(0, ®->host_int_status); /* clear interrupt */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 29/114 scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw()
In reply to Sasha LevinFrom: Sergey Shtylyov <[email protected]>
[ Upstream commit ab17122e758ef68fb21033e25c041144067975f5 ]
After commit 6c11dc060427 ("scsi: hisi_sas: Fix IRQ checks") we have the error codes returned by platform_get_irq() ready for the propagation upsream in interrupt_init_v1_hw() -- that will fix still broken deferred probing. Let's propagate the error codes from devm_request_irq() as well since I don't see the reason to override them with -ENOENT...
--- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +6 -6
@@ -1649,7 +1649,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)if (irq <0 ) {dev_err (dev,"irq init: fail map phy interrupt %d\n" , idx); -return -ENOENT ; +return irq; } rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,
@@ -1657,7 +1657,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)if (rc) {dev_err (dev,"irq init: could not request phy interrupt %d, rc=%d\n" , irq, rc); -return -ENOENT ; +return rc; } } }
@@ -1668,7 +1668,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)if (irq <0 ) {dev_err (dev,"irq init: could not map cq interrupt %d\n" , idx); -return -ENOENT ; +return irq; } rc = devm_request_irq(dev, irq, cq_interrupt_v1_hw, 0,
@@ -1676,7 +1676,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)if (rc) {dev_err (dev,"irq init: could not request cq interrupt %d, rc=%d\n" , irq, rc); -return -ENOENT ; +return rc; } }
@@ -1686,7 +1686,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)if (irq <0 ) {dev_err (dev,"irq init: could not map fatal interrupt %d\n" , idx); -return -ENOENT ; +return irq; } rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,
@@ -1694,7 +1694,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)if (rc) {dev_err (dev,"irq init: could not request fatal interrupt %d, rc=%d\n" , irq, rc); -return -ENOENT ; +return rc; } }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 30/114 scsi: lpfc: Fix "Unexpected timeout" error in direct attach topology
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit e30d55137edef47434c40d7570276a0846fe922c ]
An 'unexpected timeout' message may be seen in a point-2-point topology. The message occurs when a PLOGI is received before the driver is notified of FLOGI completion. The FLOGI completion failure causes discovery to be triggered for a second time. The discovery timer is restarted but no new discovery activity is initiated, thus the timeout message eventually appears.
In point-2-point, when discovery has progressed before the FLOGI completion is processed, it is not a failure. Add code to FLOGI completion to detect that discovery has progressed and exit the FLOGI handling (noop'ing it).
--- drivers/scsi/lpfc/lpfc_els.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +9 -0
@@ -1175,6 +1175,15 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, phba->fcf.fcf_redisc_attempted =0 ;/* reset */ goto out; } + }else if (vport->port_state >LPFC_FLOGI && + vport->fc_flag &FC_PT2PT ) { +/* +* In a p2p topology, it is possible that discovery has +* already progressed, and this completion can be ignored. +* Recheck the indicated topology. +*/ +if (!sp->cmn.fPort) + goto out; } flogifail:
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 31/114 scsi: lpfc: Fix crash when lpfc_sli4_hba_setup() fails to initialize the SGLs
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit 5aa615d195f1e142c662cb2253f057c9baec7531 ]
The driver is encountering a crash in lpfc_free_iocb_list() while performing initial attachment.
Code review found this to be an errant failure path that was taken, jumping to a tag that then referenced structures that were uninitialized.
Fix the failure path.
--- drivers/scsi/lpfc/lpfc_sli.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +3 -2
@@ -7959,7 +7959,7 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)"0393 Error %d during rpi post operation\n" , rc); rc = -ENODEV ; - goto out_destroy_queue; + goto out_free_iocblist; }lpfc_sli4_node_prep (phba);
@@ -8125,8 +8125,9 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba) out_unset_queue:/* Unset all the queues set up in this routine when error out */ lpfc_sli4_queue_unset (phba); -out_destroy_queue: +out_free_iocblist:lpfc_free_iocb_list (phba); +out_destroy_queue:lpfc_sli4_queue_destroy (phba); out_stop_timers:lpfc_stop_hba_timers (phba);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 32/114 scsi: core: Cap scsi_host cmd_per_lun at can_queue
In reply to Sasha LevinFrom: John Garry <[email protected]>
[ Upstream commit ea2f0f77538c50739b9fb4de4700cee5535e1f77 ]
The sysfs handling function sdev_store_queue_depth() enforces that the sdev queue depth cannot exceed shost can_queue. The initial sdev queue depth comes from shost cmd_per_lun. However, the LLDD may manually set cmd_per_lun to be larger than can_queue, which leads to an initial sdev queue depth greater than can_queue.
Such an issue was reported in [0], which caused a hang. That has since been fixed in commit fc09acb7de31 ("scsi: scsi_debug: Fix cmd_per_lun, set to max_queue").
Stop this possibly happening for other drivers by capping shost cmd_per_lun at shost can_queue.
[0] https://lore.kernel.org/linux-scsi/YHaez6iN2HHYxYOh@T590/
--- drivers/scsi/hosts.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/hosts.c +3 -0
@@ -220,6 +220,9 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, goto fail; } + shost->cmd_per_lun =min_t (short, shost->cmd_per_lun, + shost->can_queue); + error =scsi_init_sense_cache (shost);if (error) goto fail;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 33/114 ALSA: ac97: fix PM reference leak in ac97_bus_remove()
In reply to Sasha LevinFrom: Yufen Yu <[email protected]>
[ Upstream commit a38e93302ee25b2ca6f4ee76c6c974cf3637985e ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- sound/ac97/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/ac97/bus.c +1 -1
@@ -520,7 +520,7 @@ static int ac97_bus_remove(struct device *dev)struct ac97_codec_driver *adrv =to_ac97_driver (dev->driver);int ret; - ret =pm_runtime_get_sync (dev); + ret =pm_runtime_resume_and_get (dev);if (ret <0 )return ret;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 34/114 ASoC: cs42l42: Fix 1536000 Bit Clock instability
In reply to Sasha LevinFrom: Lucas Tanure <[email protected]>
[ Upstream commit 1c52825c38fc4e44c61ed75a8ae32f5fa580383b ]
The 16 Bits, 2 channels, 48K sample rate use case needs to configure a safer pll_divout during the start of PLL After 800us from the start of PLL the correct pll_divout can be set
Message-Id: <[email protected]>
--- sound/soc/codecs/cs42l42.c | 47 +++++++++++++++++++++++++------------- sound/soc/codecs/cs42l42.h | 2 ++ 2 files changed, 33 insertions(+), 16 deletions(-)
sound/soc/codecs/cs42l42.c +31 -16
@@ -581,6 +581,7 @@ struct cs42l42_pll_params {u8 pll_divout;u32 mclk_int;u8 pll_cal_ratio; +u8 n; };/*
@@ -588,21 +589,21 @@ struct cs42l42_pll_params {* Table 4-5 from the Datasheet */ static const struct cs42l42_pll_params pll_ratio_table[] = { - {1536000 ,0 ,1 ,0x00 ,0x7D ,0x000000 ,0x03 ,0x10 ,12000000 ,125 }, - {2822400 ,0 ,1 ,0x00 ,0x40 ,0x000000 ,0x03 ,0x10 ,11289600 ,128 }, - {3000000 ,0 ,1 ,0x00 ,0x40 ,0x000000 ,0x03 ,0x10 ,12000000 ,128 }, - {3072000 ,0 ,1 ,0x00 ,0x3E ,0x800000 ,0x03 ,0x10 ,12000000 ,125 }, - {4000000 ,0 ,1 ,0x00 ,0x30 ,0x800000 ,0x03 ,0x10 ,12000000 ,96 }, - {4096000 ,0 ,1 ,0x00 ,0x2E ,0xE00000 ,0x03 ,0x10 ,12000000 ,94 }, - {5644800 ,0 ,1 ,0x01 ,0x40 ,0x000000 ,0x03 ,0x10 ,11289600 ,128 }, - {6000000 ,0 ,1 ,0x01 ,0x40 ,0x000000 ,0x03 ,0x10 ,12000000 ,128 }, - {6144000 ,0 ,1 ,0x01 ,0x3E ,0x800000 ,0x03 ,0x10 ,12000000 ,125 }, - {11289600 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,11289600 ,0 }, - {12000000 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,12000000 ,0 }, - {12288000 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,12288000 ,0 }, - {22579200 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,22579200 ,0 }, - {24000000 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,24000000 ,0 }, - {24576000 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,24576000 ,0 } + {1536000 ,0 ,1 ,0x00 ,0x7D ,0x000000 ,0x03 ,0x10 ,12000000 ,125 ,2 }, + {2822400 ,0 ,1 ,0x00 ,0x40 ,0x000000 ,0x03 ,0x10 ,11289600 ,128 ,1 }, + {3000000 ,0 ,1 ,0x00 ,0x40 ,0x000000 ,0x03 ,0x10 ,12000000 ,128 ,1 }, + {3072000 ,0 ,1 ,0x00 ,0x3E ,0x800000 ,0x03 ,0x10 ,12000000 ,125 ,1 }, + {4000000 ,0 ,1 ,0x00 ,0x30 ,0x800000 ,0x03 ,0x10 ,12000000 ,96 ,1 }, + {4096000 ,0 ,1 ,0x00 ,0x2E ,0xE00000 ,0x03 ,0x10 ,12000000 ,94 ,1 }, + {5644800 ,0 ,1 ,0x01 ,0x40 ,0x000000 ,0x03 ,0x10 ,11289600 ,128 ,1 }, + {6000000 ,0 ,1 ,0x01 ,0x40 ,0x000000 ,0x03 ,0x10 ,12000000 ,128 ,1 }, + {6144000 ,0 ,1 ,0x01 ,0x3E ,0x800000 ,0x03 ,0x10 ,12000000 ,125 ,1 }, + {11289600 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,11289600 ,0 ,1 }, + {12000000 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,12000000 ,0 ,1 }, + {12288000 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,12288000 ,0 ,1 }, + {22579200 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,22579200 ,0 ,1 }, + {24000000 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,24000000 ,0 ,1 }, + {24576000 ,1 ,0 ,0 ,0 ,0 ,0 ,0 ,24576000 ,0 ,1 } };static int cs42l42_pll_config (struct snd_soc_component *component)
@@ -738,8 +739,12 @@ static int cs42l42_pll_config(struct snd_soc_component *component)snd_soc_component_update_bits (component,CS42L42_PLL_CTL3 ,CS42L42_PLL_DIVOUT_MASK , - pll_ratio_table[i].pll_divout + (pll_ratio_table[i].pll_divout * pll_ratio_table[i].n) <<CS42L42_PLL_DIVOUT_SHIFT ); +if (pll_ratio_table[i].n !=1 ) + cs42l42->pll_divout = pll_ratio_table[i].pll_divout; +else + cs42l42->pll_divout =0 ; snd_soc_component_update_bits(component, CS42L42_PLL_CAL_RATIO, CS42L42_PLL_CAL_RATIO_MASK,
@@ -894,6 +899,16 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)if ((cs42l42->bclk <11289600 ) && (cs42l42->sclk <11289600 )) {snd_soc_component_update_bits (component,CS42L42_PLL_CTL1 ,CS42L42_PLL_START_MASK ,1 ); + +if (cs42l42->pll_divout) { +usleep_range (CS42L42_PLL_DIVOUT_TIME_US , +CS42L42_PLL_DIVOUT_TIME_US *2 ); +snd_soc_component_update_bits (component,CS42L42_PLL_CTL3 , +CS42L42_PLL_DIVOUT_MASK , + cs42l42->pll_divout << +CS42L42_PLL_DIVOUT_SHIFT ); + } + ret = regmap_read_poll_timeout(cs42l42->regmap, CS42L42_PLL_LOCK_STATUS, regval,
sound/soc/codecs/cs42l42.h +2 -0
@@ -755,6 +755,7 @@#define CS42L42_NUM_SUPPLIES 5#define CS42L42_BOOT_TIME_US 3000 +#define CS42L42_PLL_DIVOUT_TIME_US 800#define CS42L42_CLOCK_SWITCH_DELAY_US 150#define CS42L42_PLL_LOCK_POLL_US 250#define CS42L42_PLL_LOCK_TIMEOUT_US 1250
@@ -777,6 +778,7 @@ struct cs42l42_private {int bclk;u32 sclk;u32 srate; +u8 pll_divout;u8 plug_state;u8 hs_type;u8 ts_inv;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 35/114 tty: serial: 8250: serial_cs: Fix a memory leak in error handling path
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit fad92b11047a748c996ebd6cfb164a63814eeb2e ]
In the probe function, if the final 'serial_config()' fails, 'info' is leaking.
Add a resource handling path to free this memory.
--- drivers/tty/serial/8250/serial_cs.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/serial_cs.c +10 -1
@@ -306,6 +306,7 @@ static int serial_resume(struct pcmcia_device *link)static int serial_probe (struct pcmcia_device *link) {struct serial_info *info; +int ret;dev_dbg (&link->dev,"serial_attach()\n" );
@@ -320,7 +321,15 @@ static int serial_probe(struct pcmcia_device *link)if (do_sound) link->config_flags |=CONF_ENABLE_SPKR ; -return serial_config (link); + ret =serial_config (link); +if (ret) + goto free_info; + +return 0 ; + +free_info: +kfree (info); +return ret; }static void serial_detach (struct pcmcia_device *link)
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 36/114 scsi: mpt3sas: Fix deadlock while cancelling the running firmware event
In reply to Sasha LevinFrom: Suganath Prabu S <[email protected]>
[ Upstream commit e2fac6c44ae06e58ac02181b048af31195883c31 ]
Do not cancel current running firmware event work if the event type is different from MPT3SAS_REMOVE_UNRESPONDING_DEVICES. Otherwise a deadlock can be observed while cancelling the current firmware event work if a hard reset operation is called as part of processing the current event.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +22 -0
@@ -3697,6 +3697,28 @@ _scsih_fw_event_cleanup_queue(struct MPT3SAS_ADAPTER *ioc) ioc->fw_events_cleanup =1 ;while ((fw_event =dequeue_next_fw_event (ioc)) || (fw_event = ioc->current_event)) { + +/* +* Don't call cancel_work_sync() for current_event +* other than MPT3SAS_REMOVE_UNRESPONDING_DEVICES; +* otherwise we may observe deadlock if current +* hard reset issued as part of processing the current_event. +* +* Orginal logic of cleaning the current_event is added +* for handling the back to back host reset issued by the user. +* i.e. during back to back host reset, driver use to process +* the two instances of MPT3SAS_REMOVE_UNRESPONDING_DEVICES +* event back to back and this made the drives to unregister +* the devices from SML. +*/ + +if (fw_event == ioc->current_event && + ioc->current_event->event != +MPT3SAS_REMOVE_UNRESPONDING_DEVICES ) { + ioc->current_event =NULL ; +continue ; + } +/* * Wait on the fw_event to complete. If this returns 1, then * the event was never executed, and we need a put for the
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 37/114 scsi: core: Fixup calling convention for scsi_mode_sense()
In reply to Sasha LevinFrom: Hannes Reinecke <[email protected]>
[ Upstream commit 8793613de913e03e7c884f4cc56e350bc716431e ]
The description for scsi_mode_sense() claims to return the number of valid bytes on success, which is not what the code does. Additionally there is no gain in returning the SCSI status, as everything the callers do is to check against scsi_result_is_good(), which is what scsi_mode_sense() does already. So change the calling convention to return a standard error code on failure, and 0 on success, and adapt the description and all callers.
--- drivers/scsi/scsi_lib.c | 10 ++++++---- drivers/scsi/scsi_transport_sas.c | 9 ++++----- drivers/scsi/sd.c | 12 ++++++------ drivers/scsi/sr.c | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-)
drivers/scsi/scsi_lib.c +6 -4
@@ -2093,9 +2093,7 @@ EXPORT_SYMBOL_GPL(scsi_mode_select);* @sshdr: place to put sense data (or NULL if no sense to be collected). * must be SCSI_SENSE_BUFFERSIZE big. * -* Returns zero if unsuccessful, or the header offset (either 4 -* or 8 depending on whether a six or ten byte command was -* issued) if successful. +* Returns zero if successful, or a negative error number on failure */ int scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
@@ -2142,6 +2140,8 @@ scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage, result =scsi_execute_req (sdev, cmd,DMA_FROM_DEVICE , buffer, len, sshdr, timeout, retries,NULL ); +if (result <0 ) +return result;/* This code looks awful: what it's doing is making sure an * ILLEGAL REQUEST sense return identifies the actual command
@@ -2186,13 +2186,15 @@ scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage, data->block_descriptor_length = buffer[3 ]; } data->header_length = header_length; + result =0 ; }else if ((status_byte (result) ==CHECK_CONDITION ) &&scsi_sense_valid (sshdr) && sshdr->sense_key ==UNIT_ATTENTION && retry_count) { retry_count--; goto retry; } - +if (result >0 ) + result = -EIO ;return result; }EXPORT_SYMBOL (scsi_mode_sense);
drivers/scsi/scsi_transport_sas.c +4 -5
@@ -1229,16 +1229,15 @@ int sas_read_port_mode_page(struct scsi_device *sdev)char *buffer =kzalloc (BUF_SIZE ,GFP_KERNEL ), *msdata;struct sas_end_device *rdev =sas_sdev_to_rdev (sdev);struct scsi_mode_data mode_data; -int res, error; +int error;if (!buffer)return -ENOMEM ; - res =scsi_mode_sense (sdev,1 ,0x19 , buffer,BUF_SIZE ,30 *HZ ,3 , - &mode_data,NULL ); + error =scsi_mode_sense (sdev,1 ,0x19 , buffer,BUF_SIZE ,30 *HZ ,3 , + &mode_data,NULL ); - error = -EINVAL ; -if (!scsi_status_is_good (res)) +if (error) goto out; msdata = buffer + mode_data.header_length +
drivers/scsi/sd.c +6 -6
@@ -2684,18 +2684,18 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)* 5: Illegal Request, Sense Code 24: Invalid field in * CDB. */ -if (!scsi_status_is_good (res)) +if (res <0 ) res =sd_do_mode_sense (sdkp,0 ,0 , buffer,4 , &data,NULL );/* * Third attempt: ask 255 bytes, as we did earlier. */ -if (!scsi_status_is_good (res)) +if (res <0 ) res =sd_do_mode_sense (sdkp,0 ,0x3F , buffer,255 , &data,NULL ); } -if (!scsi_status_is_good (res)) { +if (res <0 ) {sd_first_printk (KERN_WARNING , sdkp,"Test WP failed, assume Write Enabled\n" ); }else {
@@ -2756,7 +2756,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) res =sd_do_mode_sense (sdkp, dbd, modepage, buffer, first_len, &data, &sshdr); -if (!scsi_status_is_good (res)) +if (res <0 ) goto bad_sense;if (!data.header_length) {
@@ -2788,7 +2788,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) res =sd_do_mode_sense (sdkp, dbd, modepage, buffer, len, &data, &sshdr); -if (scsi_status_is_good (res)) { +if (!res) {int offset = data.header_length + data.block_descriptor_length;while (offset < len) {
@@ -2906,7 +2906,7 @@ static void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer) res =scsi_mode_sense (sdp,1 ,0x0a , buffer,36 ,SD_TIMEOUT , sdkp->max_retries, &data, &sshdr); -if (!scsi_status_is_good (res) || !data.header_length || +if (res <0 || !data.header_length || data.length <6 ) {sd_first_printk (KERN_WARNING , sdkp,"getting Control mode page failed, assume no ATO\n" );
drivers/scsi/sr.c +1 -1
@@ -913,7 +913,7 @@ static void get_capabilities(struct scsi_cd *cd) rc =scsi_mode_sense (cd->device,0 ,0x2a , buffer, ms_len,SR_TIMEOUT ,3 , &data,NULL ); -if (!scsi_status_is_good (rc) || data.length > ms_len || +if (rc <0 || data.length > ms_len || data.header_length + data.block_descriptor_length > data.length) {/* failed, drive doesn't have capabilities mode page */ cd->cdi.speed =1 ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 38/114 scsi: scsi_dh_alua: Check for negative result value
In reply to Sasha LevinFrom: Hannes Reinecke <[email protected]>
[ Upstream commit 7e26e3ea028740f934477ec01ba586ab033c35aa ]
scsi_execute() will now return a negative error if there was an error prior to command submission; evaluate that instead if checking for DRIVER_ERROR.
[mkp: build fix]
--- drivers/scsi/device_handler/scsi_dh_alua.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/device_handler/scsi_dh_alua.c +4 -4
@@ -562,12 +562,12 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)kfree (buff);return SCSI_DH_OK ; } -if (!scsi_sense_valid (&sense_hdr)) { +if (retval <0 || !scsi_sense_valid (&sense_hdr)) {sdev_printk (KERN_INFO , sdev,"%s: rtpg failed, result %d\n" ,ALUA_DH_NAME , retval);kfree (buff); -if (driver_byte (retval) ==DRIVER_ERROR ) +if (retval <0 )return SCSI_DH_DEV_TEMP_BUSY ;return SCSI_DH_IO ; }
@@ -791,11 +791,11 @@ static unsigned alua_stpg(struct scsi_device *sdev, struct alua_port_group *pg) retval =submit_stpg (sdev, pg->group_id, &sense_hdr);if (retval) { -if (!scsi_sense_valid (&sense_hdr)) { +if (retval <0 || !scsi_sense_valid (&sense_hdr)) {sdev_printk (KERN_INFO , sdev,"%s: stpg failed, result %d" ,ALUA_DH_NAME , retval); -if (driver_byte (retval) ==DRIVER_ERROR ) +if (retval <0 )return SCSI_DH_DEV_TEMP_BUSY ; }else { sdev_printk(KERN_INFO, sdev, "%s: stpg failed\n",
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 39/114 fs/jfs: Fix missing error code in lmLogInit()
In reply to Sasha LevinFrom: Jiapeng Chong <[email protected]>
[ Upstream commit 492109333c29e1bb16d8732e1d597b02e8e0bf2e ]
The error code is missing in this code scenario, add the error code '-EINVAL' to the return value 'rc.
Eliminate the follow smatch warning:
fs/jfs/jfs_logmgr.c:1327 lmLogInit() warn: missing error code 'rc'.
--- fs/jfs/jfs_logmgr.c | 1 + 1 file changed, 1 insertion(+)
fs/jfs/jfs_logmgr.c +1 -0
@@ -1324,6 +1324,7 @@ int lmLogInit(struct jfs_log * log) }else {if (!uuid_equal (&logsuper->uuid, &log->uuid)) {jfs_warn ("wrong uuid on JFS log device" ); + rc = -EINVAL ; goto errout20; } log->size =le32_to_cpu (logsuper->size);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 40/114 scsi: megaraid_sas: Fix resource leak in case of probe failure
In reply to Sasha LevinFrom: Chandrakanth Patil <[email protected]>
[ Upstream commit b5438f48fdd8e1c3f130d32637511efd32038152 ]
The driver doesn't clean up all the allocated resources properly when scsi_add_host(), megasas_start_aen() function fails during the PCI device probe.
Clean up all those resources.
--- drivers/scsi/megaraid/megaraid_sas_base.c | 13 +++++++++++++ drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 + 2 files changed, 14 insertions(+)
drivers/scsi/megaraid/megaraid_sas_base.c +13 -0
@@ -7545,11 +7545,16 @@ static int megasas_probe_one(struct pci_dev *pdev,return 0 ; fail_start_aen: + instance->unload =1 ; +scsi_remove_host (instance->host); fail_io_attach: megasas_mgmt_info.count--; megasas_mgmt_info.max_index--; megasas_mgmt_info.instance[megasas_mgmt_info.max_index] =NULL ; +if (instance->requestorId && !instance->skip_heartbeat_timer_del) +del_timer_sync (&instance->sriov_heartbeat_timer); + instance->instancet->disable_intr (instance);megasas_destroy_irqs (instance);
@@ -7557,8 +7562,16 @@ static int megasas_probe_one(struct pci_dev *pdev,megasas_release_fusion (instance); elsemegasas_release_mfi (instance ); +if (instance->msix_vectors)pci_free_irq_vectors (instance->pdev); + instance->msix_vectors =0 ; + +if (instance->fw_crash_state !=UNAVAILABLE ) +megasas_free_host_crash_buffer (instance); + +if (instance->adapter_type !=MFI_SERIES ) +megasas_fusion_stop_watchdog (instance); fail_init_mfi:scsi_host_put (host); fail_alloc_instance:
drivers/scsi/megaraid/megaraid_sas_fusion.c +1 -0
@@ -5266,6 +5266,7 @@ megasas_alloc_fusion_context(struct megasas_instance *instance)if (!fusion->log_to_span) {dev_err (&instance->pdev->dev,"Failed from %s %d\n" , __func__, __LINE__); +kfree (instance->ctrl_context);return -ENOMEM ; } }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 41/114 scsi: megaraid_sas: Early detection of VD deletion through RaidMap update
In reply to Sasha LevinFrom: Kashyap Desai <[email protected]>
[ Upstream commit ae6874ba4b43c5a00065f48599811a09d33b873d ]
Consider the case where a VD is deleted and the targetID of that VD is assigned to a newly created VD. If the sequence of deletion/addition of VD happens very quickly there is a possibility that second event (VD add) occurs even before the driver processes the first event (VD delete). As event processing is done in deferred context the device list remains the same (but targetID is re-used) so driver will not learn the VD deletion/additon. I/Os meant for the older VD will be directed to new VD which may lead to data corruption.
Make driver detect the deleted VD as soon as possible based on the RaidMap update and block further I/O to that device.
--- drivers/scsi/megaraid/megaraid_sas.h | 12 ++++ drivers/scsi/megaraid/megaraid_sas_base.c | 83 ++++++++++++++++++++--- drivers/scsi/megaraid/megaraid_sas_fp.c | 6 +- 3 files changed, 92 insertions(+), 9 deletions(-)
drivers/scsi/megaraid/megaraid_sas.h +12 -0
@@ -2262,6 +2262,15 @@ enum MR_PERF_MODE { (mode) == MR_LATENCY_PERF_MODE ? "Latency" : \ "Unknown") +enum MEGASAS_LD_TARGET_ID_STATUS { +LD_TARGET_ID_INITIAL , +LD_TARGET_ID_ACTIVE , +LD_TARGET_ID_DELETED , +}; + +#define MEGASAS_TARGET_ID (sdev) \ + (((sdev->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev->id) +struct megasas_instance {unsigned int *reply_map;
@@ -2326,6 +2335,9 @@ struct megasas_instance {struct megasas_pd_list pd_list[MEGASAS_MAX_PD ];struct megasas_pd_list local_pd_list[MEGASAS_MAX_PD ];u8 ld_ids[MEGASAS_MAX_LD_IDS ]; +u8 ld_tgtid_status[MEGASAS_MAX_LD_IDS ]; +u8 ld_ids_prev[MEGASAS_MAX_LD_IDS ]; +u8 ld_ids_from_raidmap[MEGASAS_MAX_LD_IDS ];s8 init_id;u16 max_num_sge;
drivers/scsi/megaraid/megaraid_sas_base.c +75 -8
164 lines not on this page · raw message
drivers/scsi/megaraid/megaraid_sas_fp.c +5 -1
@@ -349,6 +349,10 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id) num_lds =le16_to_cpu (drv_map->raidMap.ldCount); +memcpy (instance->ld_ids_prev, + instance->ld_ids_from_raidmap, +sizeof (instance->ld_ids_from_raidmap)); +memset (instance->ld_ids_from_raidmap,0xff ,MEGASAS_MAX_LD_IDS );/*Convert Raid capability values to CPU arch */ for (i =0 ; (num_lds >0 ) && (i <MAX_LOGICAL_DRIVES_EXT ); i++) { ld =MR_TargetIdToLdGet (i, drv_map);
@@ -359,7 +363,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id) raid =MR_LdRaidGet (ld, drv_map);le32_to_cpus ((u32 *)&raid->capability); - + instance->ld_ids_from_raidmap[i] = i; num_lds--; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 42/114 scsi: megaraid_sas: Handle missing interrupts while re-enabling IRQs
In reply to Sasha LevinFrom: Chandrakanth Patil <[email protected]>
[ Upstream commit 9bedd36e9146b34dda4d6994e3aa1d72bc6442c1 ]
While reenabling the IRQ after IRQ poll there may be a small window for the firmware to post the replies with interrupts raised. In that case the driver will not see the interrupts which leads to I/O timeout.
This issue only happens when there are many I/O completions on a single reply queue. This forces the driver to switch between the interrupt and IRQ context.
Make the driver process the reply queue one more time after enabling the IRQ.
--- drivers/scsi/megaraid/megaraid_sas_fusion.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas_fusion.c +7 -2
@@ -3739,6 +3739,7 @@ static void megasas_sync_irqs(unsigned long instance_addr)if (irq_ctx->irq_poll_scheduled) { irq_ctx->irq_poll_scheduled = false;enable_irq (irq_ctx->os_irq); +complete_cmd_fusion (instance, irq_ctx->MSIxIndex, irq_ctx); } } }
@@ -3770,6 +3771,7 @@ int megasas_irqpoll(struct irq_poll *irqpoll, int budget)irq_poll_complete (irqpoll); irq_ctx->irq_poll_scheduled = false;enable_irq (irq_ctx->os_irq); +complete_cmd_fusion (instance, irq_ctx->MSIxIndex, irq_ctx); }return num_entries;
@@ -3786,6 +3788,7 @@ megasas_complete_cmd_dpc_fusion(unsigned long instance_addr) {struct megasas_instance *instance = (struct megasas_instance *)instance_addr; +struct megasas_irq_context *irq_ctx =NULL ;u32 count, MSIxIndex; count = instance->msix_vectors >0 ? instance->msix_vectors :1 ;
@@ -3794,8 +3797,10 @@ megasas_complete_cmd_dpc_fusion(unsigned long instance_addr)if (atomic_read (&instance->adprecovery) ==MEGASAS_HW_CRITICAL_ERROR )return ; -for (MSIxIndex =0 ; MSIxIndex < count; MSIxIndex++) -complete_cmd_fusion (instance, MSIxIndex,NULL ); +for (MSIxIndex =0 ; MSIxIndex < count; MSIxIndex++) { + irq_ctx = &instance->irq_context[MSIxIndex]; +complete_cmd_fusion (instance, MSIxIndex, irq_ctx); + } }/**
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 43/114 scsi: iscsi: Stop queueing during ep_disconnect
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit 891e2639deae721dc43764a44fa255890dc34313 ]
During ep_disconnect we have been doing iscsi_suspend_tx/queue to block new I/O but every driver except cxgbi and iscsi_tcp can still get I/O from __iscsi_conn_send_pdu() if we haven't called iscsi_conn_failure() before ep_disconnect. This could happen if we were terminating the session, and the logout timed out before it was even sent to libiscsi.
Fix the issue by adding a helper which reverses the bind_conn call that allows new I/O to be queued. Drivers implementing ep_disconnect can use this to make sure new I/O is not queued to them when handling the disconnect.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + drivers/scsi/be2iscsi/be_main.c | 1 + drivers/scsi/bnx2i/bnx2i_iscsi.c | 1 + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 + drivers/scsi/libiscsi.c | 70 +++++++++++++++++++++--- drivers/scsi/qedi/qedi_iscsi.c | 1 + drivers/scsi/qla4xxx/ql4_os.c | 1 + drivers/scsi/scsi_transport_iscsi.c | 10 +++- include/scsi/libiscsi.h | 1 + include/scsi/scsi_transport_iscsi.h | 1 + 11 files changed, 78 insertions(+), 11 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +1 -0
@@ -1002,6 +1002,7 @@ static struct iscsi_transport iscsi_iser_transport = {/* connection management */ .create_conn = iscsi_iser_conn_create, .bind_conn = iscsi_iser_conn_bind, + .unbind_conn = iscsi_conn_unbind, .destroy_conn = iscsi_conn_teardown, .attr_is_visible = iser_attr_is_visible, .set_param = iscsi_iser_set_param,
drivers/scsi/be2iscsi/be_main.c +1 -0
@@ -5809,6 +5809,7 @@ struct iscsi_transport beiscsi_iscsi_transport = { .destroy_session = beiscsi_session_destroy, .create_conn = beiscsi_conn_create, .bind_conn = beiscsi_conn_bind, + .unbind_conn = iscsi_conn_unbind, .destroy_conn = iscsi_conn_teardown, .attr_is_visible = beiscsi_attr_is_visible, .set_iface_param = beiscsi_iface_set_param,
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -0
@@ -2276,6 +2276,7 @@ struct iscsi_transport bnx2i_iscsi_transport = { .destroy_session = bnx2i_session_destroy, .create_conn = bnx2i_conn_create, .bind_conn = bnx2i_conn_bind, + .unbind_conn = iscsi_conn_unbind, .destroy_conn = bnx2i_conn_destroy, .attr_is_visible = bnx2i_attr_is_visible, .set_param = iscsi_set_param,
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +1 -0
@@ -117,6 +117,7 @@ static struct iscsi_transport cxgb3i_iscsi_transport = {/* connection management */ .create_conn = cxgbi_create_conn, .bind_conn = cxgbi_bind_conn, + .unbind_conn = iscsi_conn_unbind, .destroy_conn = iscsi_tcp_conn_teardown, .start_conn = iscsi_conn_start, .stop_conn = iscsi_conn_stop,
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +1 -0
@@ -134,6 +134,7 @@ static struct iscsi_transport cxgb4i_iscsi_transport = {/* connection management */ .create_conn = cxgbi_create_conn, .bind_conn = cxgbi_bind_conn, + .unbind_conn = iscsi_conn_unbind, .destroy_conn = iscsi_tcp_conn_teardown, .start_conn = iscsi_conn_start, .stop_conn = iscsi_conn_stop,
drivers/scsi/libiscsi.c +62 -8
91 lines not on this page · raw message
drivers/scsi/qedi/qedi_iscsi.c +1 -0
@@ -1401,6 +1401,7 @@ struct iscsi_transport qedi_iscsi_transport = { .destroy_session = qedi_session_destroy, .create_conn = qedi_conn_create, .bind_conn = qedi_conn_bind, + .unbind_conn = iscsi_conn_unbind, .start_conn = qedi_conn_start, .stop_conn = iscsi_conn_stop, .destroy_conn = qedi_conn_destroy,
drivers/scsi/qla4xxx/ql4_os.c +1 -0
@@ -259,6 +259,7 @@ static struct iscsi_transport qla4xxx_iscsi_transport = { .start_conn = qla4xxx_conn_start, .create_conn = qla4xxx_conn_create, .bind_conn = qla4xxx_conn_bind, + .unbind_conn = iscsi_conn_unbind, .stop_conn = iscsi_conn_stop, .destroy_conn = qla4xxx_conn_destroy, .set_param = iscsi_set_param,
drivers/scsi/scsi_transport_iscsi.c +7 -3
@@ -2964,7 +2964,7 @@ static int iscsi_if_ep_connect(struct iscsi_transport *transport, }static int iscsi_if_ep_disconnect (struct iscsi_transport *transport, -u64 ep_handle) +u64 ep_handle,bool is_active) {struct iscsi_cls_conn *conn;struct iscsi_endpoint *ep;
@@ -2981,6 +2981,8 @@ static int iscsi_if_ep_disconnect(struct iscsi_transport *transport, conn->ep =NULL ;mutex_unlock (&conn->ep_mutex); conn->state =ISCSI_CONN_FAILED ; + + transport->unbind_conn (conn, is_active); } transport->ep_disconnect (ep);
@@ -3012,7 +3014,8 @@ iscsi_if_transport_ep(struct iscsi_transport *transport,break ;case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT : rc =iscsi_if_ep_disconnect (transport, - ev->u.ep_disconnect.ep_handle); + ev->u.ep_disconnect.ep_handle, + false);break ; }return rc;
@@ -3737,7 +3740,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) conn =iscsi_conn_lookup (ev->u.b_conn.sid, ev->u.b_conn.cid);if (conn && conn->ep) -iscsi_if_ep_disconnect (transport, conn->ep->id); +iscsi_if_ep_disconnect (transport, conn->ep->id, true);if (!session || !conn) { err = -EINVAL ;
@@ -4656,6 +4659,7 @@ iscsi_register_transport(struct iscsi_transport *tt)int err;BUG_ON (!tt); +WARN_ON (tt->ep_disconnect && !tt->unbind_conn); priv =iscsi_if_transport_lookup (tt);if (priv)
include/scsi/libiscsi.h +1 -0
@@ -424,6 +424,7 @@ extern int iscsi_conn_start(struct iscsi_cls_conn *);extern void iscsi_conn_stop (struct iscsi_cls_conn *,int );extern int iscsi_conn_bind (struct iscsi_cls_session *,struct iscsi_cls_conn *,int ); +extern void iscsi_conn_unbind (struct iscsi_cls_conn *cls_conn,bool is_active);extern void iscsi_conn_failure (struct iscsi_conn *conn,enum iscsi_err err);extern void iscsi_session_failure (struct iscsi_session *session,enum iscsi_err err);
include/scsi/scsi_transport_iscsi.h +1 -0
@@ -82,6 +82,7 @@ struct iscsi_transport {void (*destroy_session) (struct iscsi_cls_session *session);struct iscsi_cls_conn *(*create_conn) (struct iscsi_cls_session *sess,uint32_t cid); +void (*unbind_conn) (struct iscsi_cls_conn *conn,bool is_active);int (*bind_conn) (struct iscsi_cls_session *session,struct iscsi_cls_conn *cls_conn,uint64_t transport_eph,int is_leading);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 44/114 scsi: iscsi: Add iscsi_cls_conn refcount helpers
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit b1d19e8c92cfb0ded180ef3376c20e130414e067 ]
There are a couple places where we could free the iscsi_cls_conn while it's still in use. This adds some helpers to get/put a refcount on the struct and converts an exiting user. Subsequent commits will then use the helpers to fix 2 bugs in the eh code.
--- drivers/scsi/libiscsi.c | 7 ++----- drivers/scsi/scsi_transport_iscsi.c | 12 ++++++++++++ include/scsi/scsi_transport_iscsi.h | 2 ++ 3 files changed, 16 insertions(+), 5 deletions(-)
drivers/scsi/libiscsi.c +2 -5
@@ -1361,7 +1361,6 @@ void iscsi_session_failure(struct iscsi_session *session, enum iscsi_err err) {struct iscsi_conn *conn; -struct device *dev;spin_lock_bh (&session->frwd_lock); conn = session->leadconn;
@@ -1370,10 +1369,8 @@ void iscsi_session_failure(struct iscsi_session *session,return ; } - dev =get_device (&conn->cls_conn->dev); +iscsi_get_conn (conn->cls_conn);spin_unlock_bh (&session->frwd_lock); -if (!dev) -return ;/* * if the host is being removed bypass the connection * recovery initialization because we are going to kill
@@ -1383,7 +1380,7 @@ void iscsi_session_failure(struct iscsi_session *session,iscsi_conn_error_event (conn->cls_conn, err); elseiscsi_conn_failure (conn ,err ); -put_device (dev); +iscsi_put_conn (conn->cls_conn); }EXPORT_SYMBOL_GPL (iscsi_session_failure);
drivers/scsi/scsi_transport_iscsi.c +12 -0
@@ -2348,6 +2348,18 @@ int iscsi_destroy_conn(struct iscsi_cls_conn *conn) }EXPORT_SYMBOL_GPL (iscsi_destroy_conn); +void iscsi_put_conn (struct iscsi_cls_conn *conn) +{ +put_device (&conn->dev); +} +EXPORT_SYMBOL_GPL (iscsi_put_conn); + +void iscsi_get_conn (struct iscsi_cls_conn *conn) +{ +get_device (&conn->dev); +} +EXPORT_SYMBOL_GPL (iscsi_get_conn); +/* * iscsi interface functions */
include/scsi/scsi_transport_iscsi.h +2 -0
@@ -435,6 +435,8 @@ extern void iscsi_remove_session(struct iscsi_cls_session *session);extern void iscsi_free_session (struct iscsi_cls_session *session);extern struct iscsi_cls_conn *iscsi_create_conn (struct iscsi_cls_session *sess,int dd_size,uint32_t cid); +extern void iscsi_put_conn (struct iscsi_cls_conn *conn); +extern void iscsi_get_conn (struct iscsi_cls_conn *conn);extern int iscsi_destroy_conn (struct iscsi_cls_conn *conn);extern void iscsi_unblock_session (struct iscsi_cls_session *session);extern void iscsi_block_session (struct iscsi_cls_session *session);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 45/114 scsi: iscsi: Fix conn use after free during resets
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit ec29d0ac29be366450a7faffbcf8cba3a6a3b506 ]
If we haven't done a unbind target call we can race where iscsi_conn_teardown wakes up the EH thread and then frees the conn while those threads are still accessing the conn ehwait.
We can only do one TMF per session so this just moves the TMF fields from the conn to the session. We can then rely on the iscsi_session_teardown->iscsi_remove_session->__iscsi_unbind_session call to remove the target and it's devices, and know after that point there is no device or scsi-ml callout trying to access the session.
--- drivers/scsi/libiscsi.c | 115 +++++++++++++++++++--------------------- include/scsi/libiscsi.h | 11 ++-- 2 files changed, 60 insertions(+), 66 deletions(-)
drivers/scsi/libiscsi.c +55 -60
@@ -230,11 +230,11 @@ static int iscsi_prep_ecdb_ahs(struct iscsi_task *task)*/ static int iscsi_check_tmf_restrictions (struct iscsi_task *task,int opcode) { -struct iscsi_conn *conn = task->conn; -struct iscsi_tm *tmf = &conn->tmhdr; +struct iscsi_session *session = task->conn->session; +struct iscsi_tm *tmf = &session->tmhdr;u64 hdr_lun; -if (conn->tmf_state ==TMF_INITIAL ) +if (session->tmf_state ==TMF_INITIAL )return 0 ;if ((tmf->opcode &ISCSI_OPCODE_MASK ) !=ISCSI_OP_SCSI_TMFUNC )
@@ -254,24 +254,19 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)* Fail all SCSI cmd PDUs */ if (opcode !=ISCSI_OP_SCSI_DATA_OUT ) { -iscsi_conn_printk (KERN_INFO , conn, -"task [op %x itt " -"0x%x/0x%x] " -"rejected.\n" , - opcode, task->itt, - task->hdr_itt); +iscsi_session_printk (KERN_INFO , session, +"task [op %x itt 0x%x/0x%x] rejected.\n" , + opcode, task->itt, task->hdr_itt);return -EACCES ; }/* * And also all data-out PDUs in response to R2T * if fast_abort is set. */ -if (conn->session->fast_abort) { -iscsi_conn_printk (KERN_INFO , conn, -"task [op %x itt " -"0x%x/0x%x] fast abort.\n" , - opcode, task->itt, - task->hdr_itt); +if (session->fast_abort) { +iscsi_session_printk (KERN_INFO , session, +"task [op %x itt 0x%x/0x%x] fast abort.\n" , + opcode, task->itt, task->hdr_itt);return -EACCES ; }break ;
@@ -284,7 +279,7 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)*/ if (opcode ==ISCSI_OP_SCSI_DATA_OUT && task->hdr_itt == tmf->rtt) { - ISCSI_DBG_SESSION(conn->session, + ISCSI_DBG_SESSION(session, "Preventing task %x/%x from sending " "data-out due to abort task in " "progress\n", task->itt,
@@ -936,20 +931,21 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,static void iscsi_tmf_rsp (struct iscsi_conn *conn,struct iscsi_hdr *hdr) {struct iscsi_tm_rsp *tmf = (struct iscsi_tm_rsp *)hdr; +struct iscsi_session *session = conn->session; conn->exp_statsn =be32_to_cpu (hdr->statsn) +1 ; conn->tmfrsp_pdus_cnt++; -if (conn->tmf_state !=TMF_QUEUED ) +if (session->tmf_state !=TMF_QUEUED )return ;if (tmf->response ==ISCSI_TMF_RSP_COMPLETE ) - conn->tmf_state =TMF_SUCCESS ; + session->tmf_state =TMF_SUCCESS ;else if (tmf->response ==ISCSI_TMF_RSP_NO_TASK ) - conn->tmf_state =TMF_NOT_FOUND ; + session->tmf_state =TMF_NOT_FOUND ;else - conn->tmf_state =TMF_FAILED ; -wake_up (&conn->ehwait); + session->tmf_state =TMF_FAILED ; +wake_up (&session->ehwait); }static int iscsi_send_nopout (struct iscsi_conn *conn,struct iscsi_nopin *rhdr)
@@ -1826,15 +1822,14 @@ EXPORT_SYMBOL_GPL(iscsi_target_alloc);static void iscsi_tmf_timedout (struct timer_list *t) { -struct iscsi_conn *conn =from_timer (conn, t, tmf_timer); -struct iscsi_session *session = conn->session; +struct iscsi_session *session =from_timer (session, t, tmf_timer);spin_lock (&session->frwd_lock); -if (conn->tmf_state ==TMF_QUEUED ) { - conn->tmf_state =TMF_TIMEDOUT ; +if (session->tmf_state ==TMF_QUEUED ) { + session->tmf_state =TMF_TIMEDOUT ;ISCSI_DBG_EH (session,"tmf timedout\n" );/* unblock eh_abort() */ -wake_up (&conn->ehwait); +wake_up (&session->ehwait); }spin_unlock (&session->frwd_lock); }
@@ -1857,8 +1852,8 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,return -EPERM ; } conn->tmfcmd_pdus_cnt++; - conn->tmf_timer.expires = timeout *HZ + jiffies; -add_timer (&conn->tmf_timer); + session->tmf_timer.expires = timeout *HZ + jiffies; +add_timer (&session->tmf_timer);ISCSI_DBG_EH (session,"tmf set timeout\n" );spin_unlock_bh (&session->frwd_lock);
@@ -1872,12 +1867,12 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,* 3) session is terminated or restarted or userspace has * given up on recovery */ -wait_event_interruptible (conn->ehwait, age != session->age || +wait_event_interruptible (session->ehwait, age != session->age || session->state !=ISCSI_STATE_LOGGED_IN || - conn->tmf_state !=TMF_QUEUED ); + session->tmf_state !=TMF_QUEUED );if (signal_pending (current))flush_signals (current); -del_timer_sync (&conn->tmf_timer); +del_timer_sync (&session->tmf_timer);mutex_lock (&session->eh_mutex);spin_lock_bh (&session->frwd_lock);
@@ -2309,17 +2304,17 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) }/* only have one tmf outstanding at a time */ -if (conn->tmf_state !=TMF_INITIAL ) +if (session->tmf_state !=TMF_INITIAL ) goto failed; - conn->tmf_state =TMF_QUEUED ; + session->tmf_state =TMF_QUEUED ; - hdr = &conn->tmhdr; + hdr = &session->tmhdr;iscsi_prep_abort_task_pdu (task, hdr);if (iscsi_exec_task_mgmt_fn (conn, hdr, age, session->abort_timeout)) goto failed; -switch (conn->tmf_state) { +switch (session->tmf_state) {case TMF_SUCCESS :spin_unlock_bh (&session->frwd_lock);/*
@@ -2334,7 +2329,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)*/ spin_lock_bh (&session->frwd_lock);fail_scsi_task (task,DID_ABORT ); - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;memset (hdr,0 ,sizeof (*hdr));spin_unlock_bh (&session->frwd_lock);iscsi_start_tx (conn);
@@ -2345,7 +2340,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) goto failed_unlocked;case TMF_NOT_FOUND :if (!sc->SCp.ptr) { - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;memset (hdr,0 ,sizeof (*hdr));/* task completed before tmf abort response */ ISCSI_DBG_EH(session, "sc completed while abort in "
@@ -2354,7 +2349,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) } fallthrough;default : - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; goto failed; }
@@ -2413,11 +2408,11 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc) conn = session->leadconn;/* only have one tmf outstanding at a time */ -if (conn->tmf_state !=TMF_INITIAL ) +if (session->tmf_state !=TMF_INITIAL ) goto unlock; - conn->tmf_state =TMF_QUEUED ; + session->tmf_state =TMF_QUEUED ; - hdr = &conn->tmhdr; + hdr = &session->tmhdr;iscsi_prep_lun_reset_pdu (sc, hdr); if (iscsi_exec_task_mgmt_fn(conn, hdr, session->age,
@@ -2426,7 +2421,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc) goto unlock; } -switch (conn->tmf_state) { +switch (session->tmf_state) {case TMF_SUCCESS :break ;case TMF_TIMEDOUT :
@@ -2434,7 +2429,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)iscsi_conn_failure (conn,ISCSI_ERR_SCSI_EH_SESSION_RST ); goto done;default : - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; goto unlock; }
@@ -2446,7 +2441,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)spin_lock_bh (&session->frwd_lock);memset (hdr,0 ,sizeof (*hdr));fail_scsi_tasks (conn, sc->device->lun,DID_ERROR ); - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;spin_unlock_bh (&session->frwd_lock);iscsi_start_tx (conn);
@@ -2469,8 +2464,7 @@ void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session)spin_lock_bh (&session->frwd_lock);if (session->state !=ISCSI_STATE_LOGGED_IN ) { session->state =ISCSI_STATE_RECOVERY_FAILED ; -if (session->leadconn) -wake_up (&session->leadconn->ehwait); +wake_up (&session->ehwait); }spin_unlock_bh (&session->frwd_lock); }
@@ -2515,7 +2509,7 @@ int iscsi_eh_session_reset(struct scsi_cmnd *sc)iscsi_conn_failure (conn,ISCSI_ERR_SCSI_EH_SESSION_RST );ISCSI_DBG_EH (session,"wait for relogin\n" ); -wait_event_interruptible (conn->ehwait, +wait_event_interruptible (session->ehwait, session->state ==ISCSI_STATE_TERMINATE || session->state ==ISCSI_STATE_LOGGED_IN || session->state ==ISCSI_STATE_RECOVERY_FAILED );
@@ -2576,11 +2570,11 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc) conn = session->leadconn;/* only have one tmf outstanding at a time */ -if (conn->tmf_state !=TMF_INITIAL ) +if (session->tmf_state !=TMF_INITIAL ) goto unlock; - conn->tmf_state =TMF_QUEUED ; + session->tmf_state =TMF_QUEUED ; - hdr = &conn->tmhdr; + hdr = &session->tmhdr;iscsi_prep_tgt_reset_pdu (sc, hdr); if (iscsi_exec_task_mgmt_fn(conn, hdr, session->age,
@@ -2589,7 +2583,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc) goto unlock; } -switch (conn->tmf_state) { +switch (session->tmf_state) {case TMF_SUCCESS :break ;case TMF_TIMEDOUT :
@@ -2597,7 +2591,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)iscsi_conn_failure (conn,ISCSI_ERR_SCSI_EH_SESSION_RST ); goto done;default : - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; goto unlock; }
@@ -2609,7 +2603,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)spin_lock_bh (&session->frwd_lock);memset (hdr,0 ,sizeof (*hdr));fail_scsi_tasks (conn,-1 ,DID_ERROR ); - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ;spin_unlock_bh (&session->frwd_lock);iscsi_start_tx (conn);
@@ -2939,7 +2933,10 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost, session->tt = iscsit; session->dd_data = cls_session->dd_data +sizeof (*session); + session->tmf_state =TMF_INITIAL ; +timer_setup (&session->tmf_timer, iscsi_tmf_timedout,0 );mutex_init (&session->eh_mutex); +spin_lock_init (&session->frwd_lock);spin_lock_init (&session->back_lock);
@@ -3043,7 +3040,6 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size, conn->c_stage =ISCSI_CONN_INITIAL_STAGE ; conn->id = conn_idx; conn->exp_statsn =0 ; - conn->tmf_state =TMF_INITIAL ;timer_setup (&conn->transport_timer, iscsi_check_transport_timeouts,0 );
@@ -3068,8 +3064,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size, goto login_task_data_alloc_fail; conn->login_task->data = conn->data = data; -timer_setup (&conn->tmf_timer, iscsi_tmf_timedout,0 ); -init_waitqueue_head (&conn->ehwait); +init_waitqueue_head (&session->ehwait);return cls_conn;
@@ -3104,7 +3099,7 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)* leading connection? then give up on recovery. */ session->state =ISCSI_STATE_TERMINATE ; -wake_up (&conn->ehwait); +wake_up (&session->ehwait); }spin_unlock_bh (&session->frwd_lock);
@@ -3179,7 +3174,7 @@ int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)* commands after successful recovery */ conn->stop_stage =0 ; - conn->tmf_state =TMF_INITIAL ; + session->tmf_state =TMF_INITIAL ; session->age++;if (session->age ==16 ) session->age =0 ;
@@ -3193,7 +3188,7 @@ int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)spin_unlock_bh (&session->frwd_lock);iscsi_unblock_session (session->cls_session); -wake_up (&conn->ehwait); +wake_up (&session->ehwait);return 0 ; }EXPORT_SYMBOL_GPL (iscsi_conn_start);
@@ -3287,7 +3282,7 @@ void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)spin_lock_bh (&session->frwd_lock);fail_scsi_tasks (conn,-1 ,DID_TRANSPORT_DISRUPTED );fail_mgmt_tasks (session, conn); -memset (&conn->tmhdr,0 ,sizeof (conn->tmhdr)); +memset (&session->tmhdr,0 ,sizeof (session->tmhdr));spin_unlock_bh (&session->frwd_lock);mutex_unlock (&session->eh_mutex); }
include/scsi/libiscsi.h +5 -6
@@ -195,12 +195,6 @@ struct iscsi_conn {unsigned long suspend_tx;/* suspend Tx */ unsigned long suspend_rx;/* suspend Rx */ -/* abort */ -wait_queue_head_t ehwait;/* used in eh_abort() */ -struct iscsi_tm tmhdr; -struct timer_list tmf_timer; -int tmf_state;/* see TMF_INITIAL, etc.*/ -/* negotiated params */ unsigned max_recv_dlength;/* initiator_max_recv_dsl*/ unsigned max_xmit_dlength;/* target_max_recv_dsl */
@@ -270,6 +264,11 @@ struct iscsi_session {* and recv lock. */ struct mutex eh_mutex; +/* abort */ +wait_queue_head_t ehwait;/* used in eh_abort() */ +struct iscsi_tm tmhdr; +struct timer_list tmf_timer; +int tmf_state;/* see TMF_INITIAL, etc.*/ /* iSCSI session-wide sequencing */ uint32_t cmdsn;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 46/114 scsi: iscsi: Fix shost->max_id use
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit bdd4aad7ff92ae39c2e93c415bb6761cb8b584da ]
The iscsi offload drivers are setting the shost->max_id to the max number of sessions they support. The problem is that max_id is not the max number of targets but the highest identifier the targets can have. To use it to limit the number of targets we need to set it to max sessions - 1, or we can end up with a session we might not have preallocated resources for.
--- drivers/scsi/be2iscsi/be_main.c | 4 ++-- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/cxgbi/libcxgbi.c | 4 ++-- drivers/scsi/qedi/qedi_main.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/be2iscsi/be_main.c +2 -2
@@ -416,7 +416,7 @@ static struct beiscsi_hba *beiscsi_hba_alloc(struct pci_dev *pcidev) "beiscsi_hba_alloc - iscsi_host_alloc failed\n");return NULL ; } - shost->max_id =BE2_MAX_SESSIONS ; + shost->max_id =BE2_MAX_SESSIONS -1 ; shost->max_channel =0 ; shost->max_cmd_len =BEISCSI_MAX_CMD_LEN ; shost->max_lun =BEISCSI_NUM_MAX_LUN ;
@@ -5318,7 +5318,7 @@ static int beiscsi_enable_port(struct beiscsi_hba *phba)/* Re-enable UER. If different TPE occurs then it is recoverable. */ beiscsi_set_uer_feature (phba); - phba->shost->max_id = phba->params.cxns_per_ctrl; + phba->shost->max_id = phba->params.cxns_per_ctrl -1 ; phba->shost->can_queue = phba->params.ios_per_ctrl; ret =beiscsi_init_port (phba);if (ret <0 ) {
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -1
@@ -791,7 +791,7 @@ struct bnx2i_hba *bnx2i_alloc_hba(struct cnic_dev *cnic)return NULL ; shost->dma_boundary = cnic->pcidev->dma_mask; shost->transportt = bnx2i_scsi_xport_template; - shost->max_id =ISCSI_MAX_CONNS_PER_HBA ; + shost->max_id =ISCSI_MAX_CONNS_PER_HBA -1 ; shost->max_channel =0 ; shost->max_lun =512 ; shost->max_cmd_len =16 ;
drivers/scsi/cxgbi/libcxgbi.c +2 -2
@@ -337,7 +337,7 @@ void cxgbi_hbas_remove(struct cxgbi_device *cdev)EXPORT_SYMBOL_GPL (cxgbi_hbas_remove);int cxgbi_hbas_add (struct cxgbi_device *cdev,u64 max_lun, -unsigned int max_id,struct scsi_host_template *sht, +unsigned int max_conns,struct scsi_host_template *sht,struct scsi_transport_template *stt) {struct cxgbi_hba *chba;
@@ -357,7 +357,7 @@ int cxgbi_hbas_add(struct cxgbi_device *cdev, u64 max_lun, shost->transportt = stt; shost->max_lun = max_lun; - shost->max_id = max_id; + shost->max_id = max_conns -1 ; shost->max_channel =0 ; shost->max_cmd_len =SCSI_MAX_VARLEN_CDB_SIZE ;
drivers/scsi/qedi/qedi_main.c +1 -1
@@ -640,7 +640,7 @@ static struct qedi_ctx *qedi_host_alloc(struct pci_dev *pdev) goto exit_setup_shost; } - shost->max_id =QEDI_MAX_ISCSI_CONNS_PER_HBA ; + shost->max_id =QEDI_MAX_ISCSI_CONNS_PER_HBA -1 ; shost->max_channel =0 ; shost->max_lun = ~0 ; shost->max_cmd_len =16 ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 47/114 scsi: qedi: Fix null ref during abort handling
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit 5777b7f0f03ce49372203b6521631f62f2810c8f ]
If qedi_process_cmd_cleanup_resp finds the cmd it frees the work and sets list_tmf_work to NULL, so qedi_tmf_work should check if list_tmf_work is non-NULL when it wants to force cleanup.
--- drivers/scsi/qedi/qedi_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qedi/qedi_fw.c +1 -1
@@ -1453,7 +1453,7 @@ static void qedi_tmf_work(struct work_struct *work) ldel_exit:spin_lock_bh (&qedi_conn->tmf_work_lock); -if (!qedi_cmd->list_tmf_work) { +if (qedi_cmd->list_tmf_work) {list_del_init (&list_work->list); qedi_cmd->list_tmf_work =NULL ;kfree (list_work);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 48/114 scsi: qedi: Fix race during abort timeouts
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit 2ce002366a3fcc3f9616d4583194f65dde0ad253 ]
If the SCSI cmd completes after qedi_tmf_work calls iscsi_itt_to_task then the qedi qedi_cmd->task_id could be freed and used for another cmd. If we then call qedi_iscsi_cleanup_task with that task_id we will be cleaning up the wrong cmd.
Wait to release the task_id until the last put has been done on the iscsi_task. Because libiscsi grabs a ref to the task when sending the abort, we know that for the non-abort timeout case that the task_id we are referencing is for the cmd that was supposed to be aborted.
A latter commit will fix the case where the abort times out while we are running qedi_tmf_work.
--- drivers/scsi/qedi/qedi_fw.c | 15 --------------- drivers/scsi/qedi/qedi_iscsi.c | 20 +++++++++++++++++--- 2 files changed, 17 insertions(+), 18 deletions(-)
drivers/scsi/qedi/qedi_fw.c +0 -15
@@ -73,7 +73,6 @@ static void qedi_process_logout_resp(struct qedi_ctx *qedi,spin_unlock (&qedi_conn->list_lock); cmd->state =RESPONSE_RECEIVED ; -qedi_clear_task_idx (qedi, cmd->task_id);__iscsi_complete_pdu (conn, (struct iscsi_hdr *)resp_hdr,NULL ,0 );spin_unlock (&session->back_lock);
@@ -138,7 +137,6 @@ static void qedi_process_text_resp(struct qedi_ctx *qedi,spin_unlock (&qedi_conn->list_lock); cmd->state =RESPONSE_RECEIVED ; -qedi_clear_task_idx (qedi, cmd->task_id); __iscsi_complete_pdu(conn, (struct iscsi_hdr *)resp_hdr_ptr, qedi_conn->gen_pdu.resp_buf,
@@ -164,13 +162,11 @@ static void qedi_tmf_resp_work(struct work_struct *work)iscsi_block_session (session->cls_session); rval =qedi_cleanup_all_io (qedi, qedi_conn, qedi_cmd->task, true);if (rval) { -qedi_clear_task_idx (qedi, qedi_cmd->task_id);iscsi_unblock_session (session->cls_session); goto exit_tmf_resp; }iscsi_unblock_session (session->cls_session); -qedi_clear_task_idx (qedi, qedi_cmd->task_id);spin_lock (&session->back_lock);__iscsi_complete_pdu (conn, (struct iscsi_hdr *)resp_hdr_ptr,NULL ,0 );
@@ -245,8 +241,6 @@ static void qedi_process_tmf_resp(struct qedi_ctx *qedi, goto unblock_sess; } -qedi_clear_task_idx (qedi, qedi_cmd->task_id); -__iscsi_complete_pdu (conn, (struct iscsi_hdr *)resp_hdr_ptr,NULL ,0 );kfree (resp_hdr_ptr);
@@ -314,7 +308,6 @@ static void qedi_process_login_resp(struct qedi_ctx *qedi,"Freeing tid=0x%x for cid=0x%x\n" , cmd->task_id, qedi_conn->iscsi_conn_id); cmd->state =RESPONSE_RECEIVED ; -qedi_clear_task_idx (qedi, cmd->task_id); } static void qedi_get_rq_bdq_buf(struct qedi_ctx *qedi,
@@ -468,7 +461,6 @@ static int qedi_process_nopin_mesg(struct qedi_ctx *qedi, }spin_unlock (&qedi_conn->list_lock); -qedi_clear_task_idx (qedi, cmd->task_id); } done:
@@ -673,7 +665,6 @@ static void qedi_scsi_completion(struct qedi_ctx *qedi,if (qedi_io_tracing)qedi_trace_io (qedi, task, cmd->task_id,QEDI_IO_TRACE_RSP ); -qedi_clear_task_idx (qedi, cmd->task_id);__iscsi_complete_pdu (conn, (struct iscsi_hdr *)hdr, conn->data, datalen); error:
@@ -730,7 +721,6 @@ static void qedi_process_nopin_local_cmpl(struct qedi_ctx *qedi, cqe->itid, cmd->task_id); cmd->state =RESPONSE_RECEIVED ; -qedi_clear_task_idx (qedi, cmd->task_id);spin_lock_bh (&session->back_lock);__iscsi_put_task (task);
@@ -748,7 +738,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,itt_t protoitt =0 ;int found =0 ;struct qedi_cmd *qedi_cmd =NULL ; -u32 rtid =0 ;u32 iscsi_cid;struct qedi_conn *qedi_conn;struct qedi_cmd *dbg_cmd;
@@ -779,7 +768,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi, found =1 ; mtask = qedi_cmd->task; tmf_hdr = (struct iscsi_tm *)mtask->hdr; - rtid = work->rtid;list_del_init (&work->list);kfree (work);
@@ -821,8 +809,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,if (qedi_cmd->state ==CLEANUP_WAIT_FAILED ) qedi_cmd->state =CLEANUP_RECV ; -qedi_clear_task_idx (qedi_conn->qedi, rtid); -spin_lock (&qedi_conn->list_lock);if (likely (dbg_cmd->io_cmd_in_list)) { dbg_cmd->io_cmd_in_list = false;
@@ -856,7 +842,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,QEDI_INFO (&qedi->dbg_ctx,QEDI_LOG_TID ,"Freeing tid=0x%x for cid=0x%x\n" , cqe->itid, qedi_conn->iscsi_conn_id); -qedi_clear_task_idx (qedi_conn->qedi, cqe->itid); }else {qedi_get_proto_itt (qedi, cqe->itid, &ptmp_itt);
drivers/scsi/qedi/qedi_iscsi.c +17 -3
@@ -772,7 +772,6 @@ static int qedi_mtask_xmit(struct iscsi_conn *conn, struct iscsi_task *task) } cmd->conn = conn->dd_data; - cmd->scsi_cmd =NULL ;return qedi_iscsi_send_generic_request (task); }
@@ -783,6 +782,10 @@ static int qedi_task_xmit(struct iscsi_task *task)struct qedi_cmd *cmd = task->dd_data;struct scsi_cmnd *sc = task->sc; +/* Clear now so in cleanup_task we know it didn't make it */ + cmd->scsi_cmd =NULL ; + cmd->task_id =U16_MAX ; +if (test_bit (QEDI_IN_SHUTDOWN , &qedi_conn->qedi->flags))return -ENODEV ;
@@ -1383,13 +1386,24 @@ static umode_t qedi_attr_is_visible(int param_type, int param)static void qedi_cleanup_task (struct iscsi_task *task) { -if (!task->sc || task->state ==ISCSI_TASK_PENDING ) { +struct qedi_cmd *cmd; + +if (task->state ==ISCSI_TASK_PENDING ) {QEDI_INFO (NULL ,QEDI_LOG_IO ,"Returning ref_cnt=%d\n" ,refcount_read (&task->refcount));return ; } -qedi_iscsi_unmap_sg_list (task->dd_data); +if (task->sc) +qedi_iscsi_unmap_sg_list (task->dd_data); + + cmd = task->dd_data; +if (cmd->task_id !=U16_MAX ) +qedi_clear_task_idx (iscsi_host_priv (task->conn->session->host), + cmd->task_id); + + cmd->task_id =U16_MAX ; + cmd->scsi_cmd =NULL ; }struct iscsi_transport qedi_iscsi_transport = {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 49/114 scsi: qedi: Fix TMF session block/unblock use
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit 2819b4ae2873d50fd55292877b0231ec936c3b2e ]
Drivers shouldn't be calling block/unblock session for tmf handling because the functions can change the session state from under libiscsi. iscsi_queuecommand's call to iscsi_prep_scsi_cmd_pdu-> iscsi_check_tmf_restrictions will prevent new cmds from being sent to qedi after we've started handling a TMF. So we don't need to try and block it in the driver, and we can remove these block calls.
--- drivers/scsi/qedi/qedi_fw.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/scsi/qedi/qedi_fw.c +1 -6
@@ -159,14 +159,9 @@ static void qedi_tmf_resp_work(struct work_struct *work)set_bit (QEDI_CONN_FW_CLEANUP , &qedi_conn->flags); resp_hdr_ptr = (struct iscsi_tm_rsp *)qedi_cmd->tmf_resp_buf; -iscsi_block_session (session->cls_session); rval =qedi_cleanup_all_io (qedi, qedi_conn, qedi_cmd->task, true); -if (rval) { -iscsi_unblock_session (session->cls_session); +if (rval) goto exit_tmf_resp; - } - -iscsi_unblock_session (session->cls_session);spin_lock (&session->back_lock);__iscsi_complete_pdu (conn, (struct iscsi_hdr *)resp_hdr_ptr,NULL ,0 );
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 50/114 scsi: qedi: Fix cleanup session block/unblock use
In reply to Sasha LevinFrom: Mike Christie <[email protected]>
[ Upstream commit 0c72191da68638a479602dd515b587ada913184a ]
Drivers shouldn't be calling block/unblock session for cmd cleanup because the functions can change the session state from under libiscsi. This adds a new a driver level bit so it can block all I/O the host while it drains the card.
--- drivers/scsi/qedi/qedi.h | 1 + drivers/scsi/qedi/qedi_iscsi.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)
drivers/scsi/qedi/qedi.h +1 -0
@@ -284,6 +284,7 @@ struct qedi_ctx {#define QEDI_IN_RECOVERY 5#define QEDI_IN_OFFLINE 6#define QEDI_IN_SHUTDOWN 7 +#define QEDI_BLOCK_IO 8u8 mac[ETH_ALEN ];u32 src_ip[4 ];
drivers/scsi/qedi/qedi_iscsi.c +15 -2
@@ -330,12 +330,22 @@ qedi_conn_create(struct iscsi_cls_session *cls_session, uint32_t cid)void qedi_mark_device_missing (struct iscsi_cls_session *cls_session) { -iscsi_block_session (cls_session); +struct iscsi_session *session = cls_session->dd_data; +struct qedi_conn *qedi_conn = session->leadconn->dd_data; + +spin_lock_bh (&session->frwd_lock); +set_bit (QEDI_BLOCK_IO , &qedi_conn->qedi->flags); +spin_unlock_bh (&session->frwd_lock); }void qedi_mark_device_available (struct iscsi_cls_session *cls_session) { -iscsi_unblock_session (cls_session); +struct iscsi_session *session = cls_session->dd_data; +struct qedi_conn *qedi_conn = session->leadconn->dd_data; + +spin_lock_bh (&session->frwd_lock); +clear_bit (QEDI_BLOCK_IO , &qedi_conn->qedi->flags); +spin_unlock_bh (&session->frwd_lock); } static int qedi_bind_conn_to_iscsi_cid(struct qedi_ctx *qedi,
@@ -789,6 +799,9 @@ static int qedi_task_xmit(struct iscsi_task *task)if (test_bit (QEDI_IN_SHUTDOWN , &qedi_conn->qedi->flags))return -ENODEV ; +if (test_bit (QEDI_BLOCK_IO , &qedi_conn->qedi->flags)) +return -EACCES ; + cmd->state =0 ; cmd->task =NULL ; cmd->use_slowpath = false;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 51/114 mfd: da9052/stmpe: Add and modify MODULE_DEVICE_TABLE
In reply to Sasha LevinFrom: Zou Wei <[email protected]>
[ Upstream commit 4700ef326556ed74aba188f12396740a8c1c21dd ]
This patch adds/modifies MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/mfd/da9052-i2c.c | 1 + drivers/mfd/stmpe-i2c.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/mfd/da9052-i2c.c +1 -0
@@ -113,6 +113,7 @@ static const struct i2c_device_id da9052_i2c_id[] = { {"da9053-bc", DA9053_BC}, {} }; +MODULE_DEVICE_TABLE (i2c, da9052_i2c_id);#ifdef CONFIG_OF static const struct of_device_id dialog_dt_ids[] = {
drivers/mfd/stmpe-i2c.c +1 -1
@@ -109,7 +109,7 @@ static const struct i2c_device_id stmpe_i2c_id[] = { { "stmpe2403", STMPE2403 }, { } }; -MODULE_DEVICE_TABLE(i2c, stmpe_id); +MODULE_DEVICE_TABLE(i2c, stmpe_i2c_id); static struct i2c_driver stmpe_i2c_driver = { .driver = {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 52/114 mfd: cpcap: Fix cpcap dmamask not set warnings
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 0b7cbe811ca524295ea43d9a4d73d3427e419c54 ]
We have started to get a bunch of pointless dmamask not set warnings that makes the output of dmesg -l err,warn hard to read with many extra warnings:
cpcap-regulator cpcap-regulator.0: DMA mask not set cpcap_adc cpcap_adc.0: DMA mask not set cpcap_battery cpcap_battery.0: DMA mask not set cpcap-charger cpcap-charger.0: DMA mask not set cpcap-pwrbutton cpcap-pwrbutton.0: DMA mask not set cpcap-led cpcap-led.0: DMA mask not set cpcap-led cpcap-led.1: DMA mask not set cpcap-led cpcap-led.2: DMA mask not set cpcap-led cpcap-led.3: DMA mask not set cpcap-led cpcap-led.4: DMA mask not set cpcap-rtc cpcap-rtc.0: DMA mask not set cpcap-usb-phy cpcap-usb-phy.0: DMA mask not set
This seems to have started with commit 4d8bde883bfb ("OF: Don't set default coherent DMA mask"). We have the parent SPI controller use DMA, while CPCAP driver and it's children do not. For audio, the DMA is handled over I2S bus with the McBSP driver.
--- drivers/mfd/motorola-cpcap.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/mfd/motorola-cpcap.c +4 -0
@@ -327,6 +327,10 @@ static int cpcap_probe(struct spi_device *spi)if (ret)return ret; +/* Parent SPI controller uses DMA, CPCAP and child devices do not */ + spi->dev.coherent_dma_mask =0 ; + spi->dev.dma_mask = &spi->dev.coherent_dma_mask; +return devm_mfd_add_devices (&spi->dev,0 , cpcap_mfd_devices,ARRAY_SIZE (cpcap_mfd_devices),NULL ,0 ,NULL ); }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 53/114 char: xillybus: Fix condition for invoking the xillybus/ subdirectory
In reply to Sasha LevinFrom: Eli Billauer <[email protected]>
[ Upstream commit 1b1ee3a91d21fdf7d415c1060db1a7a07ae296b6 ]
As Xillybus' configuration symbol hierarchy has been reorganized recently, the correct condition for compiling the xillybus/ subdirectory is now CONFIG_XILLYBUS_CLASS, and not CONFIG_XILLYBUS.
--- drivers/char/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/Makefile +1 -1
@@ -44,6 +44,6 @@ obj-$(CONFIG_TCG_TPM) += tpm/ obj-$(CONFIG_PS3_FLASH) += ps3flash.o -obj-$(CONFIG_XILLYBUS) += xillybus/ +obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/ obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o obj-$(CONFIG_ADI) += adi.o
Signature · 1 line
2.30.2
Re: [PATCH AUTOSEL 5.13 053/114] char: xillybus: Fix condition for invoking the xillybus/ subdirectory
Hello Sasha,
Thanks for trying, but this is a NACK.
drivers/char/Makefile obj-$(CONFIG_TCG_TPM) += tpm/ · line 49
Quoted 12 lines · Sasha Levin
drivers/char/Makefile +1
-1@@ -44,6 +44,6 @@ obj-$(CONFIG_TCG_TPM) += tpm/ obj-$(CONFIG_PS3_FLASH) += ps3flash.o -obj-$(CONFIG_XILLYBUS) += xillybus/ +obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/ obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o
CONFIG_XILLYBUS_CLASS will be introduced in v5.14, so backporting this commit will break the kernel's build.
Since this patch was created for three kernel versions, I'm repeating this response on all three, just be sure. Hope I'm not being annoying.
Eli
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.13 053/114] char: xillybus: Fix condition for invoking the xillybus/ subdirectory
Quoted 11 lines · Eli Billauer
Hello Sasha,
Thanks for trying, but this is a NACK.
Quoted 6 lines · Sasha Levin
drivers/char/Makefile +0
-0@@ -44,6 +44,6 @@ obj-$(CONFIG_TCG_TPM) += tpm/
Quoted 8 lines
drivers/char/Makefile obj-$(CONFIG_TCG_TPM) += tpm/ · line 48
Quoted 5 lines
drivers/char/Makefile +1
-1obj-$(CONFIG_PS3_FLASH) += ps3flash.o -obj-$(CONFIG_XILLYBUS) += xillybus/ +obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/ obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o
CONFIG_XILLYBUS_CLASSwill be introduced in v5.14, so backporting this commit will break the kernel's build.Since this patch was created for three kernel versions, I'm repeating this response on all three, just be sure. Hope I'm not being annoying.
I'll drop it everywhere, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 54/114 ASoC: img: Fix PM reference leak in img_i2s_in_probe()
In reply to Sasha LevinFrom: Yufen Yu <[email protected]>
[ Upstream commit 81aad47278539f02de808bcc8251fed0ad3d6f55 ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
--- sound/soc/img/img-i2s-in.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/img/img-i2s-in.c +1 -1
@@ -464,7 +464,7 @@ static int img_i2s_in_probe(struct platform_device *pdev)if (ret) goto err_pm_disable; } - ret =pm_runtime_get_sync (&pdev->dev); + ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 ) goto err_suspend;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 55/114 iov_iter_advance(): use consistent semantics for move past the end
In reply to Sasha LevinFrom: Al Viro <[email protected]>
[ Upstream commit 3b3fc051cd2cba42bf736fa62780857d251a1236 ]
asking to advance by more than we have left in the iov_iter should move to the very end; it should *not* leave negative i->count and it should not spew into syslog, etc. - it's a legitimate operation.
--- lib/iov_iter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
lib/iov_iter.c +2 -3
@@ -1092,8 +1092,6 @@ static inline void pipe_truncate(struct iov_iter *i)static void pipe_advance (struct iov_iter *i,size_t size) {struct pipe_inode_info *pipe = i->pipe; -if (unlikely (i->count < size)) - size = i->count;if (size) {struct pipe_buffer *buf;unsigned int p_mask = pipe->ring_size -1 ;
@@ -1134,6 +1132,8 @@ static void iov_iter_bvec_advance(struct iov_iter *i, size_t size)void iov_iter_advance (struct iov_iter *i,size_t size) { +if (unlikely (i->count < size)) + size = i->count;if (unlikely (iov_iter_is_pipe (i))) {pipe_advance (i, size);return ;
@@ -1143,7 +1143,6 @@ void iov_iter_advance(struct iov_iter *i, size_t size)return ; }if (unlikely (iov_iter_is_xarray (i))) { - size =min (size, i->count); i->iov_offset += size; i->count -= size;return ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 56/114 fsi: Add missing MODULE_DEVICE_TABLE
In reply to Sasha LevinFrom: Zou Wei <[email protected]>
[ Upstream commit 19a52178125c1e8b84444d85f2ce34c0964b4a91 ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/fsi/fsi-master-aspeed.c | 1 + drivers/fsi/fsi-master-ast-cf.c | 1 + drivers/fsi/fsi-master-gpio.c | 1 + drivers/fsi/fsi-occ.c | 1 + 4 files changed, 4 insertions(+)
drivers/fsi/fsi-master-aspeed.c +1 -0
@@ -645,6 +645,7 @@ static const struct of_device_id fsi_master_aspeed_match[] = { { .compatible = "aspeed,ast2600-fsi-master" }, { }, }; +MODULE_DEVICE_TABLE (of, fsi_master_aspeed_match);static struct platform_driver fsi_master_aspeed_driver = { .driver = {
drivers/fsi/fsi-master-ast-cf.c +1 -0
@@ -1427,6 +1427,7 @@ static const struct of_device_id fsi_master_acf_match[] = { { .compatible = "aspeed,ast2500-cf-fsi-master" }, { }, }; +MODULE_DEVICE_TABLE (of, fsi_master_acf_match);static struct platform_driver fsi_master_acf = { .driver = {
drivers/fsi/fsi-master-gpio.c +1 -0
@@ -882,6 +882,7 @@ static const struct of_device_id fsi_master_gpio_match[] = { { .compatible = "fsi-master-gpio" }, { }, }; +MODULE_DEVICE_TABLE (of, fsi_master_gpio_match);static struct platform_driver fsi_master_gpio_driver = { .driver = {
drivers/fsi/fsi-occ.c +1 -0
@@ -635,6 +635,7 @@ static const struct of_device_id occ_match[] = { }, { }, }; +MODULE_DEVICE_TABLE (of, occ_match);static struct platform_driver occ_driver = { .driver = {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 57/114 serial: tty: uartlite: fix console setup
In reply to Sasha LevinFrom: Daniel Mack <[email protected]>
[ Upstream commit d157fca711ad42e75efef3444c83d2e1a17be27a ]
Remove the hack to assign the global console_port variable at probe time. This assumption that cons->index is -1 is wrong for systems that specify 'console=' in the cmdline (or 'stdout-path' in dts). Hence, on such system the actual console assignment is ignored, and the first UART that happens to be probed is used as console instead.
Move the logic to console_setup() and map the console to the correct port through the array of available ports instead.
--- drivers/tty/serial/uartlite.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-)
drivers/tty/serial/uartlite.c +6 -21
@@ -505,21 +505,23 @@ static void ulite_console_write(struct console *co, const char *s,static int ulite_console_setup (struct console *co,char *options) { -struct uart_port *port; +struct uart_port *port =NULL ;int baud =9600 ;int bits =8 ;int parity ='n' ;int flow ='n' ; - - port = console_port; +if (co->index >=0 && co->index <ULITE_NR_UARTS ) + port = ulite_ports + co->index;/* Has the device been initialized yet? */ -if (!port->mapbase) { +if (!port || !port->mapbase) {pr_debug ("console on ttyUL%i not present\n" , co->index);return -ENODEV ; } + console_port = port; +/* not initialized yet? */ if (!port->membase) {if (ulite_request_port (port))
@@ -655,17 +657,6 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,dev_set_drvdata (dev, port); -#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE -/* -* If console hasn't been found yet try to assign this port -* because it is required to be assigned for console setup function. -* If register_console() don't assign value, then console_port pointer -* is cleanup. -*/ -if (ulite_uart_driver.cons->index ==-1 ) - console_port = port; -#endif -/* Register the port */ rc =uart_add_one_port (&ulite_uart_driver, port);if (rc) {
@@ -675,12 +666,6 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,return rc; } -#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE -/* This is not port which is used for console that's why clean it up */ -if (ulite_uart_driver.cons->index ==-1 ) - console_port =NULL ; -#endif -return 0 ; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 58/114 s390/sclp_vt220: fix console name to match device
In reply to Sasha LevinFrom: Valentin Vidic <[email protected]>
[ Upstream commit b7d91d230a119fdcc334d10c9889ce9c5e15118b ]
Console name reported in /proc/consoles:
ttyS1 -W- (EC p ) 4:65
does not match the char device name:
crw--w---- 1 root root 4, 65 May 17 12:18 /dev/ttysclp0
so debian-installer inside a QEMU s390x instance gets confused and fails to start with the following error:
steal-ctty: No such file or directory
--- arch/s390/kernel/setup.c | 2 +- drivers/s390/char/sclp_vt220.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/s390/kernel/setup.c +1 -1
@@ -165,7 +165,7 @@ static void __init set_preferred_console(void)else if (CONSOLE_IS_3270 )add_preferred_console ("tty3270" ,0 ,NULL );else if (CONSOLE_IS_VT220 ) -add_preferred_console ("ttyS" ,1 ,NULL ); +add_preferred_console ("ttysclp" ,0 ,NULL );else if (CONSOLE_IS_HVC )add_preferred_console ("hvc" ,0 ,NULL ); }
drivers/s390/char/sclp_vt220.c +2 -2
@@ -35,8 +35,8 @@#define SCLP_VT220_MINOR 65#define SCLP_VT220_DRIVER_NAME "sclp_vt220"#define SCLP_VT220_DEVICE_NAME "ttysclp" -#define SCLP_VT220_CONSOLE_NAME "ttyS" -#define SCLP_VT220_CONSOLE_INDEX 1/* console=ttyS1 */ +#define SCLP_VT220_CONSOLE_NAME "ttysclp" +#define SCLP_VT220_CONSOLE_INDEX 0/* console=ttysclp0 */ /* Representation of a single write request */ struct sclp_vt220_request {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 59/114 s390: disable SSP when needed
In reply to Sasha LevinFrom: Fabrice Fontaine <[email protected]>
[ Upstream commit 42e8d652438f5ddf04e5dac299cb5e623d113dc0 ]
Though -nostdlib is passed in PURGATORY_LDFLAGS and -ffreestanding in KBUILD_CFLAGS_DECOMPRESSOR, -fno-stack-protector must also be passed to avoid linking errors related to undefined references to '__stack_chk_guard' and '__stack_chk_fail' if toolchain enforces -fstack-protector.
Fixes
- https://gitlab.com/kubu93/buildroot/-/jobs/1247043361
--- arch/s390/Makefile | 1 + arch/s390/purgatory/Makefile | 1 + 2 files changed, 2 insertions(+)
arch/s390/Makefile +1 -0
@@ -28,6 +28,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float -mbackchain KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables KBUILD_CFLAGS_DECOMPRESSOR += -ffreestanding +KBUILD_CFLAGS_DECOMPRESSOR += -fno-stack-protector KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g) KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
arch/s390/purgatory/Makefile +1 -0
@@ -24,6 +24,7 @@ KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common +KBUILD_CFLAGS += -fno-stack-protector KBUILD_CFLAGS += $(CLANG_FLAGS) KBUILD_CFLAGS += $(call cc-option,-fno-PIE) KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 60/114 selftests: timers: rtcpie: skip test if default RTC device does not exist
In reply to Sasha LevinFrom: Po-Hsu Lin <[email protected]>
[ Upstream commit 0d3e5a057992bdc66e4dca2ca50b77fa4a7bd90e ]
This test will require /dev/rtc0, the default RTC device, or one specified by user to run. Since this default RTC is not guaranteed to exist on all of the devices, so check its existence first, otherwise skip this test with the kselftest skip code 4.
Without this patch this test will fail like this on a s390x zVM:
$ selftests: timers: rtcpie $ /dev/rtc0: No such file or directory not ok 1 selftests: timers: rtcpie # exit=22
With this patch:
$ selftests: timers: rtcpie $ Default RTC /dev/rtc0 does not exist. Test Skipped! not ok 9 selftests: timers: rtcpie # SKIP
Fixed up change log so "With this patch" text doesn't get dropped. Shuah Khan <[email protected]>
--- tools/testing/selftests/timers/rtcpie.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
tools/testing/selftests/timers/rtcpie.c +9 -1
@@ -18,6 +18,8 @@#include <stdlib.h> #include <errno.h> +#include "../kselftest.h" +/* * This expects the new RTC class driver framework, working with * clocks that will often not be clones of what the PC-AT had.
@@ -35,8 +37,14 @@ int main(int argc, char **argv)switch (argc) {case 2 : rtc = argv[1 ]; -/* FALLTHROUGH */ +break ;case 1 : + fd =open (default_rtc,O_RDONLY ); +if (fd ==-1 ) { +printf ("Default RTC %s does not exist. Test Skipped!\n" , default_rtc); +exit (KSFT_SKIP ); + } +close (fd);break ;default :fprintf (stderr,"usage: rtctest [rtcdev] [d]\n" );
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 61/114 iommu/arm-smmu-qcom: Skip the TTBR1 quirk for db820c.
In reply to Sasha LevinFrom: Eric Anholt <[email protected]>
[ Upstream commit a242f4297cfe3f4589a7620dcd42cc503607fc6b ]
db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.
--- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +12 -1
@@ -130,6 +130,16 @@ static int qcom_adreno_smmu_alloc_context_bank(struct arm_smmu_domain *smmu_domareturn __arm_smmu_alloc_bitmap (smmu->context_map, start, count); } +static bool qcom_adreno_can_do_ttbr1 (struct arm_smmu_device *smmu) +{ +const struct device_node *np = smmu->dev->of_node; + +if (of_device_is_compatible (np,"qcom,msm8996-smmu-v2" )) +return false; + +return true; +} +static int qcom_adreno_smmu_init_context (struct arm_smmu_domain *smmu_domain,struct io_pgtable_cfg *pgtbl_cfg,struct device *dev) {
@@ -144,7 +154,8 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,* be AARCH64 stage 1 but double check because the arm-smmu code assumes * that is the case when the TTBR1 quirk is enabled */ -if ((smmu_domain->stage ==ARM_SMMU_DOMAIN_S1 ) && +if (qcom_adreno_can_do_ttbr1 (smmu_domain->smmu) && + (smmu_domain->stage ==ARM_SMMU_DOMAIN_S1 ) && (smmu_domain->cfg.fmt ==ARM_SMMU_CTX_FMT_AARCH64 )) pgtbl_cfg->quirks |=IO_PGTABLE_QUIRK_ARM_TTBR1 ;
Signature · 6 lines
2.30.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 62/114 USB: core: Avoid WARNings for 0-length descriptor requests
In reply to Sasha LevinFrom: Alan Stern <[email protected]>
[ Upstream commit 60dfe484cef45293e631b3a6e8995f1689818172 ]
The USB core has utility routines to retrieve various types of descriptors. These routines will now provoke a WARN if they are asked to retrieve 0 bytes (USB "receive" requests must not have zero length), so avert this by checking the size argument at the start.
--- drivers/usb/core/message.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/core/message.c +6 -0
@@ -783,6 +783,9 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type,int i;int result; +if (size <=0 )/* No point in asking for no data */ +return -EINVAL ; +memset (buf,0 , size);/* Make sure we parse really received data */ for (i =0 ; i <3 ; ++i) {
@@ -832,6 +835,9 @@ static int usb_get_string(struct usb_device *dev, unsigned short langid,int i;int result; +if (size <=0 )/* No point in asking for no data */ +return -EINVAL ; +for (i =0 ; i <3 ; ++i) {/* retry on length 0 or stall; some devices are flakey */ result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerRe: [PATCH AUTOSEL 5.13 062/114] USB: core: Avoid WARNings for 0-length descriptor requests
Quoted 47 lines · Sasha Levin
From: Alan Stern <[email protected]>
[ Upstream commit
60dfe484cef45293e631b3a6e8995f1689818172]The USB core has utility routines to retrieve various types of descriptors. These routines will now provoke a WARN if they are asked to retrieve 0 bytes (USB "receive" requests must not have zero length), so avert this by checking the size argument at the start.
CC Johan Hovold <[email protected]>Reported-and-tested-by [email protected]Reviewed-by Johan Hovold <[email protected]>Signed-off-by Alan Stern <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/usb/core/message.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/usb/core/message.c +6
-0@@ -783,6 +783,9 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type,int i;int result; +if (size <=0 )/* No point in asking for no data */ +return -EINVAL ; +memset (buf,0 , size);/* Make sure we parse really received data */ for (i =0 ; i <3 ; ++i) {@@ -832,6 +835,9 @@ static int usb_get_string(struct usb_device *dev, unsigned short langid,int i;int result; +if (size <=0 )/* No point in asking for no data */ +return -EINVAL ; +for (i =0 ; i <3 ; ++i) {/* retry on length 0 or stall; some devices are flakey */ result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),Signature · 1 line
2.30.2
This patch should be dropped from all of the autosel branches it was picked to, as I do not think the USB core has been fixed up, along with all of the different drivers that we noticed doing this, in the stable trees.
So please drop from everywhere at this time.
thanks,
greg k-h
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.13 062/114] USB: core: Avoid WARNings for 0-length descriptor requests
Quoted 54 lines · Greg Kroah-Hartman
Quoted 45 lines · Sasha Levin
From: Alan Stern <[email protected]>
[ Upstream commit
60dfe484cef45293e631b3a6e8995f1689818172]The USB core has utility routines to retrieve various types of descriptors. These routines will now provoke a WARN if they are asked to retrieve 0 bytes (USB "receive" requests must not have zero length), so avert this by checking the size argument at the start.
CC Johan Hovold <[email protected]>Reported-and-tested-by [email protected]Reviewed-by Johan Hovold <[email protected]>Signed-off-by Alan Stern <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/usb/core/message.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/usb/core/message.c +6
-1@@ -783,6 +783,9 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type,int i;int result; +if (size <=0 )/* No point in asking for no data */ +return -EINVAL ; +memset (buf,0 , size);/* Make sure we parse really received data */ for (i =0 ; i <3 ; ++i) {@@ -832,6 +835,9 @@ static int usb_get_string(struct usb_device *dev, unsigned short langid,int i;int result; +if (size <=0 )/* No point in asking for no data */ +return -EINVAL ; +for (i =0 ; i <3 ; ++i) {/* retry on length 0 or stall; some devices are flakey */ result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), --Quoted 2 lines
2.30.2
This patch should be dropped from all of the autosel branches it was picked to, as I do not think the USB core has been fixed up, along with all of the different drivers that we noticed doing this, in the stable trees.
Quoted 1 line
So please drop from everywhere at this time.
Will do, thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 63/114 ALSA: sb: Fix potential double-free of CSP mixer elements
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit c305366a37441c2ac90b08711cb6f032b43672f2 ]
snd_sb_qsound_destroy() contains the calls of removing the previously created mixer controls, but it doesn't clear the pointers. As snd_sb_qsound_destroy() itself may be repeatedly called via ioctl, this could lead to double-free potentially.
Fix it by clearing the struct fields properly afterwards.
--- sound/isa/sb/sb16_csp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/isa/sb/sb16_csp.c +6 -2
@@ -1072,10 +1072,14 @@ static void snd_sb_qsound_destroy(struct snd_sb_csp * p) card = p->chip->card;down_write (&card->controls_rwsem); -if (p->qsound_switch) +if (p->qsound_switch) {snd_ctl_remove (card, p->qsound_switch); -if (p->qsound_space) + p->qsound_switch =NULL ; + } +if (p->qsound_space) {snd_ctl_remove (card, p->qsound_space); + p->qsound_space =NULL ; + }up_write (&card->controls_rwsem);/* cancel pending transfer of QSound parameters */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 64/114 powerpc/ps3: Add dma_mask to ps3_dma_region
In reply to Sasha LevinFrom: Geoff Levand <[email protected]>
[ Upstream commit 9733862e50fdba55e7f1554e4286fcc5302ff28e ]
Commit f959dcd6ddfd29235030e8026471ac1b022ad2b0 (dma-direct: Fix potential NULL pointer dereference) added a null check on the dma_mask pointer of the kernel's device structure.
Add a dma_mask variable to the ps3_dma_region structure and set the device structure's dma_mask pointer to point to this new variable.
Fixes runtime errors like these:
# WARNING: Fixes tag on line 10 doesn't match correct format # WARNING: Fixes tag on line 10 doesn't match correct format
ps3_system_bus_match:349: dev=8.0(sb_01), drv=8.0(ps3flash): match
WARNING: CPU: 0 PID: 1 at kernel/dma/mapping.c:151 .dma_map_page_attrs+0x34/0x1e0 ps3flash sb_01: ps3stor_setup:193: map DMA region failed
--- arch/powerpc/include/asm/ps3.h | 2 ++ arch/powerpc/platforms/ps3/mm.c | 12 ++++++++++++ 2 files changed, 14 insertions(+)
arch/powerpc/include/asm/ps3.h +2 -0
@@ -71,6 +71,7 @@ struct ps3_dma_region_ops;* @bus_addr: The 'translated' bus address of the region. * @len: The length in bytes of the region. * @offset: The offset from the start of memory of the region. +* @dma_mask: Device dma_mask. * @ioid: The IOID of the device who owns this region * @chunk_list: Opaque variable used by the ioc page manager. * @region_ops: struct ps3_dma_region_ops - dma region operations
@@ -85,6 +86,7 @@ struct ps3_dma_region {enum ps3_dma_region_type region_type;unsigned long len;unsigned long offset; +u64 dma_mask;/* driver variables (set by ps3_dma_region_create) */ unsigned long bus_addr;
arch/powerpc/platforms/ps3/mm.c +12 -0
@@ -6,6 +6,7 @@* Copyright 2006 Sony Corp. */ +#include <linux/dma-mapping.h> #include <linux/kernel.h> #include <linux/export.h> #include <linux/memblock.h>
@@ -1118,6 +1119,7 @@ int ps3_dma_region_init(struct ps3_system_bus_device *dev, enum ps3_dma_region_type region_type, void *addr, unsigned long len) { unsigned long lpar_addr; +int result; lpar_addr = addr ?ps3_mm_phys_to_lpar (__pa (addr)) :0 ;
@@ -1129,6 +1131,16 @@ int ps3_dma_region_init(struct ps3_system_bus_device *dev, r->offset -= map.r1.offset; r->len = len ? len :ALIGN (map.total,1 << r->page_size); + dev->core.dma_mask = &r->dma_mask; + + result =dma_set_mask_and_coherent (&dev->core,DMA_BIT_MASK (32 )); + +if (result <0 ) { +dev_err (&dev->core,"%s:%d: dma_set_mask_and_coherent failed: %d\n" , + __func__, __LINE__, result); +return result; + } +switch (dev->dev_type) {case PS3_DEVICE_TYPE_SB : r->region_ops = (USE_DYNAMIC_DMA )
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 65/114 iommu/arm-smmu: Fix arm_smmu_device refcount leak when arm_smmu_rpm_get fails
In reply to Sasha LevinFrom: Xiyu Yang <[email protected]>
[ Upstream commit 1adf30f198c26539a62d761e45af72cde570413d ]
arm_smmu_rpm_get() invokes pm_runtime_get_sync(), which increases the refcount of the "smmu" even though the return value is less than 0.
The reference counting issue happens in some error handling paths of arm_smmu_rpm_get() in its caller functions. When arm_smmu_rpm_get() fails, the caller functions forget to decrease the refcount of "smmu" increased by arm_smmu_rpm_get(), causing a refcount leak.
Fix this issue by calling pm_runtime_resume_and_get() instead of pm_runtime_get_sync() in arm_smmu_rpm_get(), which can keep the refcount balanced in case of failure.
--- drivers/iommu/arm/arm-smmu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu/arm-smmu.c +1 -1
@@ -74,7 +74,7 @@ static bool using_legacy_binding, using_generic_binding;static inline int arm_smmu_rpm_get (struct arm_smmu_device *smmu) {if (pm_runtime_enabled (smmu->dev)) -return pm_runtime_get_sync (smmu->dev); +return pm_runtime_resume_and_get (smmu->dev);return 0 ; }
Signature · 6 lines
2.30.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 66/114 iommu/arm-smmu: Fix arm_smmu_device refcount leak in address translation
In reply to Sasha LevinFrom: Xiyu Yang <[email protected]>
[ Upstream commit 7c8f176d6a3fa18aa0f8875da6f7c672ed2a8554 ]
The reference counting issue happens in several exception handling paths of arm_smmu_iova_to_phys_hard(). When those error scenarios occur, the function forgets to decrease the refcount of "smmu" increased by arm_smmu_rpm_get(), causing a refcount leak.
Fix this issue by jumping to "out" label when those error scenarios occur.
--- drivers/iommu/arm/arm-smmu/arm-smmu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu/arm-smmu.c +6 -2
@@ -1271,6 +1271,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,u64 phys;unsigned long va, flags;int ret, idx = cfg->cbndx; +phys_addr_t addr =0 ; ret =arm_smmu_rpm_get (smmu);if (ret <0 )
@@ -1290,6 +1291,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,dev_err (dev,"iova to phys timed out on %pad. Falling back to software table walk.\n" , &iova); +arm_smmu_rpm_put (smmu);return ops->iova_to_phys (ops, iova); }
@@ -1298,12 +1300,14 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,if (phys &ARM_SMMU_CB_PAR_F ) {dev_err (dev,"translation fault!\n" );dev_err (dev,"PAR = 0x%llx\n" , phys); -return 0 ; + goto out; } + addr = (phys &GENMASK_ULL (39 ,12 )) | (iova &0xfff ); +out:arm_smmu_rpm_put (smmu); -return (phys &GENMASK_ULL (39 ,12 )) | (iova &0xfff ); +return addr; } static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
Signature · 6 lines
2.30.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 67/114 ALSA: n64: check return value after calling platform_get_resource()
In reply to Sasha LevinFrom: Yang Yingliang <[email protected]>
[ Upstream commit be471fe332f7f14aa6828010b220d7e6902b91a0 ]
It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value.
--- sound/mips/snd-n64.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/mips/snd-n64.c +4 -0
@@ -338,6 +338,10 @@ static int __init n64audio_probe(struct platform_device *pdev)strcpy (card->longname,"N64 Audio" ); res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); +if (!res) { + err = -EINVAL ; + goto fail_dma_alloc; + }if (devm_request_irq (&pdev->dev, res->start, n64audio_isr,IRQF_SHARED ,"N64 Audio" , priv)) { err = -EBUSY ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 68/114 ALSA: control_led - fix initialization in the mode show callback
In reply to Sasha LevinFrom: Jaroslav Kysela <[email protected]>
[ Upstream commit e381a14c3e3a4e90e293d4eaa5a3ab8ae98b9973 ]
The str variable should be always initialized before use even if the switch covers all cases. This is a minimalistic fix: Assign NULL, the sprintf() may print '(null)' if something is corrupted.
--- sound/core/control_led.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/control_led.c +1 -1
@@ -397,7 +397,7 @@ static ssize_t show_mode(struct device *dev, struct device_attribute *attr, char *buf) { struct snd_ctl_led *led = container_of(dev, struct snd_ctl_led, dev); -const char *str; +const char *str =NULL ;switch (led->mode) {case MODE_FOLLOW_MUTE : str ="follow-mute" ;break ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 69/114 ASoC: soc-pcm: fix the return value in dpcm_apply_symmetry()
In reply to Sasha LevinFrom: Jaroslav Kysela <[email protected]>
[ Upstream commit 12ffd726824a2f52486f72338b6fd3244b512959 ]
In case, where the loops are not executed for a reason, the uninitialized variable 'err' is returned to the caller. Make code fully predictible and assign zero in the declaration.
--- sound/soc/soc-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-pcm.c +1 -1
@@ -1700,7 +1700,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,struct snd_soc_dpcm *dpcm;struct snd_soc_pcm_runtime *fe =asoc_substream_to_rtd (fe_substream);struct snd_soc_dai *fe_cpu_dai; -int err; +int err =0 ;int i;/* apply symmetry for FE */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 70/114 gpio: zynq: Check return value of pm_runtime_get_sync
In reply to Sasha LevinFrom: Srinivas Neeli <[email protected]>
[ Upstream commit a51b2fb94b04ab71e53a71b9fad03fa826941254 ]
Return value of "pm_runtime_get_sync" API was neither captured nor checked. Fixed it by capturing the return value and then checking for any warning.
Addresses-Coverity: "check_return"
--- drivers/gpio/gpio-zynq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpio/gpio-zynq.c +4 -1
@@ -1001,8 +1001,11 @@ static int zynq_gpio_probe(struct platform_device *pdev)static int zynq_gpio_remove (struct platform_device *pdev) {struct zynq_gpio *gpio =platform_get_drvdata (pdev); +int ret; -pm_runtime_get_sync (&pdev->dev); + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) +dev_warn (&pdev->dev,"pm_runtime_get_sync() Failed\n" );gpiochip_remove (&gpio->chip);clk_disable_unprepare (gpio->clk);device_set_wakeup_capable (&pdev->dev,0 );
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 71/114 gpio: zynq: Check return value of irq_get_irq_data
In reply to Sasha LevinFrom: Srinivas Neeli <[email protected]>
[ Upstream commit 35d7b72a632bc7afb15356f44005554af8697904 ]
In two different instances the return value of "irq_get_irq_data" API was neither captured nor checked.
Fixed it by capturing the return value and then checking for any error.
Addresses-Coverity: "returned_null"
--- drivers/gpio/gpio-zynq.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpio/gpio-zynq.c +10 -0
@@ -736,6 +736,11 @@ static int __maybe_unused zynq_gpio_suspend(struct device *dev)struct zynq_gpio *gpio =dev_get_drvdata (dev);struct irq_data *data =irq_get_irq_data (gpio->irq); +if (!data) { +dev_err (dev,"irq_get_irq_data() failed\n" ); +return -EINVAL ; + } +if (!device_may_wakeup (dev))disable_irq (gpio->irq);
@@ -753,6 +758,11 @@ static int __maybe_unused zynq_gpio_resume(struct device *dev)struct irq_data *data =irq_get_irq_data (gpio->irq);int ret; +if (!data) { +dev_err (dev,"irq_get_irq_data() failed\n" ); +return -EINVAL ; + } +if (!device_may_wakeup (dev))enable_irq (gpio->irq);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 72/114 thunderbolt: Fix DROM handling for USB4 DROM
In reply to Sasha LevinFrom: Gil Fine <[email protected]>
[ Upstream commit b18f901382fdb74a138a0bf30458c54a023a1d86 ]
DROM for USB4 host/device has a shorter header than Thunderbolt DROM header. This patch addresses host/device with USB4 DROM (According to spec:
Universal Serial Bus 4 (USB4) Device ROM Specification, Rev 1.0, Feb-2021).
While there correct the data_len field to be 12 bits and rename __unknown1 to reserved following the spec.
--- drivers/thunderbolt/eeprom.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/thunderbolt/eeprom.c +11 -8
@@ -214,7 +214,10 @@ static u32 tb_crc32(void *data, size_t len)return ~__crc32c_le (~0 , data, len); } -#define TB_DROM_DATA_START 13 +#define TB_DROM_DATA_START 13 +#define TB_DROM_HEADER_SIZE 22 +#define USB4_DROM_HEADER_SIZE 16 +struct tb_drom_header {/* BYTE 0 */ u8 uid_crc8;/* checksum for uid */
@@ -224,9 +227,9 @@ struct tb_drom_header {u32 data_crc32;/* checksum for data_len bytes starting at byte 13 */ /* BYTE 13 */ u8 device_rom_revision;/* should be <= 1 */ - u16 data_len:10; - u8 __unknown1:6; -/* BYTES 16-21 */ + u16 data_len:12; + u8 reserved:4; +/* BYTES 16-21 - Only for TBT DROM, nonexistent in USB4 DROM */ u16 vendor_id;u16 model_id;u8 model_rev;
@@ -401,10 +404,10 @@ static int tb_drom_parse_entry_port(struct tb_switch *sw,* * Drom must have been copied to sw->drom. */ -static int tb_drom_parse_entries (struct tb_switch *sw) +static int tb_drom_parse_entries (struct tb_switch *sw,size_t header_size) {struct tb_drom_header *header = (void *) sw->drom; -u16 pos =sizeof (*header); +u16 pos = header_size;u16 drom_size = header->data_len +TB_DROM_DATA_START ;int res;
@@ -566,7 +569,7 @@ static int tb_drom_parse(struct tb_switch *sw) header->data_crc32, crc); } -return tb_drom_parse_entries (sw); +return tb_drom_parse_entries (sw,TB_DROM_HEADER_SIZE ); }static int usb4_drom_parse (struct tb_switch *sw)
@@ -583,7 +586,7 @@ static int usb4_drom_parse(struct tb_switch *sw)return -EINVAL ; } -return tb_drom_parse_entries (sw); +return tb_drom_parse_entries (sw,USB4_DROM_HEADER_SIZE ); }/**
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 73/114 powerpc/inst: Fix sparse detection on get_user_instr()
In reply to Sasha LevinFrom: Christophe Leroy <[email protected]>
[ Upstream commit b3a9e523237013477bea914b7fbfbe420428b988 ]
get_user_instr() lacks sparse detection for the __user tag.
This is because __gui_ptr is assigned with a cast.
Fix that by adding a __chk_user_ptr()
--- arch/powerpc/include/asm/inst.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/inst.h +6 -1
@@ -12,6 +12,8 @@unsigned long __gui_ptr = (unsigned long )ptr; \struct ppc_inst __gui_inst; \unsigned int __prefix, __suffix; \ + \ +__chk_user_ptr (ptr); \ __gui_ret = gu_op(__prefix, (unsigned int __user *)__gui_ptr); \if (__gui_ret ==0 ) { \if ((__prefix >>26 ) ==OP_PREFIX ) { \
@@ -29,7 +31,10 @@ })#else /* !CONFIG_PPC64 */ #define ___get_user_instr (gu_op, dest, ptr) \ - gu_op((dest).val, (u32 __user *)(ptr)) +({ \ + __chk_user_ptr(ptr); \ + gu_op((dest).val, (u32 __user *)(ptr)); \ +})#endif /* CONFIG_PPC64 */ #define get_user_instr (x, ptr) \
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 74/114 scsi: storvsc: Correctly handle multiple flags in srb_status
In reply to Sasha LevinFrom: Michael Kelley <[email protected]>
[ Upstream commit 52e1b3b3daa9d53f0204bf474ee1d4b1beb38234 ]
Hyper-V is observed to sometimes set multiple flags in the srb_status, such as ABORTED and ERROR. Current code in storvsc_handle_error() handles only a single flag being set, and does nothing when multiple flags are set. Fix this by changing the case statement into a series of "if" statements testing individual flags. The functionality for handling each flag is unchanged.
--- drivers/scsi/storvsc_drv.c | 61 +++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 28 deletions(-)
drivers/scsi/storvsc_drv.c +33 -28
@@ -1009,17 +1009,40 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,struct storvsc_scan_work *wrk;void (*process_err_fn)(struct work_struct *work);struct hv_host_device *host_dev =shost_priv (host); -bool do_work = false; -switch (SRB_STATUS (vm_srb->srb_status)) { -case SRB_STATUS_ERROR : +/* +* In some situations, Hyper-V sets multiple bits in the +* srb_status, such as ABORTED and ERROR. So process them +* individually, with the most specific bits first. +*/ + +if (vm_srb->srb_status &SRB_STATUS_INVALID_LUN ) { +set_host_byte (scmnd,DID_NO_CONNECT ); + process_err_fn = storvsc_remove_lun; + goto do_work; + } + +if (vm_srb->srb_status &SRB_STATUS_ABORTED ) { +if (vm_srb->srb_status &SRB_STATUS_AUTOSENSE_VALID && +/* Capacity data has changed */ + (asc ==0x2a ) && (ascq ==0x9 )) { + process_err_fn = storvsc_device_scan; +/* +* Retry the I/O that triggered this. +*/ +set_host_byte (scmnd,DID_REQUEUE ); + goto do_work; + } + } + +if (vm_srb->srb_status &SRB_STATUS_ERROR ) {/* * Let upper layer deal with error when * sense message is present. */ -if (vm_srb->srb_status &SRB_STATUS_AUTOSENSE_VALID ) -break ; +return ; +/* * If there is an error; offline the device since all * error recovery strategies would have already been
@@ -1032,37 +1055,19 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,set_host_byte (scmnd,DID_PASSTHROUGH );break ;/* -* On Some Windows hosts TEST_UNIT_READY command can return -* SRB_STATUS_ERROR, let the upper level code deal with it -* based on the sense information. +* On some Hyper-V hosts TEST_UNIT_READY command can +* return SRB_STATUS_ERROR. Let the upper level code +* deal with it based on the sense information. */ case TEST_UNIT_READY :break ;default :set_host_byte (scmnd,DID_ERROR ); } -break ; -case SRB_STATUS_INVALID_LUN : -set_host_byte (scmnd,DID_NO_CONNECT ); - do_work = true; - process_err_fn = storvsc_remove_lun; -break ; -case SRB_STATUS_ABORTED : -if (vm_srb->srb_status &SRB_STATUS_AUTOSENSE_VALID && - (asc ==0x2a ) && (ascq ==0x9 )) { - do_work = true; - process_err_fn = storvsc_device_scan; -/* -* Retry the I/O that triggered this. -*/ -set_host_byte (scmnd,DID_REQUEUE ); - } -break ; } +return ; -if (!do_work) -return ; - +do_work:/* * We need to schedule work to process this error; schedule it. */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 75/114 ALSA: ppc: fix error return code in snd_pmac_probe()
In reply to Sasha LevinFrom: Yang Yingliang <[email protected]>
[ Upstream commit 80b9c1be567c3c6bbe0d4b290af578e630485b5d ]
If snd_pmac_tumbler_init() or snd_pmac_tumbler_post_init() fails, snd_pmac_probe() need return error code.
--- sound/ppc/powermac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/ppc/powermac.c +5 -1
@@ -76,7 +76,11 @@ static int snd_pmac_probe(struct platform_device *devptr)sprintf (card->shortname,"PowerMac %s" , name_ext);sprintf (card->longname,"%s (Dev %d) Sub-frame %d" , card->shortname, chip->device_id, chip->subframe); -if (snd_pmac_tumbler_init (chip) <0 ||snd_pmac_tumbler_post_init () <0 ) + err =snd_pmac_tumbler_init (chip); +if (err <0 ) + goto __error; + err =snd_pmac_tumbler_post_init (); +if (err <0 ) goto __error;break ;case PMAC_AWACS :
Signature · 1 line
2.30.2