power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select
Subsystems (43)
Sasha Levin
maintainerPATCH 3/266 ASoC: tegra: tegra_wm8903: Support nvidia, headset property
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 3ef9d5073b552d56bd6daf2af1e89b7e8d4df183 ]
The microphone-jack state needs to be masked in a case of a 4-pin jack when microphone and ground pins are shorted. Presence of nvidia,headset tells that WM8903 CODEC driver should mask microphone's status if short circuit is detected, i.e headphones are inserted.
--- sound/soc/tegra/tegra_wm8903.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/tegra/tegra_wm8903.c +5 -1
@@ -159,6 +159,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)struct snd_soc_component *component = codec_dai->component;struct snd_soc_card *card = rtd->card;struct tegra_wm8903 *machine =snd_soc_card_get_drvdata (card); +int shrt =0 ;if (gpio_is_valid (machine->gpio_hp_det)) { tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det;
@@ -171,12 +172,15 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) &tegra_wm8903_hp_jack_gpio); } +if (of_property_read_bool (card->dev->of_node,"nvidia,headset" )) + shrt =SND_JACK_MICROPHONE ; +snd_soc_card_jack_new (rtd->card,"Mic Jack" ,SND_JACK_MICROPHONE , &tegra_wm8903_mic_jack, tegra_wm8903_mic_jack_pins,ARRAY_SIZE (tegra_wm8903_mic_jack_pins));wm8903_mic_detect (component, &tegra_wm8903_mic_jack,SND_JACK_MICROPHONE , -0 ); + shrt);snd_soc_dapm_force_enable_pin (&card->dapm,"MICBIAS" );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 11/266 backlight: lp855x: Ensure regulators are disabled on probe failure
In reply to Sasha LevinFrom: Jon Hunter <[email protected]>
[ Upstream commit d8207c155a7c6015eb7f43739baa7dfb1fa638af ]
If probing the LP885x backlight fails after the regulators have been enabled, then the following warning is seen when releasing the regulators ...
WARNING: CPU: 1 PID: 289 at drivers/regulator/core.c:2051 _regulator_put.part.28+0x158/0x160 Modules linked in: tegra_xudc lp855x_bl(+) host1x pwm_tegra ip_tables x_tables ipv6 nf_defrag_ipv6 CPU: 1 PID: 289 Comm: systemd-udevd Not tainted 5.6.0-rc2-next-20200224 #1 Hardware name: NVIDIA Jetson TX1 Developer Kit (DT)
...
Call trace: _regulator_put.part.28+0x158/0x160 regulator_put+0x34/0x50 devm_regulator_release+0x10/0x18 release_nodes+0x12c/0x230 devres_release_all+0x34/0x50 really_probe+0x1c0/0x370 driver_probe_device+0x58/0x100 device_driver_attach+0x6c/0x78 __driver_attach+0xb0/0xf0 bus_for_each_dev+0x68/0xc8 driver_attach+0x20/0x28 bus_add_driver+0x160/0x1f0 driver_register+0x60/0x110 i2c_register_driver+0x40/0x80 lp855x_driver_init+0x20/0x1000 [lp855x_bl] do_one_initcall+0x58/0x1a0 do_init_module+0x54/0x1d0 load_module+0x1d80/0x21c8 __do_sys_finit_module+0xe8/0x100 __arm64_sys_finit_module+0x18/0x20 el0_svc_common.constprop.3+0xb0/0x168 do_el0_svc+0x20/0x98 el0_sync_handler+0xf4/0x1b0 el0_sync+0x140/0x180
Fix this by ensuring that the regulators are disabled, if enabled, on probe failure.
Finally, ensure that the vddio regulator is disabled in the driver remove handler.
--- drivers/video/backlight/lp855x_bl.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/video/backlight/lp855x_bl.c +16 -4
@@ -456,7 +456,7 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) ret =regulator_enable (lp->enable);if (ret <0 ) {dev_err (lp->dev,"failed to enable vddio: %d\n" , ret); -return ret; + goto disable_supply; }/*
@@ -471,24 +471,34 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) ret =lp855x_configure (lp);if (ret) {dev_err (lp->dev,"device config err: %d" , ret); -return ret; + goto disable_vddio; } ret =lp855x_backlight_register (lp);if (ret) {dev_err (lp->dev,"failed to register backlight. err: %d\n" , ret); -return ret; + goto disable_vddio; } ret =sysfs_create_group (&lp->dev->kobj, &lp855x_attr_group);if (ret) {dev_err (lp->dev,"failed to register sysfs. err: %d\n" , ret); -return ret; + goto disable_vddio; }backlight_update_status (lp->bl); +return 0 ; + +disable_vddio: +if (lp->enable) +regulator_disable (lp->enable); +disable_supply: +if (lp->supply) +regulator_disable (lp->supply); + +return ret; }static int lp855x_remove (struct i2c_client *cl)
@@ -497,6 +507,8 @@ static int lp855x_remove(struct i2c_client *cl) lp->bl->props.brightness =0 ;backlight_update_status (lp->bl); +if (lp->enable) +regulator_disable (lp->enable);if (lp->supply)regulator_disable (lp->supply);sysfs_remove_group (&lp->dev->kobj, &lp855x_attr_group);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 35/266 dm mpath: switch paths in dm_blk_ioctl() code path
In reply to Sasha LevinFrom: Martin Wilck <[email protected]>
[ Upstream commit 2361ae595352dec015d14292f1b539242d8446d6 ]
SCSI LUN passthrough code such as qemu's "scsi-block" device model pass every IO to the host via SG_IO ioctls. Currently, dm-multipath calls choose_pgpath() only in the block IO code path, not in the ioctl code path (unless current_pgpath is NULL). This has the effect that no path switching and thus no load balancing is done for SCSI-passthrough IO, unless the active path fails.
Fix this by using the same logic in multipath_prepare_ioctl() as in multipath_clone_and_map().
Note: The allegedly best path selection algorithm, service-time, still wouldn't work perfectly, because the io size of the current request is always set to 0. Changing that for the IO passthrough case would require the ioctl cmd and arg to be passed to dm's prepare_ioctl() method.
--- drivers/md/dm-mpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-mpath.c +1 -1
@@ -1856,7 +1856,7 @@ static int multipath_prepare_ioctl(struct dm_target *ti,int r; current_pgpath =READ_ONCE (m->current_pgpath); -if (!current_pgpath) +if (!current_pgpath || !test_bit (MPATHF_QUEUE_IO , &m->flags)) current_pgpath =choose_pgpath (m,0 );if (current_pgpath) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 59/266 scsi: vhost: Notify TCM about the maximum sg entries supported per command
In reply to Sasha LevinFrom: Sudhakar Panneerselvam <[email protected]>
[ Upstream commit 5ae6a6a915033bfee79e76e0c374d4f927909edc ]
vhost-scsi pre-allocates the maximum sg entries per command and if a command requires more than VHOST_SCSI_PREALLOC_SGLS entries, then that command is failed by it. This patch lets vhost communicate the max sg limit when it registers vhost_scsi_ops with TCM. With this change, TCM would report the max sg entries through "Block Limits" VPD page which will be typically queried by the SCSI initiator during device discovery. By knowing this limit, the initiator could ensure the maximum transfer length is less than or equal to what is reported by vhost-scsi.
--- drivers/vhost/scsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/vhost/scsi.c +1 -0
@@ -2290,6 +2290,7 @@ static struct configfs_attribute *vhost_scsi_wwn_attrs[] = {static const struct target_core_fabric_ops vhost_scsi_ops = { .module =THIS_MODULE , .fabric_name ="vhost" , + .max_data_sg_nents =VHOST_SCSI_PREALLOC_SGLS , .tpg_get_wwn = vhost_scsi_get_fabric_wwn, .tpg_get_tag = vhost_scsi_get_tpgt, .tpg_check_demo_mode = vhost_scsi_check_true,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 69/266 pwm: img: Call pm_runtime_put() in pm_runtime_get_sync() failed case
In reply to Sasha LevinFrom: Navid Emamdoost <[email protected]>
[ Upstream commit ca162ce98110b98e7d97b7157328d34dcfdd40a9 ]
Even in failed case of pm_runtime_get_sync(), the usage_count is incremented. In order to keep the usage_count with correct value call appropriate pm_runtime_put().
--- drivers/pwm/pwm-img.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pwm/pwm-img.c +6 -2
@@ -129,8 +129,10 @@ static int img_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, duty =DIV_ROUND_UP (timebase * duty_ns, period_ns); ret =pm_runtime_get_sync (chip->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_autosuspend (chip->dev);return ret; + } val =img_pwm_readl (pwm_chip,PWM_CTRL_CFG ); val &= ~(PWM_CTRL_CFG_DIV_MASK <<PWM_CTRL_CFG_DIV_SHIFT (pwm->hwpwm));
@@ -331,8 +333,10 @@ static int img_pwm_remove(struct platform_device *pdev)int ret; ret =pm_runtime_get_sync (&pdev->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (&pdev->dev);return ret; + }for (i =0 ; i < pwm_chip->chip.npwm; i++) { val =img_pwm_readl (pwm_chip,PWM_CTRL_CFG );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 70/266 sparc32: mm: Don't try to free page-table pages if ctor() fails
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit 454b0289c6b5f2c66164654b80212d15fbef7a03 ]
The pages backing page-table allocations for SRMMU are allocated via memblock as part of the "nocache" region initialisation during srmmu_paging_init() and should not be freed even if a later call to pgtable_pte_page_ctor() fails.
Remove the broken call to __free_page().
--- arch/sparc/mm/srmmu.c | 1 - 1 file changed, 1 deletion(-)
arch/sparc/mm/srmmu.c +0 -1
@@ -379,7 +379,6 @@ pgtable_t pte_alloc_one(struct mm_struct *mm)return NULL ; page =pfn_to_page (__nocache_pa (pte) >>PAGE_SHIFT );if (!pgtable_pte_page_ctor (page)) { -__free_page (page);return NULL ; }return page;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 71/266 yam: fix possible memory leak in yam_init_driver
In reply to Sasha LevinFrom: Wang Hai <[email protected]>
[ Upstream commit 98749b7188affbf2900c2aab704a8853901d1139 ]
If register_netdev(dev) fails, free_netdev(dev) needs to be called, otherwise a memory leak will occur.
--- drivers/net/hamradio/yam.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/hamradio/yam.c +1 -0
@@ -1133,6 +1133,7 @@ static int __init yam_init_driver(void) err =register_netdev (dev);if (err) {printk (KERN_WARNING "yam: cannot register net device %s\n" , dev->name); +free_netdev (dev); goto error; } yam_devs[i] = dev;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 96/266 virtiofs: schedule blocking async replies in separate worker
In reply to Sasha LevinFrom: Vivek Goyal <[email protected]>
[ Upstream commit bb737bbe48bea9854455cb61ea1dc06e92ce586c ]
In virtiofs (unlike in regular fuse) processing of async replies is serialized. This can result in a deadlock in rare corner cases when there's a circular dependency between the completion of two or more async replies.
Such a deadlock can be reproduced with xfstests:generic/503 if TEST_DIR == SCRATCH_MNT (which is a misconfiguration):
- Process A is waiting for page lock in worker thread context and blocked (virtio_fs_requests_done_work()).
- Process B is holding page lock and waiting for pending writes to finish (fuse_wait_on_page_writeback()).
- Write requests are waiting in virtqueue and can't complete because worker thread is blocked on page lock (process A).
Fix this by creating a unique work_struct for each async reply that can block (O_DIRECT read).
--- fs/fuse/file.c | 1 + fs/fuse/fuse_i.h | 1 + fs/fuse/virtio_fs.c | 106 +++++++++++++++++++++++++++++--------------- 3 files changed, 73 insertions(+), 35 deletions(-)
fs/fuse/file.c +1 -0
@@ -712,6 +712,7 @@ static ssize_t fuse_async_req_send(struct fuse_conn *fc,spin_unlock (&io->lock); ia->ap.args.end = fuse_aio_complete_req; + ia->ap.args.may_block = io->should_dirty; err =fuse_simple_background (fc, &ia->ap.args,GFP_KERNEL );if (err)fuse_aio_complete_req (fc, &ia->ap.args, err);
fs/fuse/fuse_i.h +1 -0
@@ -249,6 +249,7 @@ struct fuse_args { bool out_argvar:1; bool page_zeroing:1; bool page_replace:1; + bool may_block:1;struct fuse_in_arg in_args[3 ];struct fuse_arg out_args[2 ];void (*end)(struct fuse_conn *fc,struct fuse_args *args,int error);
fs/fuse/virtio_fs.c +71 -35
134 lines not on this page · raw message
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 119/266 staging: sm750fb: add missing case while setting FB_VISUAL
In reply to Sasha LevinFrom: Matej Dujava <[email protected]>
[ Upstream commit fa90133377f4a7f15a937df6ad55133bb57c5665 ]
Switch statement does not contain all cases: 8, 16, 24, 32. This patch will add missing one (24)
--- drivers/staging/sm750fb/sm750.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/sm750fb/sm750.c +1 -0
@@ -898,6 +898,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) fix->visual =FB_VISUAL_PSEUDOCOLOR ;break ;case 16 : +case 24 :case 32 : fix->visual =FB_VISUAL_TRUECOLOR ;break ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 132/266 scsi: target: loopback: Fix READ with data and sensebytes
In reply to Sasha LevinFrom: Bodo Stroesser <[email protected]>
[ Upstream commit c68a56736c129f5dd1632856956f9c3e04bae200 ]
We use tcm_loop with tape emulations running on tcmu.
In case application reads a short tape block with a longer READ, or a long tape block with a short READ, according to SCC spec data has to be tranferred _and_ sensebytes with ILI set and information field containing the residual count. Similar problem also exists when using fixed block size in READ.
Up to now tcm_loop is not prepared to handle sensebytes if input data is provided, as in tcm_loop_queue_data_in() it only sets SAM_STAT_GOOD and, if necessary, the residual count.
To fix the bug, the same handling for sensebytes as present in tcm_loop_queue_status() must be done in tcm_loop_queue_data_in() also.
After adding this handling, the two function now are nearly identical, so I created a single function with two wrappers.
--- drivers/target/loopback/tcm_loop.c | 36 +++++++++++++----------------- 1 file changed, 15 insertions(+), 21 deletions(-)
drivers/target/loopback/tcm_loop.c +15 -21
@@ -545,32 +545,15 @@ static int tcm_loop_write_pending(struct se_cmd *se_cmd)return 0 ; } -static int tcm_loop_queue_data_in (struct se_cmd *se_cmd) +static int tcm_loop_queue_data_or_status (const char *func, +struct se_cmd *se_cmd,u8 scsi_status) {struct tcm_loop_cmd *tl_cmd =container_of (se_cmd, struct tcm_loop_cmd, tl_se_cmd);struct scsi_cmnd *sc = tl_cmd->sc;pr_debug ("%s() called for scsi_cmnd: %p cdb: 0x%02x\n" , - __func__, sc, sc->cmnd[0 ]); - - sc->result =SAM_STAT_GOOD ; -set_host_byte (sc,DID_OK ); -if ((se_cmd->se_cmd_flags &SCF_OVERFLOW_BIT ) || - (se_cmd->se_cmd_flags &SCF_UNDERFLOW_BIT )) -scsi_set_resid (sc, se_cmd->residual_count); - sc->scsi_done (sc); -return 0 ; -} - -static int tcm_loop_queue_status (struct se_cmd *se_cmd) -{ -struct tcm_loop_cmd *tl_cmd =container_of (se_cmd, - struct tcm_loop_cmd, tl_se_cmd); -struct scsi_cmnd *sc = tl_cmd->sc; - -pr_debug ("%s() called for scsi_cmnd: %p cdb: 0x%02x\n" , - __func__, sc, sc->cmnd[0 ]); + func, sc, sc->cmnd[0 ]); if (se_cmd->sense_buffer && ((se_cmd->se_cmd_flags & SCF_TRANSPORT_TASK_SENSE) ||
@@ -581,7 +564,7 @@ static int tcm_loop_queue_status(struct se_cmd *se_cmd) sc->result =SAM_STAT_CHECK_CONDITION ;set_driver_byte (sc,DRIVER_SENSE ); }else - sc->result = se_cmd->scsi_status; + sc->result = scsi_status;set_host_byte (sc,DID_OK ); if ((se_cmd->se_cmd_flags & SCF_OVERFLOW_BIT) ||
@@ -591,6 +574,17 @@ static int tcm_loop_queue_status(struct se_cmd *se_cmd)return 0 ; } +static int tcm_loop_queue_data_in (struct se_cmd *se_cmd) +{ +return tcm_loop_queue_data_or_status (__func__, se_cmd,SAM_STAT_GOOD ); +} + +static int tcm_loop_queue_status (struct se_cmd *se_cmd) +{ +return tcm_loop_queue_data_or_status (__func__, + se_cmd, se_cmd->scsi_status); +} +static void tcm_loop_queue_tm_rsp (struct se_cmd *se_cmd) { struct tcm_loop_cmd *tl_cmd = container_of(se_cmd,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 137/266 pinctrl: rockchip: fix memleak in rockchip_dt_node_to_map
In reply to Sasha LevinFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit d7faa8ffb6be57bf8233a4b5a636d76b83c51ce7 ]
In function rockchip_dt_node_to_map, a new_map variable is allocated by:
new_map = devm_kcalloc(pctldev->dev, map_num, sizeof(*new_map),
GFP_KERNEL);
This uses devres and attaches new_map to the pinctrl driver. This cause a leak since new_map is not released when the probed driver is removed. Fix it by using kcalloc to allocate new_map and free it in rockchip_dt_free_map
--- drivers/pinctrl/pinctrl-rockchip.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +4 -3
@@ -506,8 +506,8 @@ static int rockchip_dt_node_to_map(struct pinctrl_dev *pctldev, } map_num += grp->npins; - new_map =devm_kcalloc (pctldev->dev, map_num,sizeof (*new_map), -GFP_KERNEL ); + + new_map =kcalloc (map_num,sizeof (*new_map),GFP_KERNEL );if (!new_map)return -ENOMEM ;
@@ -517,7 +517,7 @@ static int rockchip_dt_node_to_map(struct pinctrl_dev *pctldev,/* create mux map */ parent =of_get_parent (np);if (!parent) { -devm_kfree (pctldev->dev, new_map); +kfree (new_map);return -EINVAL ; } new_map[0 ].type =PIN_MAP_TYPE_MUX_GROUP ;
@@ -544,6 +544,7 @@ static int rockchip_dt_node_to_map(struct pinctrl_dev *pctldev,static void rockchip_dt_free_map (struct pinctrl_dev *pctldev,struct pinctrl_map *map,unsigned num_maps) { +kfree (map); }static const struct pinctrl_ops rockchip_pctrl_ops = {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 138/266 dlm: remove BUG() before panic()
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit fe204591cc9480347af7d2d6029b24a62e449486 ]
Building a kernel with clang sometimes fails with an objtool error in dlm:
fs/dlm/lock.o: warning: objtool: revert_lock_pc()+0xbd: can't find jump dest instruction at .text+0xd7fc
The problem is that BUG() never returns and the compiler knows that anything after it is unreachable, however the panic still emits some code that does not get fully eliminated.
Having both BUG() and panic() is really pointless as the BUG() kills the current process and the subsequent panic() never hits. In most cases, we probably don't really want either and should replace the DLM_ASSERT() statements with WARN_ON(), as has been done for some of them.
Remove the BUG() here so the user at least sees the panic message and we can reliably build randconfig kernels.
--- fs/dlm/dlm_internal.h | 1 - 1 file changed, 1 deletion(-)
fs/dlm/dlm_internal.h +0 -1
@@ -97,7 +97,6 @@ do { \ __LINE__, __FILE__, #x, jiffies); \ {do} \ printk("\n"); \ - BUG(); \ panic("DLM: Record message above and reboot.\n"); \ } \ }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 165/266 scsi: target: tcmu: Userspace must not complete queued commands
In reply to Sasha LevinFrom: Bodo Stroesser <[email protected]>
[ Upstream commit 61fb2482216679b9e1e797440c148bb143a5040a ]
When tcmu queues a new command - no matter whether in command ring or in qfull_queue - a cmd_id from IDR udev->commands is assigned to the command.
If userspace sends a wrong command completion containing the cmd_id of a command on the qfull_queue, tcmu_handle_completions() finds the command in the IDR and calls tcmu_handle_completion() for it. This might do some nasty things because commands in qfull_queue do not have a valid dbi list.
To fix this bug, we no longer add queued commands to the idr. Instead the cmd_id is assign when a command is written to the command ring.
Due to this change I had to adapt the source code at several places where up to now an idr_for_each had been done.
[mkp: fix checkpatch warnings]
--- drivers/target/target_core_user.c | 154 ++++++++++++++---------------- 1 file changed, 71 insertions(+), 83 deletions(-)
drivers/target/target_core_user.c +71 -83
@@ -882,41 +882,24 @@ static inline size_t tcmu_cmd_get_cmd_size(struct tcmu_cmd *tcmu_cmd,return command_size; } -static int tcmu_setup_cmd_timer (struct tcmu_cmd *tcmu_cmd,unsigned int tmo, -struct timer_list *timer) +static void tcmu_setup_cmd_timer (struct tcmu_cmd *tcmu_cmd,unsigned int tmo, +struct timer_list *timer) { -struct tcmu_dev *udev = tcmu_cmd->tcmu_dev; -int cmd_id; - -if (tcmu_cmd->cmd_id) - goto setup_timer; - - cmd_id =idr_alloc (&udev->commands, tcmu_cmd,1 ,USHRT_MAX ,GFP_NOWAIT ); -if (cmd_id <0 ) { -pr_err ("tcmu: Could not allocate cmd id.\n" ); -return cmd_id; - } - tcmu_cmd->cmd_id = cmd_id; - -pr_debug ("allocated cmd %u for dev %s tmo %lu\n" , tcmu_cmd->cmd_id, - udev->name, tmo /MSEC_PER_SEC ); - -setup_timer:if (!tmo) -return 0 ; +return ; tcmu_cmd->deadline =round_jiffies_up (jiffies +msecs_to_jiffies (tmo));if (!timer_pending (timer))mod_timer (timer, tcmu_cmd->deadline); -return 0 ; +pr_debug ("Timeout set up for cmd %p, dev = %s, tmo = %lu\n" , tcmu_cmd, + tcmu_cmd->tcmu_dev->name, tmo /MSEC_PER_SEC ); }static int add_to_qfull_queue (struct tcmu_cmd *tcmu_cmd) {struct tcmu_dev *udev = tcmu_cmd->tcmu_dev;unsigned int tmo; -int ret;/* * For backwards compat if qfull_time_out is not set use
@@ -931,13 +914,11 @@ static int add_to_qfull_queue(struct tcmu_cmd *tcmu_cmd)else tmo =TCMU_TIME_OUT ; - ret =tcmu_setup_cmd_timer (tcmu_cmd, tmo, &udev->qfull_timer); -if (ret) -return ret; +tcmu_setup_cmd_timer (tcmu_cmd, tmo, &udev->qfull_timer);list_add_tail (&tcmu_cmd->queue_entry, &udev->qfull_queue); -pr_debug ("adding cmd %u on dev %s to ring space wait queue\n" , - tcmu_cmd->cmd_id, udev->name); +pr_debug ("adding cmd %p on dev %s to ring space wait queue\n" , + tcmu_cmd, udev->name);return 0 ; }
@@ -959,7 +940,7 @@ static int queue_cmd_ring(struct tcmu_cmd *tcmu_cmd, sense_reason_t *scsi_err)struct tcmu_mailbox *mb;struct tcmu_cmd_entry *entry;struct iovec *iov; -int iov_cnt, ret; +int iov_cnt, cmd_id;uint32_t cmd_head;uint64_t cdb_off;bool copy_to_data_area;
@@ -1060,14 +1041,21 @@ static int queue_cmd_ring(struct tcmu_cmd *tcmu_cmd, sense_reason_t *scsi_err) } entry->req.iov_bidi_cnt = iov_cnt; - ret =tcmu_setup_cmd_timer (tcmu_cmd, udev->cmd_time_out, - &udev->cmd_timer); -if (ret) { -tcmu_cmd_free_data (tcmu_cmd, tcmu_cmd->dbi_cnt); + cmd_id =idr_alloc (&udev->commands, tcmu_cmd,1 ,USHRT_MAX ,GFP_NOWAIT ); +if (cmd_id <0 ) { +pr_err ("tcmu: Could not allocate cmd id.\n" ); +tcmu_cmd_free_data (tcmu_cmd, tcmu_cmd->dbi_cnt); *scsi_err =TCM_OUT_OF_RESOURCES ;return -1 ; } + tcmu_cmd->cmd_id = cmd_id; + +pr_debug ("allocated cmd id %u for cmd %p dev %s\n" , tcmu_cmd->cmd_id, + tcmu_cmd, udev->name); + +tcmu_setup_cmd_timer (tcmu_cmd, udev->cmd_time_out, &udev->cmd_timer); + entry->hdr.cmd_id = tcmu_cmd->cmd_id;/*
@@ -1279,50 +1267,39 @@ static unsigned int tcmu_handle_completions(struct tcmu_dev *udev)return handled; } -static int tcmu_check_expired_cmd (int id,void *p,void *data) +static void tcmu_check_expired_ring_cmd (struct tcmu_cmd *cmd) { -struct tcmu_cmd *cmd = p; -struct tcmu_dev *udev = cmd->tcmu_dev; -u8 scsi_status;struct se_cmd *se_cmd; -bool is_running; - -if (test_bit (TCMU_CMD_BIT_EXPIRED , &cmd->flags)) -return 0 ;if (!time_after (jiffies, cmd->deadline)) -return 0 ; +return ; - is_running =test_bit (TCMU_CMD_BIT_INFLIGHT , &cmd->flags); +set_bit (TCMU_CMD_BIT_EXPIRED , &cmd->flags); +list_del_init (&cmd->queue_entry); se_cmd = cmd->se_cmd; + cmd->se_cmd =NULL ; -if (is_running) { -/* -* If cmd_time_out is disabled but qfull is set deadline -* will only reflect the qfull timeout. Ignore it. -*/ -if (!udev->cmd_time_out) -return 0 ; +pr_debug ("Timing out inflight cmd %u on dev %s.\n" , + cmd->cmd_id, cmd->tcmu_dev->name); -set_bit (TCMU_CMD_BIT_EXPIRED , &cmd->flags); -/* -* target_complete_cmd will translate this to LUN COMM FAILURE -*/ - scsi_status =SAM_STAT_CHECK_CONDITION ; -list_del_init (&cmd->queue_entry); - cmd->se_cmd =NULL ; - }else { -list_del_init (&cmd->queue_entry); -idr_remove (&udev->commands, id); -tcmu_free_cmd (cmd); - scsi_status =SAM_STAT_TASK_SET_FULL ; - } +target_complete_cmd (se_cmd,SAM_STAT_CHECK_CONDITION ); +} -pr_debug ("Timing out cmd %u on dev %s that is %s.\n" , - id, udev->name, is_running ?"inflight" :"queued" ); +static void tcmu_check_expired_queue_cmd (struct tcmu_cmd *cmd) +{ +struct se_cmd *se_cmd; -target_complete_cmd (se_cmd, scsi_status); -return 0 ; +if (!time_after (jiffies, cmd->deadline)) +return ; + +list_del_init (&cmd->queue_entry); + se_cmd = cmd->se_cmd; +tcmu_free_cmd (cmd); + +pr_debug ("Timing out queued cmd %p on dev %s.\n" , + cmd, cmd->tcmu_dev->name); + +target_complete_cmd (se_cmd,SAM_STAT_TASK_SET_FULL ); }static void tcmu_device_timedout (struct tcmu_dev *udev)
@@ -1407,16 +1384,15 @@ static struct se_device *tcmu_alloc_device(struct se_hba *hba, const char *name)return &udev->se_dev; } -static bool run_qfull_queue (struct tcmu_dev *udev,bool fail) +static void run_qfull_queue (struct tcmu_dev *udev,bool fail) {struct tcmu_cmd *tcmu_cmd, *tmp_cmd;LIST_HEAD (cmds); -bool drained = true;sense_reason_t scsi_ret;int ret;if (list_empty (&udev->qfull_queue)) -return true; +return ;pr_debug ("running %s's cmdr queue forcefail %d\n" , udev->name, fail);
@@ -1425,11 +1401,10 @@ static bool run_qfull_queue(struct tcmu_dev *udev, bool fail)list_for_each_entry_safe (tcmu_cmd, tmp_cmd, &cmds, queue_entry) {list_del_init (&tcmu_cmd->queue_entry); -pr_debug ("removing cmd %u on dev %s from queue\n" , - tcmu_cmd->cmd_id, udev->name); +pr_debug ("removing cmd %p on dev %s from queue\n" , + tcmu_cmd, udev->name);if (fail) { -idr_remove (&udev->commands, tcmu_cmd->cmd_id);/* * We were not able to even start the command, so * fail with busy to allow a retry in case runner
@@ -1444,10 +1419,8 @@ static bool run_qfull_queue(struct tcmu_dev *udev, bool fail) ret =queue_cmd_ring (tcmu_cmd, &scsi_ret);if (ret <0 ) { -pr_debug ("cmd %u on dev %s failed with %u\n" , - tcmu_cmd->cmd_id, udev->name, scsi_ret); - -idr_remove (&udev->commands, tcmu_cmd->cmd_id); +pr_debug ("cmd %p on dev %s failed with %u\n" , + tcmu_cmd, udev->name, scsi_ret);/* * Ignore scsi_ret for now. target_complete_cmd * drops it.
@@ -1462,13 +1435,11 @@ static bool run_qfull_queue(struct tcmu_dev *udev, bool fail)* the queue */ list_splice_tail (&cmds, &udev->qfull_queue); - drained = false;break ; } }tcmu_set_next_deadline (&udev->qfull_queue, &udev->qfull_timer); -return drained; }static int tcmu_irqcontrol (struct uio_info *info,s32 irq_on)
@@ -1652,6 +1623,8 @@ static void tcmu_dev_kref_release(struct kref *kref)if (tcmu_check_and_free_pending_cmd (cmd) !=0 ) all_expired = false; } +if (!list_empty (&udev->qfull_queue)) + all_expired = false;idr_destroy (&udev->commands);WARN_ON (!all_expired);
@@ -2037,9 +2010,6 @@ static void tcmu_reset_ring(struct tcmu_dev *udev, u8 err_level)mutex_lock (&udev->cmdr_lock);idr_for_each_entry (&udev->commands, cmd, i) { -if (!test_bit (TCMU_CMD_BIT_INFLIGHT , &cmd->flags)) -continue ; -pr_debug ("removing cmd %u on dev %s from ring (is expired %d)\n" , cmd->cmd_id, udev->name,test_bit (TCMU_CMD_BIT_EXPIRED , &cmd->flags));
@@ -2077,6 +2047,8 @@ static void tcmu_reset_ring(struct tcmu_dev *udev, u8 err_level)del_timer (&udev->cmd_timer); +run_qfull_queue (udev, false); +mutex_unlock (&udev->cmdr_lock); }
@@ -2698,6 +2670,7 @@ static void find_free_blocks(void)static void check_timedout_devices (void ) {struct tcmu_dev *udev, *tmp_dev; +struct tcmu_cmd *cmd, *tmp_cmd;LIST_HEAD (devs);spin_lock_bh (&timed_out_udevs_lock);
@@ -2708,9 +2681,24 @@ static void check_timedout_devices(void)spin_unlock_bh (&timed_out_udevs_lock);mutex_lock (&udev->cmdr_lock); -idr_for_each (&udev->commands, tcmu_check_expired_cmd,NULL ); -tcmu_set_next_deadline (&udev->inflight_queue, &udev->cmd_timer); +/* +* If cmd_time_out is disabled but qfull is set deadline +* will only reflect the qfull timeout. Ignore it. +*/ +if (udev->cmd_time_out) { +list_for_each_entry_safe (cmd, tmp_cmd, + &udev->inflight_queue, + queue_entry) { +tcmu_check_expired_ring_cmd (cmd); + } +tcmu_set_next_deadline (&udev->inflight_queue, + &udev->cmd_timer); + } +list_for_each_entry_safe (cmd, tmp_cmd, &udev->qfull_queue, + queue_entry) { +tcmu_check_expired_queue_cmd (cmd); + }tcmu_set_next_deadline (&udev->qfull_queue, &udev->qfull_timer);mutex_unlock (&udev->cmdr_lock);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 169/266 arm64: tegra: Fix ethernet phy-mode for Jetson Xavier
In reply to Sasha LevinFrom: Jon Hunter <[email protected]>
[ Upstream commit bba25915b172c72f6fa635f091624d799e3c9cae ]
The 'phy-mode' property is currently defined as 'rgmii' for Jetson Xavier. This indicates that the RGMII RX and TX delays are set by the MAC and the internal delays set by the PHY are not used.
If the Marvell PHY driver is enabled, such that it is used and not the generic PHY, ethernet failures are seen (DHCP is failing to obtain an IP address) and this is caused because the Marvell PHY driver is disabling the internal RX and TX delays. For Jetson Xavier the internal PHY RX and TX delay should be used and so fix this by setting the 'phy-mode' to 'rgmii-id' and not 'rgmii'.
--- arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +1 -1
@@ -32,7 +32,7 @@ ethernet@2490000 { phy-reset-gpios = <&gpio TEGRA194_MAIN_GPIO(G, 5) GPIO_ACTIVE_LOW>; phy-handle = <&phy>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; mdio { #address-cells = <1>;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 170/266 arm64: tegra: Fix flag for 64-bit resources in 'ranges' property
In reply to Sasha LevinFrom: Vidya Sagar <[email protected]>
[ Upstream commit 3482a7afb261e2de9269a7f9ad0f4a3a82a83a53 ]
Fix flag in PCIe controllers device-tree nodes 'ranges' property to correctly represent 64-bit resources.
--- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +6 -6
@@ -1192,7 +1192,7 @@ pcie@14100000 { bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x30100000 0x0 0x30100000 0x0 0x00100000 /* downstream I/O (1MB) */ - 0xc2000000 0x12 0x00000000 0x12 0x00000000 0x0 0x30000000 /* prefetchable memory (768MB) */ + 0xc3000000 0x12 0x00000000 0x12 0x00000000 0x0 0x30000000 /* prefetchable memory (768MB) */ 0x82000000 0x0 0x40000000 0x12 0x30000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */ };
@@ -1238,7 +1238,7 @@ pcie@14120000 { bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x32100000 0x0 0x32100000 0x0 0x00100000 /* downstream I/O (1MB) */ - 0xc2000000 0x12 0x40000000 0x12 0x40000000 0x0 0x30000000 /* prefetchable memory (768MB) */ + 0xc3000000 0x12 0x40000000 0x12 0x40000000 0x0 0x30000000 /* prefetchable memory (768MB) */ 0x82000000 0x0 0x40000000 0x12 0x70000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */ };
@@ -1284,7 +1284,7 @@ pcie@14140000 { bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x34100000 0x0 0x34100000 0x0 0x00100000 /* downstream I/O (1MB) */ - 0xc2000000 0x12 0x80000000 0x12 0x80000000 0x0 0x30000000 /* prefetchable memory (768MB) */ + 0xc3000000 0x12 0x80000000 0x12 0x80000000 0x0 0x30000000 /* prefetchable memory (768MB) */ 0x82000000 0x0 0x40000000 0x12 0xb0000000 0x0 0x10000000>; /* non-prefetchable memory (256MB) */ };
@@ -1330,7 +1330,7 @@ pcie@14160000 { bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x36100000 0x0 0x36100000 0x0 0x00100000 /* downstream I/O (1MB) */ - 0xc2000000 0x14 0x00000000 0x14 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */ + 0xc3000000 0x14 0x00000000 0x14 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */ 0x82000000 0x0 0x40000000 0x17 0x40000000 0x0 0xc0000000>; /* non-prefetchable memory (3GB) */ };
@@ -1376,7 +1376,7 @@ pcie@14180000 { bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x38100000 0x0 0x38100000 0x0 0x00100000 /* downstream I/O (1MB) */ - 0xc2000000 0x18 0x00000000 0x18 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */ + 0xc3000000 0x18 0x00000000 0x18 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */ 0x82000000 0x0 0x40000000 0x1b 0x40000000 0x0 0xc0000000>; /* non-prefetchable memory (3GB) */ };
@@ -1426,7 +1426,7 @@ pcie@141a0000 { bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x3a100000 0x0 0x3a100000 0x0 0x00100000 /* downstream I/O (1MB) */ - 0xc2000000 0x1c 0x00000000 0x1c 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */ + 0xc3000000 0x1c 0x00000000 0x1c 0x00000000 0x3 0x40000000 /* prefetchable memory (13GB) */ 0x82000000 0x0 0x40000000 0x1f 0x40000000 0x0 0xc0000000>; /* non-prefetchable memory (3GB) */ };
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 172/266 dm zoned: return NULL if dmz_get_zone_for_reclaim() fails to find a zone
In reply to Sasha LevinFrom: Hannes Reinecke <[email protected]>
[ Upstream commit 489dc0f06a5837f87482c0ce61d830d24e17082e ]
The only case where dmz_get_zone_for_reclaim() cannot return a zone is if the respective lists are empty. So we should just return a simple NULL value here as we really don't have an error code which would make sense.
--- drivers/md/dm-zoned-metadata.c | 4 ++-- drivers/md/dm-zoned-reclaim.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/md/dm-zoned-metadata.c +2 -2
@@ -1589,7 +1589,7 @@ static struct dm_zone *dmz_get_rnd_zone_for_reclaim(struct dmz_metadata *zmd)return dzone; } -return ERR_PTR (-EBUSY ); +return NULL ; }/*
@@ -1609,7 +1609,7 @@ static struct dm_zone *dmz_get_seq_zone_for_reclaim(struct dmz_metadata *zmd)return zone; } -return ERR_PTR (-EBUSY ); +return NULL ; }/*
drivers/md/dm-zoned-reclaim.c +2 -2
@@ -349,8 +349,8 @@ static int dmz_do_reclaim(struct dmz_reclaim *zrc)/* Get a data zone */ dzone =dmz_get_zone_for_reclaim (zmd); -if (IS_ERR (dzone)) -return PTR_ERR (dzone); +if (!dzone) +return -EBUSY ; start = jiffies;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 192/266 scsi: target: tcmu: Fix a use after free in tcmu_check_expired_queue_cmd()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 9d7464b18892332e35ff37f0b024429a1a9835e6 ]
The pr_debug() dereferences "cmd" after we already freed it by calling tcmu_free_cmd(cmd). The debug printk needs to be done earlier.
--- drivers/target/target_core_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/target/target_core_user.c +3 -3
@@ -1292,13 +1292,13 @@ static void tcmu_check_expired_queue_cmd(struct tcmu_cmd *cmd)if (!time_after (jiffies, cmd->deadline))return ; +pr_debug ("Timing out queued cmd %p on dev %s.\n" , + cmd, cmd->tcmu_dev->name); +list_del_init (&cmd->queue_entry); se_cmd = cmd->se_cmd;tcmu_free_cmd (cmd); -pr_debug ("Timing out queued cmd %p on dev %s.\n" , - cmd, cmd->tcmu_dev->name); -target_complete_cmd (se_cmd,SAM_STAT_TASK_SET_FULL ); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 195/266 KVM: PPC: Book3S HV: Ignore kmemleak false positives
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 0aca8a5575544bd21b3363058afb8f1e81505150 ]
kvmppc_pmd_alloc() and kvmppc_pte_alloc() allocate some memory but then pud_populate() and pmd_populate() will use __pa() to reference the newly allocated memory.
Since kmemleak is unable to track the physical memory resulting in false positives, silence those by using kmemleak_ignore().
unreferenced object 0xc000201c382a1000 (size 4096):
comm "qemu-kvm", pid 124828, jiffies 4295733767 (age 341.250s) hex dump (first 32 bytes):
c0 00 20 09 f4 60 03 87 c0 00 20 10 72 a0 03 87 .. ..`.... .r... c0 00 20 0e 13 a0 03 87 c0 00 20 1b dc c0 03 87 .. ....... .....
backtrace:
[<000000004cc2790f>] kvmppc_create_pte+0x838/0xd20 [kvm_hv] kvmppc_pmd_alloc at arch/powerpc/kvm/book3s_64_mmu_radix.c:366 (inlined by) kvmppc_create_pte at arch/powerpc/kvm/book3s_64_mmu_radix.c:590 [<00000000d123c49a>] kvmppc_book3s_instantiate_page+0x2e0/0x8c0 [kvm_hv] [<00000000bb549087>] kvmppc_book3s_radix_page_fault+0x1b4/0x2b0 [kvm_hv] [<0000000086dddc0e>] kvmppc_book3s_hv_page_fault+0x214/0x12a0 [kvm_hv] [<000000005ae9ccc2>] kvmppc_vcpu_run_hv+0xc5c/0x15f0 [kvm_hv] [<00000000d22162ff>] kvmppc_vcpu_run+0x34/0x48 [kvm] [<00000000d6953bc4>] kvm_arch_vcpu_ioctl_run+0x314/0x420 [kvm] [<000000002543dd54>] kvm_vcpu_ioctl+0x33c/0x950 [kvm] [<0000000048155cd6>] ksys_ioctl+0xd8/0x130 [<0000000041ffeaa7>] sys_ioctl+0x28/0x40 [<000000004afc4310>] system_call_exception+0x114/0x1e0 [<00000000fb70a873>] system_call_common+0xf0/0x278
unreferenced object 0xc0002001f0c03900 (size 256):
comm "qemu-kvm", pid 124830, jiffies 4295735235 (age 326.570s) hex dump (first 32 bytes):
c0 00 20 10 fa a0 03 87 c0 00 20 10 fa a1 03 87 .. ....... ..... c0 00 20 10 fa a2 03 87 c0 00 20 10 fa a3 03 87 .. ....... .....
backtrace:
[<0000000023f675b8>] kvmppc_create_pte+0x854/0xd20 [kvm_hv] kvmppc_pte_alloc at arch/powerpc/kvm/book3s_64_mmu_radix.c:356 (inlined by) kvmppc_create_pte at arch/powerpc/kvm/book3s_64_mmu_radix.c:593 [<00000000d123c49a>] kvmppc_book3s_instantiate_page+0x2e0/0x8c0 [kvm_hv] [<00000000bb549087>] kvmppc_book3s_radix_page_fault+0x1b4/0x2b0 [kvm_hv] [<0000000086dddc0e>] kvmppc_book3s_hv_page_fault+0x214/0x12a0 [kvm_hv] [<000000005ae9ccc2>] kvmppc_vcpu_run_hv+0xc5c/0x15f0 [kvm_hv] [<00000000d22162ff>] kvmppc_vcpu_run+0x34/0x48 [kvm] [<00000000d6953bc4>] kvm_arch_vcpu_ioctl_run+0x314/0x420 [kvm] [<000000002543dd54>] kvm_vcpu_ioctl+0x33c/0x950 [kvm] [<0000000048155cd6>] ksys_ioctl+0xd8/0x130 [<0000000041ffeaa7>] sys_ioctl+0x28/0x40 [<000000004afc4310>] system_call_exception+0x114/0x1e0 [<00000000fb70a873>] system_call_common+0xf0/0x278
--- arch/powerpc/kvm/book3s_64_mmu_radix.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_64_mmu_radix.c +14 -2
@@ -353,7 +353,13 @@ static struct kmem_cache *kvm_pmd_cache;static pte_t *kvmppc_pte_alloc (void ) { -return kmem_cache_alloc (kvm_pte_cache,GFP_KERNEL ); +pte_t *pte; + + pte =kmem_cache_alloc (kvm_pte_cache,GFP_KERNEL ); +/* pmd_populate() will only reference _pa(pte). */ +kmemleak_ignore (pte); + +return pte; }static void kvmppc_pte_free (pte_t *ptep)
@@ -363,7 +369,13 @@ static void kvmppc_pte_free(pte_t *ptep)static pmd_t *kvmppc_pmd_alloc (void ) { -return kmem_cache_alloc (kvm_pmd_cache,GFP_KERNEL ); +pmd_t *pmd; + + pmd =kmem_cache_alloc (kvm_pmd_cache,GFP_KERNEL ); +/* pud_populate() will only reference _pa(pmd). */ +kmemleak_ignore (pmd); + +return pmd; }static void kvmppc_pmd_free (pmd_t *pmdp)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 196/266 KVM: PPC: Book3S: Fix some RCU-list locks
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit ab8b65be183180c3eef405d449163964ecc4b571 ]
It is unsafe to traverse kvm->arch.spapr_tce_tables and stt->iommu_tables without the RCU read lock held. Also, add cond_resched_rcu() in places with the RCU read lock held that could take a while to finish.
arch/powerpc/kvm/book3s_64_vio.c:76 RCU-list traversed in non-reader section!!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
no locks held by qemu-kvm/4265.
stack backtrace: CPU: 96 PID: 4265 Comm: qemu-kvm Not tainted 5.7.0-rc4-next-20200508+ #2 Call Trace: [c000201a8690f720] [c000000000715948] dump_stack+0xfc/0x174 (unreliable) [c000201a8690f770] [c0000000001d9470] lockdep_rcu_suspicious+0x140/0x164 [c000201a8690f7f0] [c008000010b9fb48] kvm_spapr_tce_release_iommu_group+0x1f0/0x220 [kvm] [c000201a8690f870] [c008000010b8462c] kvm_spapr_tce_release_vfio_group+0x54/0xb0 [kvm] [c000201a8690f8a0] [c008000010b84710] kvm_vfio_destroy+0x88/0x140 [kvm] [c000201a8690f8f0] [c008000010b7d488] kvm_put_kvm+0x370/0x600 [kvm] [c000201a8690f990] [c008000010b7e3c0] kvm_vm_release+0x38/0x60 [kvm] [c000201a8690f9c0] [c0000000005223f4] __fput+0x124/0x330 [c000201a8690fa20] [c000000000151cd8] task_work_run+0xb8/0x130 [c000201a8690fa70] [c0000000001197e8] do_exit+0x4e8/0xfa0 [c000201a8690fb70] [c00000000011a374] do_group_exit+0x64/0xd0 [c000201a8690fbb0] [c000000000132c90] get_signal+0x1f0/0x1200 [c000201a8690fcc0] [c000000000020690] do_notify_resume+0x130/0x3c0 [c000201a8690fda0] [c000000000038d64] syscall_exit_prepare+0x1a4/0x280 [c000201a8690fe20] [c00000000000c8f8] system_call_common+0xf8/0x278
==
arch/powerpc/kvm/book3s_64_vio.c:368 RCU-list traversed in non-reader section!!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
2 locks held by qemu-kvm/4264:
#0: c000201ae2d000d8 (&vcpu->mutex){+.+.}-{3:3}, at: kvm_vcpu_ioctl+0xdc/0x950 [kvm] #1: c000200c9ed0c468 (&kvm->srcu){....}-{0:0}, at: kvmppc_h_put_tce+0x88/0x340 [kvm]
==
arch/powerpc/kvm/book3s_64_vio.c:108 RCU-list traversed in non-reader section!!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
1 lock held by qemu-kvm/4257:
#0: c000200b1b363a40 (&kv->lock){+.+.}-{3:3}, at: kvm_vfio_set_attr+0x598/0x6c0 [kvm]
==
arch/powerpc/kvm/book3s_64_vio.c:146 RCU-list traversed in non-reader section!!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
1 lock held by qemu-kvm/4257:
#0: c000200b1b363a40 (&kv->lock){+.+.}-{3:3}, at: kvm_vfio_set_attr+0x598/0x6c0 [kvm]
--- arch/powerpc/kvm/book3s_64_vio.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
arch/powerpc/kvm/book3s_64_vio.c +14 -4
@@ -74,6 +74,7 @@ extern void kvm_spapr_tce_release_iommu_group(struct kvm *kvm,struct kvmppc_spapr_tce_iommu_table *stit, *tmp;struct iommu_table_group *table_group =NULL ; +rcu_read_lock ();list_for_each_entry_rcu (stt, &kvm->arch.spapr_tce_tables, list) { table_group =iommu_group_get_iommudata (grp);
@@ -88,7 +89,9 @@ extern void kvm_spapr_tce_release_iommu_group(struct kvm *kvm,kref_put (&stit->kref, kvm_spapr_tce_liobn_put); } } +cond_resched_rcu (); } +rcu_read_unlock (); } extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,
@@ -106,12 +109,14 @@ extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,if (!f.file)return -EBADF ; +rcu_read_lock ();list_for_each_entry_rcu (stt, &kvm->arch.spapr_tce_tables, list) {if (stt = f.file->private_data) { found = true;break ; } } +rcu_read_unlock ();fdput (f);
@@ -144,6 +149,7 @@ extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,if (!tbl)return -EINVAL ; +rcu_read_lock ();list_for_each_entry_rcu (stit, &stt->iommu_tables, next) {if (tbl != stit->tbl)continue ;
@@ -151,14 +157,17 @@ extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm, int tablefd,if (!kref_get_unless_zero (&stit->kref)) {/* stit is being destroyed */ iommu_tce_table_put (tbl); +rcu_read_unlock ();return -ENOTTY ; }/* * The table is already known to this KVM, we just increased * its KVM reference counter and can return. */ +rcu_read_unlock ();return 0 ; } +rcu_read_unlock (); stit =kzalloc (sizeof (*stit),GFP_KERNEL );if (!stit) {
@@ -364,18 +373,19 @@ static long kvmppc_tce_validate(struct kvmppc_spapr_tce_table *stt,if (kvmppc_tce_to_ua (stt->kvm, tce, &ua))return H_TOO_HARD ; +rcu_read_lock ();list_for_each_entry_rcu (stit, &stt->iommu_tables, next) {unsigned long hpa =0 ;struct mm_iommu_table_group_mem_t *mem;long shift = stit->tbl->it_page_shift; mem =mm_iommu_lookup (stt->kvm->mm, ua,1ULL << shift); -if (!mem) -return H_TOO_HARD ; - -if (mm_iommu_ua_to_hpa (mem, ua, shift, &hpa)) +if (!mem ||mm_iommu_ua_to_hpa (mem, ua, shift, &hpa)) { +rcu_read_unlock ();return H_TOO_HARD ; + } } +rcu_read_unlock ();return H_SUCCESS ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 214/266 openrisc: Fix issue with argument clobbering for clone/fork
In reply to Sasha LevinFrom: Stafford Horne <[email protected]>
[ Upstream commit 6bd140e14d9aaa734ec37985b8b20a96c0ece948 ]
Working on the OpenRISC glibc port I found that sometimes clone was working strange. That the tls data argument sent in r7 was always wrong. Further investigation revealed that the arguments were getting clobbered in the entry code. This patch removes the code that writes to the argument registers. This was likely due to some old code hanging around.
This patch fixes this up for clone and fork. This fork clobber is harmless but also useless so remove.
--- arch/openrisc/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/openrisc/kernel/entry.S +2 -2
@@ -1166,13 +1166,13 @@ ENTRY(__sys_clone) l.movhi r29,hi(sys_clone) l.ori r29,r29,lo(sys_clone) l.j _fork_save_extra_regs_and_call - l.addi r7,r1,0 + l.nop ENTRY(__sys_fork) l.movhi r29,hi(sys_fork) l.ori r29,r29,lo(sys_fork) l.j _fork_save_extra_regs_and_call - l.addi r3,r1,0 + l.nop ENTRY(sys_rt_sigreturn) l.jal _sys_rt_sigreturn
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 215/266 drm/nouveau/disp/gm200-: fix NV_PDISP_SOR_HDMI2_CTRL(n) selection
In reply to Sasha LevinFrom: Ben Skeggs <[email protected]>
[ Upstream commit a1ef8bad506e4ffa0c57ac5f8cb99ab5cbc3b1fc ]
This is a SOR register, and not indexed by the bound head.
Fixes display not coming up on high-bandwidth HDMI displays under a number of configurations.
--- drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigm200.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigm200.c +2 -2
@@ -27,10 +27,10 @@ void gm200_hdmi_scdc(struct nvkm_ior *ior, int head, u8 scdc) { struct nvkm_device *device = ior->disp->engine.subdev.device; -const u32 hoff = head *0x800 ; +const u32 soff =nv50_ior_base (ior);const u32 ctrl = scdc &0x3 ; -nvkm_mask (device,0x61c5bc + hoff,0x00000003 , ctrl); +nvkm_mask (device,0x61c5bc + soff,0x00000003 , ctrl); ior->tmds.high_speed = !!(scdc &0x2 ); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 216/266 ceph: don't return -ESTALE if there's still an open file
In reply to Sasha LevinFrom: Luis Henriques <[email protected]>
[ Upstream commit 878dabb64117406abd40977b87544d05bb3031fc ]
Similarly to commit 03f219041fdb ("ceph: check i_nlink while converting a file handle to dentry"), this fixes another corner case with name_to_handle_at/open_by_handle_at. The issue has been detected by xfstest generic/467, when doing:
- name_to_handle_at("/cephfs/myfile")
- open("/cephfs/myfile")
- unlink("/cephfs/myfile")
- sync; sync;
- drop caches
- open_by_handle_at()
The call to open_by_handle_at should not fail because the file hasn't been deleted yet (only unlinked) and we do have a valid handle to it. -ESTALE shall be returned only if i_nlink is 0 *and* i_count is 1.
This patch also makes sure we have LINK caps before checking i_nlink.
--- fs/ceph/export.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/ceph/export.c +8 -1
@@ -172,9 +172,16 @@ struct inode *ceph_lookup_inode(struct super_block *sb, u64 ino)static struct dentry *__fh_to_dentry (struct super_block *sb,u64 ino) {struct inode *inode =__lookup_inode (sb, ino); +int err; +if (IS_ERR (inode))return ERR_CAST (inode); -if (inode->i_nlink ==0 ) { +/* We need LINK caps to reliably check i_nlink */ + err =ceph_do_getattr (inode,CEPH_CAP_LINK_SHARED , false); +if (err) +return ERR_PTR (err); +/* -ESTALE if inode as been unlinked and no file is open */ +if ((inode->i_nlink ==0 ) && (atomic_read (&inode->i_count) ==1 )) {iput (inode);return ERR_PTR (-ESTALE ); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 218/266 gfs2: Allow lock_nolock mount to specify jid=X
In reply to Sasha LevinFrom: Bob Peterson <[email protected]>
[ Upstream commit ea22eee4e6027d8927099de344f7fff43c507ef9 ]
Before this patch, a simple typo accidentally added \n to the jid= string for lock_nolock mounts. This made it impossible to mount a gfs2 file system with a journal other than journal0. Thus:
mount -tgfs2 -o hostdata="jid=1" <device> <mount pt>
Resulted in:
mount: wrong fs type, bad option, bad superblock on <device>
In most cases this is not a problem. However, for debugging and testing purposes we sometimes want to test the integrity of other journals. This patch removes the unnecessary \n and thus allows lock_nolock users to specify an alternate journal.
--- fs/gfs2/ops_fstype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/ops_fstype.c +1 -1
@@ -911,7 +911,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo) }static const match_table_t nolock_tokens = { - { Opt_jid,"jid=%d\n" , }, + { Opt_jid,"jid=%d" , }, { Opt_err,NULL }, };
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 235/266 gfs2: fix use-after-free on transaction ail lists
In reply to Sasha LevinFrom: Bob Peterson <[email protected]>
[ Upstream commit 83d060ca8d90fa1e3feac227f995c013100862d3 ]
Before this patch, transactions could be merged into the system transaction by function gfs2_merge_trans(), but the transaction ail lists were never merged. Because the ail flushing mechanism can run separately, bd elements can be attached to the transaction's buffer list during the transaction (trans_add_meta, etc) but quickly moved to its ail lists. Later, in function gfs2_trans_end, the transaction can be freed (by gfs2_trans_end) while it still has bd elements queued to its ail lists, which can cause it to either lose track of the bd elements altogether (memory leak) or worse, reference the bd elements after the parent transaction has been freed.
Although I've not seen any serious consequences, the problem becomes apparent with the previous patch's addition of:
gfs2_assert_warn(sdp, list_empty(&tr->tr_ail1_list));
to function gfs2_trans_free().
This patch adds logic into gfs2_merge_trans() to move the merged transaction's ail lists to the sdp transaction. This prevents the use-after-free. To do this properly, we need to hold the ail lock, so we pass sdp into the function instead of the transaction itself.
--- fs/gfs2/log.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/gfs2/log.c +9 -2
@@ -881,8 +881,10 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags)* @new: New transaction to be merged */ -static void gfs2_merge_trans (struct gfs2_trans *old,struct gfs2_trans *new) +static void gfs2_merge_trans (struct gfs2_sbd *sdp,struct gfs2_trans *new) { +struct gfs2_trans *old = sdp->sd_log_tr; +WARN_ON_ONCE (!test_bit (TR_ATTACHED , &old->tr_flags)); old->tr_num_buf_new += new->tr_num_buf_new;
@@ -893,6 +895,11 @@ static void gfs2_merge_trans(struct gfs2_trans *old, struct gfs2_trans *new)list_splice_tail_init (&new->tr_databuf, &old->tr_databuf);list_splice_tail_init (&new->tr_buf, &old->tr_buf); + +spin_lock (&sdp->sd_ail_lock); +list_splice_tail_init (&new->tr_ail1_list, &old->tr_ail1_list); +list_splice_tail_init (&new->tr_ail2_list, &old->tr_ail2_list); +spin_unlock (&sdp->sd_ail_lock); }static void log_refund (struct gfs2_sbd *sdp,struct gfs2_trans *tr)
@@ -904,7 +911,7 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)gfs2_log_lock (sdp);if (sdp->sd_log_tr) { -gfs2_merge_trans (sdp->sd_log_tr, tr); +gfs2_merge_trans (sdp, tr); }else if (tr->tr_num_buf_new || tr->tr_num_databuf_new) {gfs2_assert_withdraw (sdp,test_bit (TR_ALLOCED , &tr->tr_flags)); sdp->sd_log_tr = tr;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 265/266 iavf: fix speed reporting over virtchnl
In reply to Sasha LevinFrom: Brett Creeley <[email protected]>
[ Upstream commit e0ef26fbe2b0c62f42ba7667076dc38b693b6fb8 ]
Link speeds are communicated over virtchnl using an enum virtchnl_link_speed. Currently, the highest link speed is 40Gbps which leaves us unable to reflect some speeds that an ice VF is capable of. This causes link speed to be misreported on the iavf driver.
Allow for communicating link speeds using Mbps so that the proper speed can be reported for an ice VF. Moving away from the enum allows us to communicate future speed changes without requiring a new enum to be added.
In order to support communicating link speeds over virtchnl in Mbps the following functionality was added:
- Added u32 link_speed_mbps in the iavf_adapter structure.
- Added the macro ADV_LINK_SUPPORT(_a) to determine if the VF driver supports communicating link speeds in Mbps.
- Added the function iavf_get_vpe_link_status() to fill the correct link_status in the event_data union based on the ADV_LINK_SUPPORT(_a) macro.
- Added the function iavf_set_adapter_link_speed_from_vpe() to determine whether or not to fill the u32 link_speed_mbps or enum virtchnl_link_speed link_speed field in the iavf_adapter structure based on the ADV_LINK_SUPPORT(_a) macro.
- Do not free vf_res in iavf_init_get_resources() as vf_res will be accessed in iavf_get_link_ksettings(); memset to 0 instead. This memory is subsequently freed in iavf_remove().
--- drivers/net/ethernet/intel/iavf/iavf.h | 14 +++ .../net/ethernet/intel/iavf/iavf_ethtool.c | 14 ++- drivers/net/ethernet/intel/iavf/iavf_main.c | 25 ++++-- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 88 ++++++++++++++++--- 4 files changed, 120 insertions(+), 21 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +14 -0
@@ -87,6 +87,10 @@ struct iavf_vsi {#define IAVF_HLUT_ARRAY_SIZE ((IAVF_VFQF_HLUT_MAX_INDEX + 1) * 4)#define IAVF_MBPS_DIVISOR 125000/* divisor to convert to Mbps */ +#define IAVF_VIRTCHNL_VF_RESOURCE_SIZE (sizeof(struct virtchnl_vf_resource) + \ + (IAVF_MAX_VF_VSI * \ + sizeof(struct virtchnl_vsi_resource))) +/* MAX_MSIX_Q_VECTORS of these are allocated, * but we only use one per queue-specific vector. */
@@ -306,6 +310,14 @@ struct iavf_adapter {bool netdev_registered;bool link_up;enum virtchnl_link_speed link_speed; +/* This is only populated if the VIRTCHNL_VF_CAP_ADV_LINK_SPEED is set +* in vf_res->vf_cap_flags. Use ADV_LINK_SUPPORT macro to determine if +* this field is valid. This field should be used going forward and the +* enum virtchnl_link_speed above should be considered the legacy way of +* storing/communicating link speeds. +*/ +u32 link_speed_mbps; +enum virtchnl_ops current_op;#define CLIENT_ALLOWED (_a) ((_a)->vf_res ? \ (_a)->vf_res->vf_cap_flags & \
@@ -322,6 +334,8 @@ struct iavf_adapter { VIRTCHNL_VF_OFFLOAD_RSS_PF)))#define VLAN_ALLOWED (_a) ((_a)->vf_res->vf_cap_flags & \ VIRTCHNL_VF_OFFLOAD_VLAN) +#define ADV_LINK_SUPPORT (_a) ((_a)->vf_res->vf_cap_flags & \ + VIRTCHNL_VF_CAP_ADV_LINK_SPEED)struct virtchnl_vf_resource *vf_res;/* incl. all VSIs */ struct virtchnl_vsi_resource *vsi_res;/* our LAN VSI */ struct virtchnl_version_info pf_version;
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +12 -2
@@ -278,7 +278,18 @@ static int iavf_get_link_ksettings(struct net_device *netdev,ethtool_link_ksettings_zero_link_mode (cmd, supported); cmd->base.autoneg =AUTONEG_DISABLE ; cmd->base.port =PORT_NONE ; -/* Set speed and duplex */ + cmd->base.duplex =DUPLEX_FULL ; + +if (ADV_LINK_SUPPORT (adapter)) { +if (adapter->link_speed_mbps && + adapter->link_speed_mbps <U32_MAX ) + cmd->base.speed = adapter->link_speed_mbps; +else + cmd->base.speed =SPEED_UNKNOWN ; + +return 0 ; + } +switch (adapter->link_speed) {case IAVF_LINK_SPEED_40GB : cmd->base.speed =SPEED_40000 ;
@@ -306,7 +317,6 @@ static int iavf_get_link_ksettings(struct net_device *netdev,default :break ; } - cmd->base.duplex =DUPLEX_FULL ;return 0 ; }
drivers/net/ethernet/intel/iavf/iavf_main.c +18 -7
@@ -1756,17 +1756,17 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter)struct net_device *netdev = adapter->netdev;struct pci_dev *pdev = adapter->pdev;struct iavf_hw *hw = &adapter->hw; -int err =0 , bufsz; +int err;WARN_ON (adapter->state != __IAVF_INIT_GET_RESOURCES);/* aq msg sent, awaiting reply */ if (!adapter->vf_res) { - bufsz =sizeof (struct virtchnl_vf_resource ) + - (IAVF_MAX_VF_VSI * -sizeof (struct virtchnl_vsi_resource )); - adapter->vf_res =kzalloc (bufsz,GFP_KERNEL ); -if (!adapter->vf_res) + adapter->vf_res =kzalloc (IAVF_VIRTCHNL_VF_RESOURCE_SIZE , +GFP_KERNEL ); +if (!adapter->vf_res) { + err = -ENOMEM ; goto err; + } } err =iavf_get_vf_config (adapter);if (err ==IAVF_ERR_ADMIN_QUEUE_NO_WORK ) {
@@ -2036,7 +2036,7 @@ static void iavf_disable_vf(struct iavf_adapter *adapter)iavf_reset_interrupt_capability (adapter);iavf_free_queues (adapter);iavf_free_q_vectors (adapter); -kfree (adapter->vf_res); +memset (adapter->vf_res,0 ,IAVF_VIRTCHNL_VF_RESOURCE_SIZE );iavf_shutdown_adminq (&adapter->hw); adapter->netdev->flags &= ~IFF_UP ;clear_bit (__IAVF_IN_CRITICAL_TASK, &adapter->crit_section);
@@ -2487,6 +2487,16 @@ static int iavf_validate_tx_bandwidth(struct iavf_adapter *adapter, {int speed =0 , ret =0 ; +if (ADV_LINK_SUPPORT (adapter)) { +if (adapter->link_speed_mbps <U32_MAX ) { + speed = adapter->link_speed_mbps; + goto validate_bw; + }else { +dev_err (&adapter->pdev->dev,"Unknown link speed\n" ); +return -EINVAL ; + } + } +switch (adapter->link_speed) {case IAVF_LINK_SPEED_40GB : speed =40000 ;
@@ -2510,6 +2520,7 @@ static int iavf_validate_tx_bandwidth(struct iavf_adapter *adapter,break ; } +validate_bw:if (max_tx_rate > speed) {dev_err (&adapter->pdev->dev,"Invalid tx rate specified\n" );
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +76 -12
138 lines not on this page · raw message
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 1/266 power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select
From: Enric Balletbo i Serra <[email protected]>
[ Upstream commit 87c3d579c8ed0eaea6b1567d529a8daa85a2bc6c ]
regmap is a library function that gets selected by drivers that need it. No driver modules should depend on it. Depending on REGMAP_I2C makes this driver only build if another driver already selected REGMAP_I2C, as the symbol can't be selected through the menu kernel configuration.
--- drivers/power/supply/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/Kconfig +1 -1
@@ -577,7 +577,7 @@ config CHARGER_BQ24257 tristate "TI BQ24250/24251/24257 battery charger driver" depends on I2C depends on GPIOLIB || COMPILE_TEST - depends on REGMAP_I2C + select REGMAP_I2C help Say Y to enable support for the TI BQ24250, BQ24251, and BQ24257 battery chargers.
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 2/266 clk: sunxi: Fix incorrect usage of round_down()
From: Rikard Falkeborn <[email protected]>
[ Upstream commit ee25d9742dabed3fd18158b518f846abeb70f319 ]
round_down() can only round to powers of 2. If round_down() is asked to round to something that is not a power of 2, incorrect results are produced. The incorrect results can be both too large and too small.
Instead, use rounddown() which can round to any number.
--- drivers/clk/sunxi/clk-sunxi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi/clk-sunxi.c +1 -1
@@ -90,7 +90,7 @@ static void sun6i_a31_get_pll1_factors(struct factors_request *req)* Round down the frequency to the closest multiple of either * 6 or 16 */ -u32 round_freq_6 =round_down (freq_mhz,6 ); +u32 round_freq_6 =rounddown (freq_mhz,6 );u32 round_freq_16 =round_down (freq_mhz,16 );if (round_freq_6 > round_freq_16)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 4/266 i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets
In reply to Sasha LevinFrom: Adam Honse <[email protected]>
[ Upstream commit f27237c174fd9653033330e4e532cd9d153ce824 ]
The AMD X370 and other AM4 chipsets (A/B/X 3/4/5 parts) and Threadripper equivalents have a secondary SMBus controller at I/O port address 0x0B20. This bus is used by several manufacturers to control motherboard RGB lighting via embedded controllers. I have been using this bus in my OpenRGB project to control the Aura RGB on many motherboards and ASRock also uses this bus for their Polychrome RGB controller.
I am not aware of any CZ-compatible platforms which do not have the second SMBus channel. All of AMD's AM4- and Threadripper- series chipsets that OpenRGB users have tested appear to have this secondary bus. I also noticed this secondary bus is present on older AMD platforms including my FM1 home server.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202587
--- drivers/i2c/busses/i2c-piix4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-piix4.c +2 -1
@@ -977,7 +977,8 @@ static int piix4_probe(struct pci_dev *dev, const struct pci_device_id *id) }if (dev->vendor ==PCI_VENDOR_ID_AMD && - dev->device ==PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ) { + (dev->device ==PCI_DEVICE_ID_AMD_HUDSON2_SMBUS || + dev->device ==PCI_DEVICE_ID_AMD_KERNCZ_SMBUS )) { retval =piix4_setup_sb800 (dev, id,1 ); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 8/266 remoteproc: Fix IDR initialisation in rproc_alloc()
In reply to Sasha LevinFrom: Alex Elder <[email protected]>
[ Upstream commit 6442df49400b466431979e7634849a464a5f1861 ]
If ida_simple_get() returns an error when called in rproc_alloc(), put_device() is called to clean things up. By this time the rproc device type has been assigned, with rproc_type_release() as the release function.
The first thing rproc_type_release() does is call:
idr_destroy(&rproc->notifyids);
But at the time the ida_simple_get() call is made, the notifyids field in the remoteproc structure has not been initialized.
I'm not actually sure this case causes an observable problem, but it's incorrect. Fix this by initializing the notifyids field before calling ida_simple_get() in rproc_alloc().
--- drivers/remoteproc/remoteproc_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/remoteproc/remoteproc_core.c +1 -2
@@ -2036,6 +2036,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name, rproc->dev.type = &rproc_type; rproc->dev.class = &rproc_class; rproc->dev.driver_data = rproc; +idr_init (&rproc->notifyids);/* Assign a unique device index and name */ rproc->index =ida_simple_get (&rproc_dev_index,0 ,0 ,GFP_KERNEL );
@@ -2060,8 +2061,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,mutex_init (&rproc->lock); -idr_init (&rproc->notifyids); -INIT_LIST_HEAD (&rproc->carveouts);INIT_LIST_HEAD (&rproc->mappings);INIT_LIST_HEAD (&rproc->traces);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 10/266 ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet
In reply to Sasha LevinFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 1fecbb71fe0e46b886f84e3b6decca6643c3af6d ]
Disable exception interrupt before scheduling tasklet, otherwise if the tasklet isn't handled immediately, there will be endless xrun interrupt.
--- sound/soc/fsl/fsl_esai.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/fsl/fsl_esai.c +4 -0
@@ -87,6 +87,10 @@ static irqreturn_t esai_isr(int irq, void *devid)if ((saisr & (ESAI_SAISR_TUE |ESAI_SAISR_ROE )) && esai_priv->reset_at_xrun) {dev_dbg (&pdev->dev,"reset module for xrun\n" ); +regmap_update_bits (esai_priv->regmap,REG_ESAI_TCR , + ESAI_xCR_xEIE_MASK,0 ); +regmap_update_bits (esai_priv->regmap,REG_ESAI_RCR , + ESAI_xCR_xEIE_MASK,0 );tasklet_schedule (&esai_priv->task); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 12/266 ARM: dts: renesas: Fix IOMMU device node names
In reply to Sasha LevinFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit ae990a1de014396ffc8d0fcc31b6888c9b0ce59a ]
Fix IOMMU device node names as "iommu@".
--- arch/arm/boot/dts/r8a7743.dtsi | 12 ++++++------ arch/arm/boot/dts/r8a7744.dtsi | 12 ++++++------ arch/arm/boot/dts/r8a7745.dtsi | 12 ++++++------ arch/arm/boot/dts/r8a7790.dtsi | 12 ++++++------ arch/arm/boot/dts/r8a7791.dtsi | 14 +++++++------- arch/arm/boot/dts/r8a7793.dtsi | 14 +++++++------- arch/arm/boot/dts/r8a7794.dtsi | 12 ++++++------ 7 files changed, 44 insertions(+), 44 deletions(-)
arch/arm/boot/dts/r8a7743.dtsi +6 -6
@@ -338,7 +338,7 @@ thermal: thermal@e61f0000 { #thermal-sensor-cells = <0>; }; - ipmmu_sy0: mmu@e6280000 { + ipmmu_sy0: iommu@e6280000 { compatible = "renesas,ipmmu-r8a7743", "renesas,ipmmu-vmsa"; reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@ ipmmu_sy0: mmu@e6280000 { status = "disabled"; }; - ipmmu_sy1: mmu@e6290000 { + ipmmu_sy1: iommu@e6290000 { compatible = "renesas,ipmmu-r8a7743", "renesas,ipmmu-vmsa"; reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@ ipmmu_sy1: mmu@e6290000 { status = "disabled"; }; - ipmmu_ds: mmu@e6740000 { + ipmmu_ds: iommu@e6740000 { compatible = "renesas,ipmmu-r8a7743", "renesas,ipmmu-vmsa"; reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@ ipmmu_ds: mmu@e6740000 { status = "disabled"; }; - ipmmu_mp: mmu@ec680000 { + ipmmu_mp: iommu@ec680000 { compatible = "renesas,ipmmu-r8a7743", "renesas,ipmmu-vmsa"; reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@ ipmmu_mp: mmu@ec680000 { status = "disabled"; }; - ipmmu_mx: mmu@fe951000 { + ipmmu_mx: iommu@fe951000 { compatible = "renesas,ipmmu-r8a7743", "renesas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@ ipmmu_mx: mmu@fe951000 { status = "disabled"; }; - ipmmu_gp: mmu@e62a0000 { + ipmmu_gp: iommu@e62a0000 { compatible = "renesas,ipmmu-r8a7743", "renesas,ipmmu-vmsa"; reg = <0 0xe62a0000 0 0x1000>;
arch/arm/boot/dts/r8a7744.dtsi +6 -6
@@ -338,7 +338,7 @@ thermal: thermal@e61f0000 { #thermal-sensor-cells = <0>; }; - ipmmu_sy0: mmu@e6280000 { + ipmmu_sy0: iommu@e6280000 { compatible = "renesas,ipmmu-r8a7744", "renesas,ipmmu-vmsa"; reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@ ipmmu_sy0: mmu@e6280000 { status = "disabled"; }; - ipmmu_sy1: mmu@e6290000 { + ipmmu_sy1: iommu@e6290000 { compatible = "renesas,ipmmu-r8a7744", "renesas,ipmmu-vmsa"; reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@ ipmmu_sy1: mmu@e6290000 { status = "disabled"; }; - ipmmu_ds: mmu@e6740000 { + ipmmu_ds: iommu@e6740000 { compatible = "renesas,ipmmu-r8a7744", "renesas,ipmmu-vmsa"; reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@ ipmmu_ds: mmu@e6740000 { status = "disabled"; }; - ipmmu_mp: mmu@ec680000 { + ipmmu_mp: iommu@ec680000 { compatible = "renesas,ipmmu-r8a7744", "renesas,ipmmu-vmsa"; reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@ ipmmu_mp: mmu@ec680000 { status = "disabled"; }; - ipmmu_mx: mmu@fe951000 { + ipmmu_mx: iommu@fe951000 { compatible = "renesas,ipmmu-r8a7744", "renesas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@ ipmmu_mx: mmu@fe951000 { status = "disabled"; }; - ipmmu_gp: mmu@e62a0000 { + ipmmu_gp: iommu@e62a0000 { compatible = "renesas,ipmmu-r8a7744", "renesas,ipmmu-vmsa"; reg = <0 0xe62a0000 0 0x1000>;
arch/arm/boot/dts/r8a7745.dtsi +6 -6
@@ -302,7 +302,7 @@ irqc: interrupt-controller@e61c0000 { resets = <&cpg 407>; }; - ipmmu_sy0: mmu@e6280000 { + ipmmu_sy0: iommu@e6280000 { compatible = "renesas,ipmmu-r8a7745", "renesas,ipmmu-vmsa"; reg = <0 0xe6280000 0 0x1000>;
@@ -312,7 +312,7 @@ ipmmu_sy0: mmu@e6280000 { status = "disabled"; }; - ipmmu_sy1: mmu@e6290000 { + ipmmu_sy1: iommu@e6290000 { compatible = "renesas,ipmmu-r8a7745", "renesas,ipmmu-vmsa"; reg = <0 0xe6290000 0 0x1000>;
@@ -321,7 +321,7 @@ ipmmu_sy1: mmu@e6290000 { status = "disabled"; }; - ipmmu_ds: mmu@e6740000 { + ipmmu_ds: iommu@e6740000 { compatible = "renesas,ipmmu-r8a7745", "renesas,ipmmu-vmsa"; reg = <0 0xe6740000 0 0x1000>;
@@ -331,7 +331,7 @@ ipmmu_ds: mmu@e6740000 { status = "disabled"; }; - ipmmu_mp: mmu@ec680000 { + ipmmu_mp: iommu@ec680000 { compatible = "renesas,ipmmu-r8a7745", "renesas,ipmmu-vmsa"; reg = <0 0xec680000 0 0x1000>;
@@ -340,7 +340,7 @@ ipmmu_mp: mmu@ec680000 { status = "disabled"; }; - ipmmu_mx: mmu@fe951000 { + ipmmu_mx: iommu@fe951000 { compatible = "renesas,ipmmu-r8a7745", "renesas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>;
@@ -350,7 +350,7 @@ ipmmu_mx: mmu@fe951000 { status = "disabled"; }; - ipmmu_gp: mmu@e62a0000 { + ipmmu_gp: iommu@e62a0000 { compatible = "renesas,ipmmu-r8a7745", "renesas,ipmmu-vmsa"; reg = <0 0xe62a0000 0 0x1000>;
arch/arm/boot/dts/r8a7790.dtsi +6 -6
@@ -427,7 +427,7 @@ thermal: thermal@e61f0000 { #thermal-sensor-cells = <0>; }; - ipmmu_sy0: mmu@e6280000 { + ipmmu_sy0: iommu@e6280000 { compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa"; reg = <0 0xe6280000 0 0x1000>;
@@ -437,7 +437,7 @@ ipmmu_sy0: mmu@e6280000 { status = "disabled"; }; - ipmmu_sy1: mmu@e6290000 { + ipmmu_sy1: iommu@e6290000 { compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa"; reg = <0 0xe6290000 0 0x1000>;
@@ -446,7 +446,7 @@ ipmmu_sy1: mmu@e6290000 { status = "disabled"; }; - ipmmu_ds: mmu@e6740000 { + ipmmu_ds: iommu@e6740000 { compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa"; reg = <0 0xe6740000 0 0x1000>;
@@ -456,7 +456,7 @@ ipmmu_ds: mmu@e6740000 { status = "disabled"; }; - ipmmu_mp: mmu@ec680000 { + ipmmu_mp: iommu@ec680000 { compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa"; reg = <0 0xec680000 0 0x1000>;
@@ -465,7 +465,7 @@ ipmmu_mp: mmu@ec680000 { status = "disabled"; }; - ipmmu_mx: mmu@fe951000 { + ipmmu_mx: iommu@fe951000 { compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>;
@@ -475,7 +475,7 @@ ipmmu_mx: mmu@fe951000 { status = "disabled"; }; - ipmmu_rt: mmu@ffc80000 { + ipmmu_rt: iommu@ffc80000 { compatible = "renesas,ipmmu-r8a7790", "renesas,ipmmu-vmsa"; reg = <0 0xffc80000 0 0x1000>;
arch/arm/boot/dts/r8a7791.dtsi +7 -7
@@ -350,7 +350,7 @@ thermal: thermal@e61f0000 { #thermal-sensor-cells = <0>; }; - ipmmu_sy0: mmu@e6280000 { + ipmmu_sy0: iommu@e6280000 { compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0 0xe6280000 0 0x1000>;
@@ -360,7 +360,7 @@ ipmmu_sy0: mmu@e6280000 { status = "disabled"; }; - ipmmu_sy1: mmu@e6290000 { + ipmmu_sy1: iommu@e6290000 { compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0 0xe6290000 0 0x1000>;
@@ -369,7 +369,7 @@ ipmmu_sy1: mmu@e6290000 { status = "disabled"; }; - ipmmu_ds: mmu@e6740000 { + ipmmu_ds: iommu@e6740000 { compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0 0xe6740000 0 0x1000>;
@@ -379,7 +379,7 @@ ipmmu_ds: mmu@e6740000 { status = "disabled"; }; - ipmmu_mp: mmu@ec680000 { + ipmmu_mp: iommu@ec680000 { compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0 0xec680000 0 0x1000>;
@@ -388,7 +388,7 @@ ipmmu_mp: mmu@ec680000 { status = "disabled"; }; - ipmmu_mx: mmu@fe951000 { + ipmmu_mx: iommu@fe951000 { compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>;
@@ -398,7 +398,7 @@ ipmmu_mx: mmu@fe951000 { status = "disabled"; }; - ipmmu_rt: mmu@ffc80000 { + ipmmu_rt: iommu@ffc80000 { compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0 0xffc80000 0 0x1000>;
@@ -407,7 +407,7 @@ ipmmu_rt: mmu@ffc80000 { status = "disabled"; }; - ipmmu_gp: mmu@e62a0000 { + ipmmu_gp: iommu@e62a0000 { compatible = "renesas,ipmmu-r8a7791", "renesas,ipmmu-vmsa"; reg = <0 0xe62a0000 0 0x1000>;
arch/arm/boot/dts/r8a7793.dtsi +7 -7
@@ -336,7 +336,7 @@ thermal: thermal@e61f0000 { #thermal-sensor-cells = <0>; }; - ipmmu_sy0: mmu@e6280000 { + ipmmu_sy0: iommu@e6280000 { compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa"; reg = <0 0xe6280000 0 0x1000>;
@@ -346,7 +346,7 @@ ipmmu_sy0: mmu@e6280000 { status = "disabled"; }; - ipmmu_sy1: mmu@e6290000 { + ipmmu_sy1: iommu@e6290000 { compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa"; reg = <0 0xe6290000 0 0x1000>;
@@ -355,7 +355,7 @@ ipmmu_sy1: mmu@e6290000 { status = "disabled"; }; - ipmmu_ds: mmu@e6740000 { + ipmmu_ds: iommu@e6740000 { compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa"; reg = <0 0xe6740000 0 0x1000>;
@@ -365,7 +365,7 @@ ipmmu_ds: mmu@e6740000 { status = "disabled"; }; - ipmmu_mp: mmu@ec680000 { + ipmmu_mp: iommu@ec680000 { compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa"; reg = <0 0xec680000 0 0x1000>;
@@ -374,7 +374,7 @@ ipmmu_mp: mmu@ec680000 { status = "disabled"; }; - ipmmu_mx: mmu@fe951000 { + ipmmu_mx: iommu@fe951000 { compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>;
@@ -384,7 +384,7 @@ ipmmu_mx: mmu@fe951000 { status = "disabled"; }; - ipmmu_rt: mmu@ffc80000 { + ipmmu_rt: iommu@ffc80000 { compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa"; reg = <0 0xffc80000 0 0x1000>;
@@ -393,7 +393,7 @@ ipmmu_rt: mmu@ffc80000 { status = "disabled"; }; - ipmmu_gp: mmu@e62a0000 { + ipmmu_gp: iommu@e62a0000 { compatible = "renesas,ipmmu-r8a7793", "renesas,ipmmu-vmsa"; reg = <0 0xe62a0000 0 0x1000>;
arch/arm/boot/dts/r8a7794.dtsi +6 -6
@@ -290,7 +290,7 @@ irqc0: interrupt-controller@e61c0000 { resets = <&cpg 407>; }; - ipmmu_sy0: mmu@e6280000 { + ipmmu_sy0: iommu@e6280000 { compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa"; reg = <0 0xe6280000 0 0x1000>;
@@ -300,7 +300,7 @@ ipmmu_sy0: mmu@e6280000 { status = "disabled"; }; - ipmmu_sy1: mmu@e6290000 { + ipmmu_sy1: iommu@e6290000 { compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa"; reg = <0 0xe6290000 0 0x1000>;
@@ -309,7 +309,7 @@ ipmmu_sy1: mmu@e6290000 { status = "disabled"; }; - ipmmu_ds: mmu@e6740000 { + ipmmu_ds: iommu@e6740000 { compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa"; reg = <0 0xe6740000 0 0x1000>;
@@ -319,7 +319,7 @@ ipmmu_ds: mmu@e6740000 { status = "disabled"; }; - ipmmu_mp: mmu@ec680000 { + ipmmu_mp: iommu@ec680000 { compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa"; reg = <0 0xec680000 0 0x1000>;
@@ -328,7 +328,7 @@ ipmmu_mp: mmu@ec680000 { status = "disabled"; }; - ipmmu_mx: mmu@fe951000 { + ipmmu_mx: iommu@fe951000 { compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa"; reg = <0 0xfe951000 0 0x1000>;
@@ -338,7 +338,7 @@ ipmmu_mx: mmu@fe951000 { status = "disabled"; }; - ipmmu_gp: mmu@e62a0000 { + ipmmu_gp: iommu@e62a0000 { compatible = "renesas,ipmmu-r8a7794", "renesas,ipmmu-vmsa"; reg = <0 0xe62a0000 0 0x1000>;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 13/266 ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type
In reply to Sasha LevinFrom: Xiyu Yang <[email protected]>
[ Upstream commit a697ae6ea56e23397341b027098c1b11d9ab13da ]
davinci_mcasp_get_dma_type() invokes dma_request_chan(), which returns a reference of the specified dma_chan object to "chan" with increased refcnt.
When davinci_mcasp_get_dma_type() returns, local variable "chan" becomes invalid, so the refcount should be decreased to keep refcount balanced.
The reference counting issue happens in one exception handling path of davinci_mcasp_get_dma_type(). When chan device is NULL, the function forgets to decrease the refcnt increased by dma_request_chan(), causing a refcnt leak.
Fix this issue by calling dma_release_channel() when chan device is NULL.
--- sound/soc/ti/davinci-mcasp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/ti/davinci-mcasp.c +3 -1
@@ -1875,8 +1875,10 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp) PTR_ERR(chan));return PTR_ERR (chan); } -if (WARN_ON (!chan->device || !chan->device->dev)) +if (WARN_ON (!chan->device || !chan->device->dev)) { +dma_release_channel (chan);return -EINVAL ; + }if (chan->device->dev->of_node) ret = of_property_read_string(chan->device->dev->of_node,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 21/266 PCI: Allow pci_resize_resource() for devices on root bus
In reply to Sasha LevinFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit d09ddd8190fbdc07696bf34b548ae15aa1816714 ]
When resizing a BAR, pci_reassign_bridge_resources() is invoked to bring the bridge windows of parent bridges in line with the new BAR assignment.
This assumes the device whose BAR is being resized lives on a subordinate bus, but this is not necessarily the case. A device may live on the root bus, in which case dev->bus->self is NULL, and passing a NULL pci_dev pointer to pci_reassign_bridge_resources() will cause it to crash.
So let's make the call to pci_reassign_bridge_resources() conditional on whether dev->bus->self is non-NULL in the first place.
--- drivers/pci/setup-res.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pci/setup-res.c +5 -4
@@ -439,10 +439,11 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size) res->end = res->start +pci_rebar_size_to_bytes (size) -1 ;/* Check if the new config works by trying to assign everything. */ - ret =pci_reassign_bridge_resources (dev->bus->self, res->flags); -if (ret) - goto error_resize; - +if (dev->bus->self) { + ret =pci_reassign_bridge_resources (dev->bus->self, res->flags); +if (ret) + goto error_resize; + }return 0 ; error_resize:
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 27/266 f2fs: report delalloc reserve as non-free in statfs for project quota
In reply to Sasha LevinFrom: Konstantin Khlebnikov <[email protected]>
[ Upstream commit baaa7ebf25c78c5cb712fac16b7f549100beddd3 ]
This reserved space isn't committed yet but cannot be used for allocations. For userspace it has no difference from used space.
See the same fix in ext4 commit f06925c73942 ("ext4: report delalloc reserve as non-free in statfs for project quota").
--- fs/f2fs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/super.c +2 -1
@@ -1219,7 +1219,8 @@ static int f2fs_statfs_project(struct super_block *sb, limit >>= sb->s_blocksize_bits;if (limit && buf->f_blocks > limit) { - curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits; + curblock = (dquot->dq_dqb.dqb_curspace + + dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits; buf->f_blocks = limit; buf->f_bfree = buf->f_bavail = (buf->f_blocks > curblock) ?
Signature · 8 lines
2.25.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 36/266 arm64: dts: armada-3720-turris-mox: forbid SDR104 on SDIO for FCC purposes
In reply to Sasha LevinFrom: Marek Behún <[email protected]>
[ Upstream commit 7a2c36b039d2343cc29fec6102da839477b8dc60 ]
Use sdhci-caps-mask to forbid SDR104 mode on the SDIO capable SDHCI controller. Without this the device cannot pass electromagnetic interference certifications.
--- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +2 -0
@@ -171,6 +171,8 @@ &sdhci1 { marvell,pad-type = "sd"; vqmmc-supply = <&vsdio_reg>; mmc-pwrseq = <&sdhci1_pwrseq>; + /* forbid SDR104 for FCC purposes */ + sdhci-caps-mask = <0x2 0x0>; status = "okay"; };
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 42/266 arm64: dts: fvp: Fix GIC child nodes
In reply to Sasha LevinFrom: Andre Przywara <[email protected]>
[ Upstream commit 78631aecc52c4b2adcf611769df2ff9c67ac16d0 ]
The GIC DT nodes for the fastmodels were not fully compliant with the DT binding, which has certain expectations about child nodes and their size and address cells values.
Use smaller #address-cells and #size-cells values, as the binding requests, and adjust the reg properties accordingly.
This requires adjusting the interrupt nexus nodes as well, as one field of the interrupt-map property depends on the GIC's address-size.
Since the .dts files share interrupt nexus nodes across different interrupt controllers (GICv2 vs. GICv3), we need to use the only commonly allowed #address-size value of <1> for both.
--- .../boot/dts/arm/foundation-v8-gicv2.dtsi | 2 +- .../boot/dts/arm/foundation-v8-gicv3.dtsi | 8 +- arch/arm64/boot/dts/arm/foundation-v8.dtsi | 86 +++++++++---------- 3 files changed, 48 insertions(+), 48 deletions(-)
arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi +1 -1
@@ -8,7 +8,7 @@ / { gic: interrupt-controller@2c001000 { compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic"; #interrupt-cells = <3>; - #address-cells = <2>; + #address-cells = <1>; interrupt-controller; reg = <0x0 0x2c001000 0 0x1000>, <0x0 0x2c002000 0 0x2000>,
arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi +4 -4
@@ -8,9 +8,9 @@ / { gic: interrupt-controller@2f000000 { compatible = "arm,gic-v3"; #interrupt-cells = <3>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x0 0x2f000000 0x100000>; interrupt-controller; reg = <0x0 0x2f000000 0x0 0x10000>, <0x0 0x2f100000 0x0 0x200000>,
@@ -22,7 +22,7 @@ gic: interrupt-controller@2f000000 { its: its@2f020000 { compatible = "arm,gic-v3-its"; msi-controller; - reg = <0x0 0x2f020000 0x0 0x20000>; + reg = <0x20000 0x20000>; }; }; };
arch/arm64/boot/dts/arm/foundation-v8.dtsi +43 -43
92 lines not on this page · raw message
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 45/266 arm64: dts: fvp/juno: Fix node address fields
In reply to Sasha LevinFrom: Andre Przywara <[email protected]>
[ Upstream commit bb5cce12ac717c7462217cd493ed701d12d6dbce ]
The Arm Ltd. boards were using an outdated address convention in the DT node names, by separating the high from the low 32-bits of an address by a comma.
Remove the comma from the node name suffix to be DT spec compliant.
--- arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 10 +++++----- arch/arm64/boot/dts/arm/foundation-v8.dtsi | 4 ++-- arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 6 +++--- arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi | 2 +- arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/boot/dts/vexpress-v2m-rs1.dtsi +5 -5
@@ -31,7 +31,7 @@ motherboard { #interrupt-cells = <1>; ranges; - nor_flash: flash@0,00000000 { + nor_flash: flash@0 { compatible = "arm,vexpress-flash", "cfi-flash"; reg = <0 0x00000000 0x04000000>, <4 0x00000000 0x04000000>;
@@ -41,13 +41,13 @@ partitions { }; }; - psram@1,00000000 { + psram@100000000 { compatible = "arm,vexpress-psram", "mtd-ram"; reg = <1 0x00000000 0x02000000>; bank-width = <4>; }; - ethernet@2,02000000 { + ethernet@202000000 { compatible = "smsc,lan9118", "smsc,lan9115"; reg = <2 0x02000000 0x10000>; interrupts = <15>;
@@ -59,14 +59,14 @@ ethernet@2,02000000 { vddvario-supply = <&v2m_fixed_3v3>; }; - usb@2,03000000 { + usb@203000000 { compatible = "nxp,usb-isp1761"; reg = <2 0x03000000 0x20000>; interrupts = <16>; port1-otg; }; - iofpga@3,00000000 { + iofpga@300000000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
arch/arm64/boot/dts/arm/foundation-v8.dtsi +2 -2
@@ -151,7 +151,7 @@ smb@8000000 { <0 0 41 &gic 0 GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>, <0 0 42 &gic 0 GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; - ethernet@2,02000000 { + ethernet@202000000 { compatible = "smsc,lan91c111"; reg = <2 0x02000000 0x10000>; interrupts = <15>;
@@ -178,7 +178,7 @@ v2m_refclk32khz: refclk32khz { clock-output-names = "v2m:refclk32khz"; }; - iofpga@3,00000000 { + iofpga@300000000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
arch/arm64/boot/dts/arm/juno-motherboard.dtsi +3 -3
@@ -103,7 +103,7 @@ nmi-button { }; }; - flash@0,00000000 { + flash@0 { /* 2 * 32MiB NOR Flash memory mounted on CS0 */ compatible = "arm,vexpress-flash", "cfi-flash"; reg = <0 0x00000000 0x04000000>;
@@ -120,7 +120,7 @@ partitions { }; }; - ethernet@2,00000000 { + ethernet@200000000 { compatible = "smsc,lan9118", "smsc,lan9115"; reg = <2 0x00000000 0x10000>; interrupts = <3>;
@@ -133,7 +133,7 @@ ethernet@2,00000000 { vddvario-supply = <&mb_fixed_3v3>; }; - iofpga@3,00000000 { + iofpga@300000000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi +1 -1
@@ -9,7 +9,7 @@ smb@8000000 { motherboard { arm,v2m-memory-map = "rs2"; - iofpga@3,00000000 { + iofpga@300000000 { virtio-p9@140000 { compatible = "virtio,mmio"; reg = <0x140000 0x200>;
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +3 -3
@@ -17,14 +17,14 @@ motherboard { #interrupt-cells = <1>; ranges; - flash@0,00000000 { + flash@0 { compatible = "arm,vexpress-flash", "cfi-flash"; reg = <0 0x00000000 0x04000000>, <4 0x00000000 0x04000000>; bank-width = <4>; }; - ethernet@2,02000000 { + ethernet@202000000 { compatible = "smsc,lan91c111"; reg = <2 0x02000000 0x10000>; interrupts = <15>;
@@ -51,7 +51,7 @@ v2m_refclk32khz: refclk32khz { clock-output-names = "v2m:refclk32khz"; }; - iofpga@3,00000000 { + iofpga@300000000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 51/266 m68k/PCI: Fix a memory leak in an error handling path
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit c3f4ec050f56eeab7c1f290321f9b762c95bd332 ]
If 'ioremap' fails, we must free 'bridge', as done in other error handling path bellow.
--- arch/m68k/coldfire/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/m68k/coldfire/pci.c +3 -1
@@ -216,8 +216,10 @@ static int __init mcf_pci_init(void)/* Keep a virtual mapping to IO/config space active */ iospace = (unsigned long )ioremap (PCI_IO_PA ,PCI_IO_SIZE ); -if (iospace ==0 ) +if (iospace ==0 ) { +pci_free_host_bridge (bridge);return -ENODEV ; + }pr_info ("Coldfire: PCI IO/config window mapped to 0x%x\n" , (u32 ) iospace);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 56/266 scsi: cxgb3i: Fix some leaks in init_act_open()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit b6170a49c59c27a10efed26c5a2969403e69aaba ]
There wasn't any clean up done if cxgb3_alloc_atid() failed and also the original code didn't release "csk->l2t".
--- drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +14 -4
@@ -959,6 +959,7 @@ static int init_act_open(struct cxgbi_sock *csk)struct net_device *ndev = cdev->ports[csk->port_id];struct cxgbi_hba *chba = cdev->hbas[csk->port_id];struct sk_buff *skb =NULL ; +int ret;log_debug (1 <<CXGBI_DBG_TOE |1 <<CXGBI_DBG_SOCK ,"csk 0x%p,%u,0x%lx.\n" , csk, csk->state, csk->flags);
@@ -979,16 +980,16 @@ static int init_act_open(struct cxgbi_sock *csk) csk->atid =cxgb3_alloc_atid (t3dev, &t3_client, csk);if (csk->atid <0 ) {pr_err ("NO atid available.\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_sock; }cxgbi_sock_set_flag (csk,CTPF_HAS_ATID );cxgbi_sock_get (csk); skb =alloc_wr (sizeof (struct cpl_act_open_req ),0 ,GFP_KERNEL );if (!skb) { -cxgb3_free_atid (t3dev, csk->atid); -cxgbi_sock_put (csk); -return -ENOMEM ; + ret = -ENOMEM ; + goto free_atid; } skb->sk = (struct sock *)csk;set_arp_failure_handler (skb, act_open_arp_failure);
@@ -1010,6 +1011,15 @@ static int init_act_open(struct cxgbi_sock *csk)cxgbi_sock_set_state (csk,CTP_ACTIVE_OPEN );send_act_open_req (csk, skb, csk->l2t);return 0 ; + +free_atid: +cxgb3_free_atid (t3dev, csk->atid); +put_sock: +cxgbi_sock_put (csk); +l2t_release (t3dev, csk->l2t); + csk->l2t =NULL ; + +return ret; }cxgb3_cpl_handler_func cxgb3i_cpl_handlers[NUM_CPL_CMDS ] = {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 60/266 clk: clk-flexgen: fix clock-critical handling
In reply to Sasha LevinFrom: Alain Volmat <[email protected]>
[ Upstream commit a403bbab1a73d798728d76931cab3ff0399b9560 ]
Fixes an issue leading to having all clocks following a critical clocks marked as well as criticals.
--- drivers/clk/st/clk-flexgen.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/st/clk-flexgen.c +1 -0
@@ -375,6 +375,7 @@ static void __init st_of_flexgen_setup(struct device_node *np)break ; } + flex_flags &= ~CLK_IS_CRITICAL ;of_clk_detect_critical (np, i, &flex_flags);/*
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 62/266 powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run
In reply to Sasha LevinFrom: Kajol Jain <[email protected]>
[ Upstream commit b4ac18eead28611ff470d0f47a35c4e0ac080d9c ]
Commit 2b206ee6b0df ("powerpc/perf/hv-24x7: Display change in counter values")' added to print _change_ in the counter value rather then raw value for 24x7 counters. Incase of transactions, the event count is set to 0 at the beginning of the transaction. It also sets the event's prev_count to the raw value at the time of initialization. Because of setting event count to 0, we are seeing some weird behaviour, whenever we run multiple 24x7 events at a time.
For example:
command#: ./perf stat -e "{hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/,
hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/}"
-C 0 -I 1000 sleep 100
1.000121704 120 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
1.000121704 5 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
2.000357733 8 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
2.000357733 10 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
3.000495215 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
3.000495215 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
4.000641884 56 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
4.000641884 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
5.000791887 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/Getting these large values in case we do -I.
As we are setting event_count to 0, for interval case, overall event_count is not coming in incremental order. As we may can get new delta lesser then previous count. Because of which when we print intervals, we are getting negative value which create these large values.
This patch removes part where we set event_count to 0 in function 'h_24x7_event_read'. There won't be much impact as we do set event->hw.prev_count to the raw value at the time of initialization to print change value.
With this patch
In power9 platform
command#: ./perf stat -e "{hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/,
hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/}"
-C 0 -I 1000 sleep 100
1.000117685 93 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
1.000117685 1 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
2.000349331 98 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
2.000349331 2 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
3.000495900 131 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
3.000495900 4 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
4.000645920 204 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
4.000645920 61 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
4.284169997 22 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/--- arch/powerpc/perf/hv-24x7.c | 10 ---------- 1 file changed, 10 deletions(-)
arch/powerpc/perf/hv-24x7.c +0 -10
@@ -1400,16 +1400,6 @@ static void h_24x7_event_read(struct perf_event *event) h24x7hw = &get_cpu_var (hv_24x7_hw); h24x7hw->events[i] = event;put_cpu_var (h24x7hw); -/* -* Clear the event count so we can compute the _change_ -* in the 24x7 raw counter value at the end of the txn. -* -* Note that we could alternatively read the 24x7 value -* now and save its value in event->hw.prev_count. But -* that would require issuing a hcall, which would then -* defeat the purpose of using the txn interface. -*/ -local64_set (&event->count,0 ); }put_cpu_var (hv_24x7_reqb);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 63/266 nfsd: Fix svc_xprt refcnt leak when setup callback client failed
In reply to Sasha LevinFrom: Xiyu Yang <[email protected]>
[ Upstream commit a4abc6b12eb1f7a533c2e7484cfa555454ff0977 ]
nfsd4_process_cb_update() invokes svc_xprt_get(), which increases the refcount of the "c->cn_xprt".
The reference counting issue happens in one exception handling path of nfsd4_process_cb_update(). When setup callback client failed, the function forgets to decrease the refcnt increased by svc_xprt_get(), causing a refcnt leak.
Fix this issue by calling svc_xprt_put() when setup callback client failed.
--- fs/nfsd/nfs4callback.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfsd/nfs4callback.c +2 -0
@@ -1230,6 +1230,8 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb) err =setup_callback_client (clp, &conn, ses);if (err) {nfsd4_mark_cb_down (clp, err); +if (c) +svc_xprt_put (c->cn_xprt);return ; } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 64/266 PCI: vmd: Filter resource type bits from shadow register
In reply to Sasha LevinFrom: Jon Derrick <[email protected]>
[ Upstream commit 3e5095eebe015d5a4d566aa5e03c8621add5f0a7 ]
Versions of VMD with the Host Physical Address shadow register use this register to calculate the bus address offset needed to do guest passthrough of the domain. This register shadows the Host Physical Address registers including the resource type bits. After calculating the offset, the extra resource type bits lead to the VMD resources being over-provisioned at the front and under-provisioned at the back.
Example:
pci 10000:80:02.0: reg 0x10: [mem 0xf801fffc-0xf803fffb 64bit]
Expected:
pci 10000:80:02.0: reg 0x10: [mem 0xf8020000-0xf803ffff 64bit]
If other devices are mapped in the over-provisioned front, it could lead to resource conflict issues with VMD or those devices.
--- drivers/pci/controller/vmd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +4 -2
@@ -593,9 +593,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!membar2)return -ENOMEM ; offset[0 ] = vmd->dev->resource[VMD_MEMBAR1 ].start - -readq (membar2 +MB2_SHADOW_OFFSET ); + (readq (membar2 +MB2_SHADOW_OFFSET ) & +PCI_BASE_ADDRESS_MEM_MASK ); offset[1 ] = vmd->dev->resource[VMD_MEMBAR2 ].start - -readq (membar2 +MB2_SHADOW_OFFSET +8 ); + (readq (membar2 +MB2_SHADOW_OFFSET +8 ) & +PCI_BASE_ADDRESS_MEM_MASK );pci_iounmap (vmd->dev, membar2); } }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 72/266 NTB: ntb_pingpong: Choose doorbells based on port number
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit ca93c45755da98302c93abdd788fc09113baf9e0 ]
This commit fixes pingpong support for existing drivers that do not implement ntb_default_port_number() and ntb_default_peer_port_number(). This is required for hardware (like the crosslink topology of switchtec) which cannot assign reasonable port numbers to each port due to its perfect symmetry.
Instead of picking the doorbell to use based on the the index of the peer, we use the peer's port number. This is a bit clearer and easier to understand.
--- drivers/ntb/test/ntb_pingpong.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/ntb/test/ntb_pingpong.c +6 -8
@@ -121,15 +121,14 @@ static int pp_find_next_peer(struct pp_ctx *pp) link =ntb_link_is_up (pp->ntb,NULL ,NULL );/* Find next available peer */ -if (link & pp->nmask) { +if (link & pp->nmask) pidx =__ffs64 (link & pp->nmask); - out_db =BIT_ULL (pidx +1 ); - }else if (link & pp->pmask) { +else if (link & pp->pmask) pidx =__ffs64 (link & pp->pmask); - out_db =BIT_ULL (pidx); - }else { +else return -ENODEV ; - } + + out_db =BIT_ULL (ntb_peer_port_number (pp->ntb, pidx));spin_lock (&pp->lock); pp->out_pidx = pidx;
@@ -303,7 +302,7 @@ static void pp_init_flds(struct pp_ctx *pp)break ; } - pp->in_db =BIT_ULL (pidx); + pp->in_db =BIT_ULL (lport); pp->pmask =GENMASK_ULL (pidx,0 ) >>1 ; pp->nmask =GENMASK_ULL (pcnt -1 , pidx);
@@ -435,4 +434,3 @@ static void __exit pp_exit(void)debugfs_remove_recursive (pp_dbgfs_topdir); }module_exit (pp_exit); -
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 73/266 NTB: Fix the default port and peer numbers for legacy drivers
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit fc8b086d9dbd57458d136c4fa70ee26f832c3a2e ]
When the commit adding ntb_default_port_number() and ntb_default_peer_port_number() entered the kernel there was no users of it so it was impossible to tell what the API needed.
When a user finally landed a year later (ntb_pingpong) there were more NTB topologies were created and no consideration was considered to how other drivers had changed.
Now that there is a user it can be fixed to provide a sensible default for the legacy drivers that do not implement ntb_{peer_}port_number(). Seeing ntb_pingpong doesn't check error codes returning EINVAL was also not sensible.
Patches for ntb_pingpong and ntb_perf follow (which are broken otherwise) to support hardware that doesn't have port numbers. This is important not only to not break support with existing drivers but for the cross link topology which, due to its perfect symmetry, cannot assign unique port numbers to each side.
--- drivers/ntb/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/ntb/core.c +2 -6
@@ -214,10 +214,8 @@ int ntb_default_port_number(struct ntb_dev *ntb)case NTB_TOPO_B2B_DSD :return NTB_PORT_SEC_DSD ;default : -break ; +return 0 ; } - -return -EINVAL ; }EXPORT_SYMBOL (ntb_default_port_number);
@@ -240,10 +238,8 @@ int ntb_default_peer_port_number(struct ntb_dev *ntb, int pidx)case NTB_TOPO_B2B_DSD :return NTB_PORT_PRI_USD ;default : -break ; +return 0 ; } - -return -EINVAL ; }EXPORT_SYMBOL (ntb_default_peer_port_number);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 74/266 mksysmap: Fix the mismatch of '.L' symbols in System.map
In reply to Sasha LevinFrom: ashimida <[email protected]>
[ Upstream commit 72d24accf02add25e08733f0ecc93cf10fcbd88c ]
When System.map was generated, the kernel used mksysmap to filter the kernel symbols, but all the symbols with the second letter 'L' in the kernel were filtered out, not just the symbols starting with 'dot + L'.
For example:
ashimida@ubuntu:~/linux$ cat System.map |grep ' .L' ashimida@ubuntu:~/linux$ nm -n vmlinux |grep ' .L' ffff0000088028e0 t bLength_show ...... ffff0000092e0408 b PLLP_OUTC_lock ffff0000092e0410 b PLLP_OUTA_lock
The original intent should be to filter out all local symbols starting with '.L', so the dot should be escaped.
--- scripts/mksysmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mksysmap +1 -1
@@ -41,4 +41,4 @@ # so we just ignore them to let readprofile continue to work. # (At least sparc64 has __crc_ in the middle). -$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)\|\( .L\)' > $2 +$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)\|\( \.L\)' > $2
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 76/266 net: dsa: lantiq_gswip: fix and improve the unsupported interface error
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 4d3da2d8d91f66988a829a18a0ce59945e8ae4fb ]
While trying to use the lantiq_gswip driver on one of my boards I made a mistake when specifying the phy-mode (because the out-of-tree driver wants phy-mode "gmii" or "mii" for the internal PHYs). In this case the following error is printed multiple times:
Unsupported interface: 3
While it gives at least a hint at what may be wrong it is not very user friendly. Print the human readable phy-mode and also which port is configured incorrectly (this hardware supports ports 0..6) to improve the cases where someone made a mistake.
--- drivers/net/dsa/lantiq_gswip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/dsa/lantiq_gswip.c +2 -1
@@ -1451,7 +1451,8 @@ static void gswip_phylink_validate(struct dsa_switch *ds, int port, unsupported:bitmap_zero (supported, __ETHTOOL_LINK_MODE_MASK_NBITS); -dev_err (ds->dev,"Unsupported interface: %d\n" , state->interface); +dev_err (ds->dev,"Unsupported interface '%s' for port %d\n" , +phy_modes (state->interface), port);return ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 78/266 f2fs: handle readonly filesystem in f2fs_ioc_shutdown()
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 8626441f05dc45a2f4693ee6863d02456ce39e60 ]
If mountpoint is readonly, we should allow shutdowning filesystem successfully, this fixes issue found by generic/599 testcase of xfstest.
--- fs/f2fs/file.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/f2fs/file.c +8 -1
@@ -2056,8 +2056,15 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)if (in !=F2FS_GOING_DOWN_FULLSYNC ) { ret =mnt_want_write_file (filp); -if (ret) +if (ret) { +if (ret == -EROFS ) { + ret =0 ; +f2fs_stop_checkpoint (sbi, false); +set_sbi_flag (sbi,SBI_IS_SHUTDOWN ); +trace_f2fs_shutdown (sbi, in, ret); + }return ret; + } }switch (in) {
Signature · 8 lines
2.25.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 79/266 ASoC: meson: add missing free_irq() in error path
In reply to Sasha LevinFrom: "Pavel Machek (CIP)" <[email protected]>
[ Upstream commit 3b8a299a58b2afce464ae11324b59dcf0f1d10a7 ]
free_irq() is missing in case of error, fix that.
--- sound/soc/meson/axg-fifo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
sound/soc/meson/axg-fifo.c +8 -2
@@ -244,7 +244,7 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss)/* Enable pclk to access registers and clock the fifo ip */ ret =clk_prepare_enable (fifo->pclk);if (ret) -return ret; + goto free_irq;/* Setup status2 so it reports the memory pointer */ regmap_update_bits(fifo->map, FIFO_CTRL1,
@@ -264,8 +264,14 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss)/* Take memory arbitror out of reset */ ret =reset_control_deassert (fifo->arb);if (ret) -clk_disable_unprepare (fifo->pclk); + goto free_clk; + +return 0 ; +free_clk: +clk_disable_unprepare (fifo->pclk); +free_irq: +free_irq (fifo->irq, ss);return ret; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 104/266 s390/qdio: put thinint indicator after early error
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 75e82bec6b2622c6f455b7a543fb5476a5d0eed7 ]
qdio_establish() calls qdio_setup_thinint() via qdio_setup_irq(). If the subsequent qdio_establish_thinint() fails, we miss to put the DSCI again. Thus the DSCI isn't available for re-use. Given enough of such errors, we could end up with having only the shared DSCI available.
Merge qdio_setup_thinint() into qdio_establish_thinint(), and deal with such an error internally.
--- drivers/s390/cio/qdio.h | 1 - drivers/s390/cio/qdio_setup.c | 1 - drivers/s390/cio/qdio_thinint.c | 14 ++++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/s390/cio/qdio.h +0 -1
@@ -372,7 +372,6 @@ static inline int multicast_outbound(struct qdio_q *q)extern u64 last_ai_time;/* prototypes for thin interrupt */ -void qdio_setup_thinint (struct qdio_irq *irq_ptr);int qdio_establish_thinint (struct qdio_irq *irq_ptr);void qdio_shutdown_thinint (struct qdio_irq *irq_ptr);void tiqdio_add_input_queues (struct qdio_irq *irq_ptr);
drivers/s390/cio/qdio_setup.c +0 -1
@@ -479,7 +479,6 @@ int qdio_setup_irq(struct qdio_initialize *init_data)setup_queues (irq_ptr, init_data);setup_qib (irq_ptr, init_data); -qdio_setup_thinint (irq_ptr); set_impl_params(irq_ptr, init_data->qib_param_field_format, init_data->qib_param_field, init_data->input_slib_elements,
drivers/s390/cio/qdio_thinint.c +8 -6
@@ -268,17 +268,19 @@ int __init tiqdio_register_thinints(void)int qdio_establish_thinint (struct qdio_irq *irq_ptr) { +int rc; +if (!is_thinint_irq (irq_ptr))return 0 ; -return set_subchannel_ind (irq_ptr,0 ); -} -void qdio_setup_thinint (struct qdio_irq *irq_ptr) -{ -if (!is_thinint_irq (irq_ptr)) -return ; irq_ptr->dsci =get_indicator ();DBF_HEX (&irq_ptr->dsci,sizeof (void *)); + + rc =set_subchannel_ind (irq_ptr,0 ); +if (rc) +put_indicator (irq_ptr->dsci); + +return rc; }void qdio_shutdown_thinint (struct qdio_irq *irq_ptr)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 101/266 ALSA: usb-audio: Improve frames size computation
In reply to Sasha LevinFrom: Alexander Tsoy <[email protected]>
[ Upstream commit f0bd62b64016508938df9babe47f65c2c727d25c ]
For computation of the the next frame size current value of fs/fps and accumulated fractional parts of fs/fps are used, where values are stored in Q16.16 format. This is quite natural for computing frame size for asynchronous endpoints driven by explicit feedback, since in this case fs/fps is a value provided by the feedback endpoint and it's already in the Q format. If an error is accumulated over time, the device can adjust fs/fps value to prevent buffer overruns/underruns.
But for synchronous endpoints the accuracy provided by these computations is not enough. Due to accumulated error the driver periodically produces frames with incorrect size (+/- 1 audio sample).
This patch fixes this issue by implementing a different algorithm for frame size computation. It is based on accumulating of the remainders from division fs/fps and it doesn't accumulate errors over time. This new method is enabled for synchronous and adaptive playback endpoints.
--- sound/usb/card.h | 4 ++++ sound/usb/endpoint.c | 43 ++++++++++++++++++++++++++++++++++++++----- sound/usb/endpoint.h | 1 + sound/usb/pcm.c | 2 ++ 4 files changed, 45 insertions(+), 5 deletions(-)
sound/usb/card.h +4 -0
@@ -84,6 +84,10 @@ struct snd_usb_endpoint {dma_addr_t sync_dma;/* DMA address of syncbuf */ unsigned int pipe;/* the data i/o pipe */ +unsigned int framesize[2 ];/* small/large frame sizes in samples */ +unsigned int sample_rem;/* remainder from division fs/fps */ +unsigned int sample_accum;/* sample accumulator */ +unsigned int fps;/* frames per second */ unsigned int freqn;/* nominal sampling rate in fs/fps in Q16.16 format */ unsigned int freqm;/* momentary sampling rate in fs/fps in Q16.16 format */ int freqshift;/* how much to shift the feedback value to get Q16.16 */
sound/usb/endpoint.c +38 -5
78 lines not on this page · raw message
sound/usb/endpoint.h +1 -0
@@ -28,6 +28,7 @@ void snd_usb_endpoint_release(struct snd_usb_endpoint *ep);void snd_usb_endpoint_free (struct snd_usb_endpoint *ep);int snd_usb_endpoint_implicit_feedback_sink (struct snd_usb_endpoint *ep); +int snd_usb_endpoint_slave_next_packet_size (struct snd_usb_endpoint *ep);int snd_usb_endpoint_next_packet_size (struct snd_usb_endpoint *ep); void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep,
sound/usb/pcm.c +2 -0
@@ -1575,6 +1575,8 @@ static void prepare_playback_urb(struct snd_usb_substream *subs,for (i =0 ; i < ctx->packets; i++) {if (ctx->packet_size[i]) counts = ctx->packet_size[i]; +else if (ep->sync_master) + counts =snd_usb_endpoint_slave_next_packet_size (ep);else counts =snd_usb_endpoint_next_packet_size (ep);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 105/266 tty: hvc: Fix data abort due to race in hvc_open
In reply to Sasha LevinFrom: Raghavendra Rao Ananta <[email protected]>
[ Upstream commit e2bd1dcbe1aa34ff5570b3427c530e4332ecf0fe ]
Potentially, hvc_open() can be called in parallel when two tasks calls open() on /dev/hvcX. In such a scenario, if the hp->ops->notifier_add() callback in the function fails, where it sets the tty->driver_data to NULL, the parallel hvc_open() can see this NULL and cause a memory abort. Hence, serialize hvc_open and check if tty->private_data is NULL before proceeding ahead.
The issue can be easily reproduced by launching two tasks simultaneously that does nothing but open() and close() on /dev/hvcX.
For example:
$ ./simple_open_close /dev/hvc0 & ./simple_open_close /dev/hvc0 &
--- drivers/tty/hvc/hvc_console.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/tty/hvc/hvc_console.c +14 -2
@@ -75,6 +75,8 @@ static LIST_HEAD(hvc_structs);*/ static DEFINE_MUTEX (hvc_structs_mutex); +/* Mutex to serialize hvc_open */ +static DEFINE_MUTEX (hvc_open_mutex);/* * This value is used to assign a tty->index value to a hvc_struct based * upon order of exposure via hvc_probe(), when we can not match it to
@@ -346,16 +348,24 @@ static int hvc_install(struct tty_driver *driver, struct tty_struct *tty)*/ static int hvc_open (struct tty_struct *tty,struct file * filp) { -struct hvc_struct *hp = tty->driver_data; +struct hvc_struct *hp;unsigned long flags;int rc =0 ; +mutex_lock (&hvc_open_mutex); + + hp = tty->driver_data; +if (!hp) { + rc = -EIO ; + goto out; + } +spin_lock_irqsave (&hp->port.lock, flags);/* Check and then increment for fast path open. */ if (hp->port.count++ >0 ) {spin_unlock_irqrestore (&hp->port.lock, flags);hvc_kick (); -return 0 ; + goto out; }/* else count == 0 */ spin_unlock_irqrestore (&hp->port.lock, flags);
@@ -383,6 +393,8 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)/* Force wakeup of the polling thread */ hvc_kick (); +out: +mutex_unlock (&hvc_open_mutex);return rc; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 107/266 clk: meson: meson8b: Fix the first parent of vid_pll_in_sel
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit da1978ac3d6cf278dedf5edbf350445a0fff2f08 ]
Use hdmi_pll_lvds_out as parent of the vid_pll_in_sel clock. It's not easy to see that the vendor kernel does the same, but it actually does. meson_clk_pll_ops in mainline still cannot fully recalculate all rates from the HDMI PLL registers because some register bits (at the time of writing it's unknown which bits are used for this) double the HDMI PLL output rate (compared to simply considering M, N and FRAC) for some (but not all) PLL settings.
Update the vid_pll_in_sel parent so our clock calculation works for simple clock settings like the CVBS output (where no rate doubling is going on). The PLL ops need to be fixed later on for more complex clock settings (all HDMI rates).
--- drivers/clk/meson/meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +1 -1
@@ -1071,7 +1071,7 @@ static struct clk_regmap meson8b_vid_pll_in_sel = {* Meson8m2: vid2_pll */ .parent_hws = (const struct clk_hw *[]) { - &meson8b_hdmi_pll_dco.hw + &meson8b_hdmi_pll_lvds_out.hw }, .num_parents = 1, .flags = CLK_SET_RATE_PARENT,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 110/266 gpio: pca953x: fix handling of automatic address incrementing
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit bcf41dc480b179bfb669a232080a2e26dc7294b4 ]
Some of the chips supported by the pca953x driver need the most significant bit in the address word set to automatically increment the address pointer on subsequent reads and writes (example: PCA9505). With this bit unset the same register is read multiple times on a multi-byte read sequence. Other chips must not have this bit set and autoincrement always (example: PCA9555).
Up to now this AI bit was interpreted to be part of the address, which resulted in inconsistent regmap caching when a register was written with AI set and then read without it. This happened for the PCA9505 in pca953x_gpio_set_multiple() where pca953x_read_regs() bulk read from the cache for registers 0x8-0xc and then wrote to registers 0x88-0x8c. (Side
note: reading 5 values from offset 0x8 yiels OP0 5 times because AI must be set to get OP0-OP4, which is another bug that is resolved here as a by-product.) The same problem happens when calls to gpio_set_value() and gpio_set_array_value() were mixed.
With this patch the AI bit is always set for chips that support it. This works as there are no code locations that make use of the behaviour with AI unset (for the chips that support it).
Note that the call to pca953x_setup_gpio() had to be done a bit earlier to make the NBANK macro work.
The history of this bug is a bit complicated. Commit b32cecb46bdc ("gpio: pca953x: Extract the register address mangling to single function") changed which chips and functions are affected. Commit 3b00691cc46a ("gpio: pca953x: hack to fix 24 bit gpio expanders") used some duct tape to make the driver at least appear to work. Commit 49427232764d ("gpio: pca953x: Perform basic regmap conversion") introduced the caching. Commit b4818afeacbd ("gpio: pca953x: Add set_multiple to allow multiple bits to be set in one write.") introduced the .set_multiple() callback which didn't work for chips that need the AI bit which was fixed later for some chips in 8958262af3fb ("gpio:
pca953x: Repair multi-byte IO address increment on PCA9575"). So I'm sorry, I don't know which commit I should pick for a Fixes: line.
--- drivers/gpio/gpio-pca953x.c | 44 +++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 16 deletions(-)
drivers/gpio/gpio-pca953x.c +28 -16
@@ -306,8 +306,22 @@ static const struct regmap_config pca953x_i2c_regmap = { .volatile_reg = pca953x_volatile_register, .cache_type = REGCACHE_RBTREE, -/* REVISIT: should be 0x7f but some 24 bit chips use REG_ADDR_AI */ - .max_register = 0xff, + .max_register = 0x7f, +}; + +static const struct regmap_config pca953x_ai_i2c_regmap = { + .reg_bits =8 , + .val_bits =8 , + + .read_flag_mask =REG_ADDR_AI , + .write_flag_mask =REG_ADDR_AI , + + .readable_reg = pca953x_readable_register, + .writeable_reg = pca953x_writeable_register, + .volatile_reg = pca953x_volatile_register, + + .cache_type =REGCACHE_RBTREE , + .max_register =0x7f , }; static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off,
@@ -318,18 +332,6 @@ static u8 pca953x_recalc_addr(struct pca953x_chip *chip, int reg, int off,int pinctrl = (reg &PCAL_PINCTRL_MASK ) <<1 ;u8 regaddr = pinctrl | addr | (off /BANK_SZ ); -/* Single byte read doesn't need AI bit set. */ -if (!addrinc) -return regaddr; - -/* Chips with 24 and more GPIOs always support Auto Increment */ -if (write &&NBANK (chip) >2 ) - regaddr |=REG_ADDR_AI ; - -/* PCA9575 needs address-increment on multi-byte writes */ -if (PCA_CHIP_TYPE (chip->driver_data) ==PCA957X_TYPE ) - regaddr |=REG_ADDR_AI ; -return regaddr; }
@@ -897,6 +899,7 @@ static int pca953x_probe(struct i2c_client *client,int ret;u32 invert =0 ;struct regulator *reg; +const struct regmap_config *regmap_config; chip =devm_kzalloc (&client->dev,sizeof (struct pca953x_chip ),GFP_KERNEL );
@@ -960,7 +963,17 @@ static int pca953x_probe(struct i2c_client *client,i2c_set_clientdata (client, chip); - chip->regmap =devm_regmap_init_i2c (client, &pca953x_i2c_regmap); +pca953x_setup_gpio (chip, chip->driver_data &PCA_GPIO_MASK ); + +if (NBANK (chip) >2 ||PCA_CHIP_TYPE (chip->driver_data) ==PCA957X_TYPE ) { +dev_info (&client->dev,"using AI\n" ); + regmap_config = &pca953x_ai_i2c_regmap; + }else { +dev_info (&client->dev,"using no AI\n" ); + regmap_config = &pca953x_i2c_regmap; + } + + chip->regmap =devm_regmap_init_i2c (client, regmap_config);if (IS_ERR (chip->regmap)) { ret =PTR_ERR (chip->regmap); goto err_exit;
@@ -991,7 +1004,6 @@ static int pca953x_probe(struct i2c_client *client,/* initialize cached registers from their original values. * we can't share this chip with another i2c master. */ -pca953x_setup_gpio (chip, chip->driver_data &PCA_GPIO_MASK );if (PCA_CHIP_TYPE (chip->driver_data) ==PCA953X_TYPE ) { chip->regs = &pca953x_regs;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 111/266 thermal/drivers/ti-soc-thermal: Avoid dereferencing ERR_PTR
In reply to Sasha LevinFrom: Sudip Mukherjee <[email protected]>
[ Upstream commit 7440f518dad9d861d76c64956641eeddd3586f75 ]
On error the function ti_bandgap_get_sensor_data() returns the error code in ERR_PTR() but we only checked if the return value is NULL or not. And, so we can dereference an error code inside ERR_PTR. While at it, convert a check to IS_ERR_OR_NULL.
--- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +3 -3
@@ -169,7 +169,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, data =ti_bandgap_get_sensor_data (bgp, id); -if (!data ||IS_ERR (data)) +if (!IS_ERR_OR_NULL (data)) data =ti_thermal_build_data (bgp, id);if (!data)
@@ -196,7 +196,7 @@ int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id) data =ti_bandgap_get_sensor_data (bgp, id); -if (data && data->ti_thermal) { +if (!IS_ERR_OR_NULL (data) && data->ti_thermal) {if (data->our_zone)thermal_zone_device_unregister (data->ti_thermal); }
@@ -262,7 +262,7 @@ int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id) data =ti_bandgap_get_sensor_data (bgp, id); -if (data) { +if (!IS_ERR_OR_NULL (data)) {cpufreq_cooling_unregister (data->cool_dev);if (data->policy)cpufreq_cpu_put (data->policy);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 121/266 i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit 88b73ee7ca4c90baf136ed5a8377fc5a9b73ac08 ]
The IRQ log output is supposed to appear on a single line. However, commit 3a2dc1677b60 ("i2c: pxa: Update debug function to dump more info on error") resulted in it being printed one-entry-per-line, which is excessively long.
Fixing this is not a trivial matter; using pr_cont() doesn't work as the previous dev_dbg() may not have been compiled in, or may be dynamic.
Since the rest of this function output is at error level, and is also debug output, promote this to error level as well to avoid this problem.
Reduce the number of always zero prefix digits to save screen real- estate.
--- drivers/i2c/busses/i2c-pxa.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-pxa.c +3 -4
@@ -312,11 +312,10 @@ static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)dev_err (dev,"IBMR: %08x IDBR: %08x ICR: %08x ISR: %08x\n" ,readl (_IBMR (i2c)),readl (_IDBR (i2c)),readl (_ICR (i2c)),readl (_ISR (i2c))); -dev_dbg (dev,"log: " ); +dev_err (dev,"log:" );for (i =0 ; i < i2c->irqlogidx; i++) -pr_debug ("[%08x:%08x] " , i2c->isrlog[i], i2c->icrlog[i]); - - pr_debug("\n"); +pr_cont (" [%03x:%05x]" , i2c->isrlog[i], i2c->icrlog[i]); + pr_cont("\n"); }#else /* ifdef DEBUG */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 125/266 PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 66ff14e59e8a30690755b08bc3042359703fb07a ]
7d715a6c1ae5 ("PCI: add PCI Express ASPM support") added the ability for Linux to enable ASPM, but for some undocumented reason, it didn't enable ASPM on links where the downstream component is a PCIe-to-PCI/PCI-X Bridge.
Remove this exclusion so we can enable ASPM on these links.
The Dell OptiPlex 7080 mentioned in the bugzilla has a TI XIO2001 PCIe-to-PCI Bridge. Enabling ASPM on the link leading to it allows the Intel SoC to enter deeper Package C-states, which is a significant power savings.
[bhelgaas: commit log]
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207571
--- drivers/pci/pcie/aspm.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/pci/pcie/aspm.c +0 -10
@@ -628,16 +628,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)/* Setup initial capable state. Will be updated later */ link->aspm_capable = link->aspm_support; -/* -* If the downstream component has pci bridge function, don't -* do ASPM for now. -*/ -list_for_each_entry (child, &linkbus->devices, bus_list) { -if (pci_pcie_type (child) ==PCI_EXP_TYPE_PCI_BRIDGE ) { - link->aspm_disable =ASPM_STATE_ALL ; -break ; - } - }/* Get and check endpoint acceptable latencies */ list_for_each_entry (child, &linkbus->devices, bus_list) {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 131/266 arm64: dts: msm8996: Fix CSI IRQ types
In reply to Sasha LevinFrom: Loic Poulain <[email protected]>
[ Upstream commit 4a4a26317ec8aba575f6b85789a42639937bc1a4 ]
Each IRQ_TYPE_NONE interrupt causes a warning at boot. Fix that by defining an appropriate type.
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +10 -10
@@ -1681,16 +1681,16 @@ camss: camss@a00000 { "csi_clk_mux", "vfe0", "vfe1"; - interrupts = <GIC_SPI 78 0>, - <GIC_SPI 79 0>, - <GIC_SPI 80 0>, - <GIC_SPI 296 0>, - <GIC_SPI 297 0>, - <GIC_SPI 298 0>, - <GIC_SPI 299 0>, - <GIC_SPI 309 0>, - <GIC_SPI 314 0>, - <GIC_SPI 315 0>; + interrupts = <GIC_SPI 78 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 79 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 80 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 296 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 297 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 298 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 299 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 309 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 314 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 315 IRQ_TYPE_EDGE_RISING>; interrupt-names = "csiphy0", "csiphy1", "csiphy2",
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 139/266 USB: ohci-sm501: fix error return code in ohci_hcd_sm501_drv_probe()
In reply to Sasha LevinFrom: Wei Yongjun <[email protected]>
[ Upstream commit b919e077cccfbb77beb98809568b2fb0b4d113ec ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- drivers/usb/host/ohci-sm501.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/host/ohci-sm501.c +4 -3
@@ -157,9 +157,10 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)* the call to usb_hcd_setup_local_mem() below does just that. */ -if (usb_hcd_setup_local_mem (hcd, mem->start, - mem->start - mem->parent->start, -resource_size (mem)) <0 ) + retval =usb_hcd_setup_local_mem (hcd, mem->start, + mem->start - mem->parent->start, +resource_size (mem)); +if (retval <0 ) goto err5; retval =usb_add_hcd (hcd, irq,IRQF_SHARED );if (retval)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 140/266 clk: ti: composite: fix memory leak
In reply to Sasha LevinFrom: Tero Kristo <[email protected]>
[ Upstream commit c7c1cbbc9217ebb5601b88d138d4a5358548de9d ]
The parent_names is never released for a component clock definition, causing some memory leak. Fix by releasing it once it is no longer needed.
--- drivers/clk/ti/composite.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/ti/composite.c +1 -0
@@ -196,6 +196,7 @@ static void __init _register_composite(void *user,if (!cclk->comp_clks[i])continue ;list_del (&cclk->comp_clks[i]->link); +kfree (cclk->comp_clks[i]->parent_names);kfree (cclk->comp_clks[i]); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 152/266 drivers: phy: sr-usb: do not use internal fsm for USB2 phy init
In reply to Sasha LevinFrom: Bharat Gooty <[email protected]>
[ Upstream commit 6f0577d1411337a0d97d545abe4a784e9e611516 ]
During different reboot cycles, USB PHY PLL may not always lock during initialization and therefore can cause USB to be not usable.
Hence do not use internal FSM programming sequence for the USB PHY initialization.
--- drivers/phy/broadcom/phy-bcm-sr-usb.c | 55 +-------------------------- 1 file changed, 2 insertions(+), 53 deletions(-)
drivers/phy/broadcom/phy-bcm-sr-usb.c +2 -53
@@ -16,8 +16,6 @@ enum bcm_usb_phy_version { };enum bcm_usb_phy_reg { -PLL_NDIV_FRAC , -PLL_NDIV_INT ,PLL_CTRL ,PHY_CTRL ,PHY_PLL_CTRL ,
@@ -31,18 +29,11 @@ static const u8 bcm_usb_combo_phy_ss[] = { };static const u8 bcm_usb_combo_phy_hs[] = { - [PLL_NDIV_FRAC ] =0x04 , - [PLL_NDIV_INT ] =0x08 , [PLL_CTRL ] =0x0c , [PHY_CTRL ] =0x10 , }; -#define HSPLL_NDIV_INT_VAL 0x13 -#define HSPLL_NDIV_FRAC_VAL 0x1005 -static const u8 bcm_usb_hs_phy[] = { - [PLL_NDIV_FRAC ] =0x0 , - [PLL_NDIV_INT ] =0x4 , [PLL_CTRL ] =0x8 , [PHY_CTRL ] =0xc , };
@@ -52,7 +43,6 @@ enum pll_ctrl_bits {SSPLL_SUSPEND_EN ,PLL_SEQ_START , PLL_LOCK, - PLL_PDIV, }; static const u8 u3pll_ctrl[] = {
@@ -66,29 +56,17 @@ static const u8 u3pll_ctrl[] = {#define HSPLL_PDIV_VAL 0x1static const u8 u2pll_ctrl[] = { - [PLL_PDIV ] =1 , [PLL_RESETB ] =5 , [PLL_LOCK ] =6 , };enum bcm_usb_phy_ctrl_bits {CORERDY , -AFE_LDO_PWRDWNB , -AFE_PLL_PWRDWNB , -AFE_BG_PWRDWNB , -PHY_ISO ,PHY_RESETB ,PHY_PCTL , };#define PHY_PCTL_MASK 0xffff -/* -* 0x0806 of PCTL_VAL has below bits set -* BIT-8 : refclk divider 1 -* BIT-3:2: device mode; mode is not effect -* BIT-1: soft reset active low -*/ -#define HSPHY_PCTL_VAL 0x0806#define SSPHY_PCTL_VAL 0x0006static const u8 u3phy_ctrl[] = {
@@ -98,10 +76,6 @@ static const u8 u3phy_ctrl[] = {static const u8 u2phy_ctrl[] = { [CORERDY ] =0 , - [AFE_LDO_PWRDWNB ] =1 , - [AFE_PLL_PWRDWNB ] =2 , - [AFE_BG_PWRDWNB ] =3 , - [PHY_ISO ] =4 , [PHY_RESETB ] =5 , [PHY_PCTL ] =6 , };
@@ -186,38 +160,13 @@ static int bcm_usb_hs_phy_init(struct bcm_usb_phy_cfg *phy_cfg)int ret =0 ;void __iomem *regs = phy_cfg->regs;const u8 *offset; -u32 rd_data; offset = phy_cfg->offset; -writel (HSPLL_NDIV_INT_VAL , regs + offset[PLL_NDIV_INT ]); -writel (HSPLL_NDIV_FRAC_VAL , regs + offset[PLL_NDIV_FRAC ]); - - rd_data =readl (regs + offset[PLL_CTRL ]); - rd_data &= ~(HSPLL_PDIV_MASK << u2pll_ctrl[PLL_PDIV ]); - rd_data |= (HSPLL_PDIV_VAL << u2pll_ctrl[PLL_PDIV ]); -writel (rd_data, regs + offset[PLL_CTRL ]); - -/* Set Core Ready high */ -bcm_usb_reg32_setbits (regs + offset[PHY_CTRL ], -BIT (u2phy_ctrl[CORERDY ])); - -/* Maximum timeout for Core Ready done */ -msleep (30 ); - +bcm_usb_reg32_clrbits (regs + offset[PLL_CTRL ], +BIT (u2pll_ctrl[PLL_RESETB ]));bcm_usb_reg32_setbits (regs + offset[PLL_CTRL ],BIT (u2pll_ctrl[PLL_RESETB ])); -bcm_usb_reg32_setbits (regs + offset[PHY_CTRL ], -BIT (u2phy_ctrl[PHY_RESETB ])); - - - rd_data =readl (regs + offset[PHY_CTRL ]); - rd_data &= ~(PHY_PCTL_MASK << u2phy_ctrl[PHY_PCTL ]); - rd_data |= (HSPHY_PCTL_VAL << u2phy_ctrl[PHY_PCTL ]); -writel (rd_data, regs + offset[PHY_CTRL ]); - -/* Maximum timeout for PLL reset done */ -msleep (30 ); ret =bcm_usb_pll_lock_check (regs + offset[PLL_CTRL ],BIT (u2pll_ctrl[PLL_LOCK ]));
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 156/266 drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation
In reply to Sasha LevinFrom: Roy Spliet <[email protected]>
[ Upstream commit e4337877c5d578722c0716f131fb774522013cf5 ]
When allocation for mdp5_kms fails, calling mdp5_destroy() leads to undefined behaviour, likely a nullptr exception or use-after-free troubles.
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +2 -1
@@ -1037,7 +1037,8 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)return 0 ; fail: -mdp5_destroy (pdev); +if (mdp5_kms) +mdp5_destroy (pdev);return ret; }
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 6/266 iio: pressure: bmp280: Tolerate IRQ before registering
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 97b31a6f5fb95b1ec6575b78a7240baddba34384 ]
With DEBUG_SHIRQ enabled we have a kernel crash
[ 116.482696] BUG: kernel NULL pointer dereference, address: 0000000000000000
...
[ 116.606571] Call Trace: [ 116.609023] <IRQ> [ 116.611047] complete+0x34/0x50 [ 116.614206] bmp085_eoc_irq+0x9/0x10 [bmp280]
because DEBUG_SHIRQ mechanism fires an IRQ before registration and drivers ought to be able to handle an interrupt happening before request_irq() returns.
--- drivers/iio/pressure/bmp280-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iio/pressure/bmp280-core.c +4 -1
@@ -706,7 +706,7 @@ static int bmp180_measure(struct bmp280_data *data, u8 ctrl_meas)unsigned int ctrl;if (data->use_eoc) -init_completion (&data->done); +reinit_completion (&data->done); ret =regmap_write (data->regmap,BMP280_REG_CTRL_MEAS , ctrl_meas);if (ret)
@@ -962,6 +962,9 @@ static int bmp085_fetch_eoc_irq(struct device *dev, "trying to enforce it\n"); irq_trig =IRQF_TRIGGER_RISING ; } + +init_completion (&data->done); + ret = devm_request_threaded_irq(dev, irq, bmp085_eoc_irq,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 160/266 fpga: dfl: afu: Corrected error handling levels
In reply to Sasha LevinFrom: Souptick Joarder <[email protected]>
[ Upstream commit c9d7e3da1f3c4cf5dddfc5d7ce4d76d013aba1cc ]
Corrected error handling goto sequnece. Level put_pages should be called when pinned pages >= 0 && pinned != npages. Level free_pages should be called when pinned pages < 0.
--- drivers/fpga/dfl-afu-dma-region.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/fpga/dfl-afu-dma-region.c +2 -2
@@ -61,10 +61,10 @@ static int afu_dma_pin_pages(struct dfl_feature_platform_data *pdata, region->pages);if (pinned <0 ) { ret = pinned; - goto put_pages; + goto free_pages; }else if (pinned != npages) { ret = -EFAULT ; - goto free_pages; + goto put_pages; }dev_dbg (dev,"%d pages pinned\n" , pinned);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 161/266 clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 25bdae0f1c6609ceaf55fe6700654f0be2253d8e ]
Mark the SCLK clock for Exynos5433 I2S1 device with IGNORE_UNUSED flag to match its behaviour with SCLK clock for AUD_I2S (I2S0) device until a proper fix for Exynos I2S driver is ready.
This fixes the following synchronous abort issue revealed by the probe order change caused by the commit 93d2e4322aa7 ("of: platform: Batch fwnode parsing when adding all top level devices")
Internal error: synchronous external abort: 96000210 [#1] PREEMPT SMP Modules linked in: CPU: 0 PID: 50 Comm: kworker/0:1 Not tainted 5.7.0-rc5+ #701 Hardware name: Samsung TM2E board (DT) Workqueue: events deferred_probe_work_func pstate: 60000005 (nZCv daif -PAN -UAO) pc : samsung_i2s_probe+0x768/0x8f0 lr : samsung_i2s_probe+0x688/0x8f0 ... Call trace: samsung_i2s_probe+0x768/0x8f0 platform_drv_probe+0x50/0xa8 really_probe+0x108/0x370 driver_probe_device+0x54/0xb8 __device_attach_driver+0x90/0xc0 bus_for_each_drv+0x70/0xc8 __device_attach+0xdc/0x140 device_initial_probe+0x10/0x18 bus_probe_device+0x94/0xa0 deferred_probe_work_func+0x70/0xa8 process_one_work+0x2a8/0x718 worker_thread+0x48/0x470 kthread+0x134/0x160 ret_from_fork+0x10/0x1c Code: 17ffffaf d503201f f94086c0 91003000 (88dffc00) ---[ end trace ccf721c9400ddbd6 ]---
--- drivers/clk/samsung/clk-exynos5433.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/samsung/clk-exynos5433.c +2 -1
@@ -1706,7 +1706,8 @@ static const struct samsung_gate_clock peric_gate_clks[] __initconst = {GATE (CLK_SCLK_PCM1 ,"sclk_pcm1" ,"sclk_pcm1_peric" ,ENABLE_SCLK_PERIC ,7 ,CLK_SET_RATE_PARENT ,0 ),GATE (CLK_SCLK_I2S1 ,"sclk_i2s1" ,"sclk_i2s1_peric" , -ENABLE_SCLK_PERIC ,6 ,CLK_SET_RATE_PARENT ,0 ), +ENABLE_SCLK_PERIC ,6 , +CLK_SET_RATE_PARENT |CLK_IGNORE_UNUSED ,0 ),GATE (CLK_SCLK_SPI2 ,"sclk_spi2" ,"sclk_spi2_peric" ,ENABLE_SCLK_PERIC ,5 ,CLK_SET_RATE_PARENT ,0 ), GATE(CLK_SCLK_SPI1, "sclk_spi1", "sclk_spi1_peric", ENABLE_SCLK_PERIC,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 162/266 ARM: dts: meson: Switch existing boards with RGMII PHY to "rgmii-id"
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 005231128e9e97461e81fa32421957a7664317ca ]
Let the PHY generate the RX and TX delay on the Odroid-C1 and MXIII Plus.
Previously we did not know that these boards used an RX delay. We assumed that setting the TX delay on the MAC side It turns out that these boards also require an RX delay of 2ns (verified on Odroid-C1, but the u-boot code uses the same setup on both boards). Ethernet only worked because u-boot added this RX delay on the MAC side.
The 4ns TX delay was also wrong and the result of using an unsupported RGMII TX clock divider setting. This has been fixed in the driver with commit bd6f48546b9cb7 ("net: stmmac: dwmac-meson8b: Fix the RGMII TX delay on Meson8b/8m2 SoCs").
Switch to phy-mode "rgmii-id" to let the PHY side handle all the delays, (as recommended by the Ethernet maintainers anyways) to correctly describe the need for a 2ns RX as well as 2ns TX delay on these boards. This fixes the Ethernet performance on Odroid-C1 where there was a huge amount of packet loss when transmitting data due to the incorrect TX delay.
--- arch/arm/boot/dts/meson8b-odroidc1.dts | 3 +-- arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/boot/dts/meson8b-odroidc1.dts +1 -2
@@ -202,9 +202,8 @@ ðmac { pinctrl-0 = <ð_rgmii_pins>; pinctrl-names = "default"; - phy-mode = "rgmii"; phy-handle = <ð_phy>; - amlogic,tx-delay-ns = <4>; + phy-mode = "rgmii-id"; nvmem-cells = <ðernet_mac_address>; nvmem-cell-names = "mac-address";
arch/arm/boot/dts/meson8m2-mxiii-plus.dts +1 -3
@@ -69,9 +69,7 @@ ðmac { pinctrl-names = "default"; phy-handle = <ð_phy0>; - phy-mode = "rgmii"; - - amlogic,tx-delay-ns = <4>; + phy-mode = "rgmii-id"; mdio { compatible = "snps,dwmac-mdio";
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 182/266 usb: gadget: Fix issue with config_ep_by_speed function
In reply to Sasha LevinFrom: Pawel Laszczak <[email protected]>
[ Upstream commit 5d363120aa548ba52d58907a295eee25f8207ed2 ]
This patch adds new config_ep_by_speed_and_alt function which extends the config_ep_by_speed about alt parameter.
This additional parameter allows to find proper usb_ss_ep_comp_descriptor.
Problem has appeared during testing f_tcm (BOT/UAS) driver function.
f_tcm function for SS use array of headers for both BOT/UAS alternate setting:
static struct usb_descriptor_header *uasp_ss_function_desc[] = {
(struct usb_descriptor_header *) &bot_intf_desc, (struct usb_descriptor_header *) &uasp_ss_bi_desc, (struct usb_descriptor_header *) &bot_bi_ep_comp_desc, (struct usb_descriptor_header *) &uasp_ss_bo_desc, (struct usb_descriptor_header *) &bot_bo_ep_comp_desc,
(struct usb_descriptor_header *) &uasp_intf_desc, (struct usb_descriptor_header *) &uasp_ss_bi_desc, (struct usb_descriptor_header *) &uasp_bi_ep_comp_desc, (struct usb_descriptor_header *) &uasp_bi_pipe_desc, (struct usb_descriptor_header *) &uasp_ss_bo_desc, (struct usb_descriptor_header *) &uasp_bo_ep_comp_desc, (struct usb_descriptor_header *) &uasp_bo_pipe_desc, (struct usb_descriptor_header *) &uasp_ss_status_desc, (struct usb_descriptor_header *) &uasp_status_in_ep_comp_desc, (struct usb_descriptor_header *) &uasp_status_pipe_desc, (struct usb_descriptor_header *) &uasp_ss_cmd_desc, (struct usb_descriptor_header *) &uasp_cmd_comp_desc, (struct usb_descriptor_header *) &uasp_cmd_pipe_desc, NULL,
};
The first 5 descriptors are associated with BOT alternate setting, and others are associated with UAS.
During handling UAS alternate setting f_tcm driver invokes config_ep_by_speed and this function sets incorrect companion endpoint descriptor in usb_ep object.
Instead setting ep->comp_desc to uasp_bi_ep_comp_desc function in this case set ep->comp_desc to uasp_ss_bi_desc.
This is due to the fact that it searches endpoint based on endpoint address:
for_each_ep_desc(speed_desc, d_spd) {
chosen_desc = (struct usb_endpoint_descriptor *)*d_spd;
if (chosen_desc->bEndpoitAddress == _ep->address)
goto ep_found;
}And in result it uses the descriptor from BOT alternate setting instead UAS.
Finally, it causes that controller driver during enabling endpoints detect that just enabled endpoint for bot.
--- drivers/usb/gadget/composite.c | 78 ++++++++++++++++++++++++++-------- include/linux/usb/composite.h | 3 ++ 2 files changed, 64 insertions(+), 17 deletions(-)
drivers/usb/gadget/composite.c +61 -17
@@ -96,40 +96,43 @@ function_descriptors(struct usb_function *f, }/** -* next_ep_desc() - advance to the next EP descriptor +* next_desc() - advance to the next desc_type descriptor * @t: currect pointer within descriptor array +* @desc_type: descriptor type * -* Return: next EP descriptor or NULL +* Return: next desc_type descriptor or NULL * -* Iterate over @t until either EP descriptor found or +* Iterate over @t until either desc_type descriptor found or * NULL (that indicates end of list) encountered */ static struct usb_descriptor_header ** -next_ep_desc (struct usb_descriptor_header **t) +next_desc (struct usb_descriptor_header **t,u8 desc_type) {for (; *t; t++) { -if ((*t)->bDescriptorType ==USB_DT_ENDPOINT ) +if ((*t)->bDescriptorType == desc_type)return t; }return NULL ; }/* -* for_each_ep_desc()- iterate over endpoint descriptors in the -* descriptors list -* @start: pointer within descriptor array. -* @ep_desc: endpoint descriptor to use as the loop cursor +* for_each_desc() - iterate over desc_type descriptors in the +* descriptors list +* @start: pointer within descriptor array. +* @iter_desc: desc_type descriptor to use as the loop cursor +* @desc_type: wanted descriptr type */ -#define for_each_ep_desc (start, ep_desc) \ - for (ep_desc = next_ep_desc(start); \ - ep_desc; ep_desc = next_ep_desc(ep_desc+1)) +#define for_each_desc (start, iter_desc, desc_type) \ + for (iter_desc = next_desc(start, desc_type); \ + iter_desc; iter_desc = next_desc(iter_desc + 1, desc_type))/** -* config_ep_by_speed() - configures the given endpoint +* config_ep_by_speed_and_alt() - configures the given endpoint * according to gadget speed. * @g: pointer to the gadget * @f: usb function * @_ep: the endpoint to configure +* @alt: alternate setting number * * Return: error code, 0 on success *
@@ -142,11 +145,13 @@ next_ep_desc(struct usb_descriptor_header **t)* Note: the supplied function should hold all the descriptors * for supported speeds */ -int config_ep_by_speed (struct usb_gadget *g, -struct usb_function *f, -struct usb_ep *_ep) +int config_ep_by_speed_and_alt (struct usb_gadget *g, +struct usb_function *f, +struct usb_ep *_ep, +u8 alt) {struct usb_endpoint_descriptor *chosen_desc =NULL ; +struct usb_interface_descriptor *int_desc =NULL ;struct usb_descriptor_header **speed_desc =NULL ;struct usb_ss_ep_comp_descriptor *comp_desc =NULL ;
@@ -182,8 +187,21 @@ int config_ep_by_speed(struct usb_gadget *g,default : speed_desc = f->fs_descriptors; } + +/* find correct alternate setting descriptor */ +for_each_desc (speed_desc, d_spd,USB_DT_INTERFACE ) { + int_desc = (struct usb_interface_descriptor *)*d_spd; + +if (int_desc->bAlternateSetting == alt) { + speed_desc = d_spd; + goto intf_found; + } + } +return -EIO ; + +intf_found:/* find descriptors */ -for_each_ep_desc (speed_desc, d_spd) { +for_each_desc (speed_desc, d_spd,USB_DT_ENDPOINT ) { chosen_desc = (struct usb_endpoint_descriptor *)*d_spd;if (chosen_desc->bEndpointAddress == _ep->address) goto ep_found;
@@ -237,6 +255,32 @@ int config_ep_by_speed(struct usb_gadget *g, }return 0 ; } +EXPORT_SYMBOL_GPL (config_ep_by_speed_and_alt); + +/** +* config_ep_by_speed() - configures the given endpoint +* according to gadget speed. +* @g: pointer to the gadget +* @f: usb function +* @_ep: the endpoint to configure +* +* Return: error code, 0 on success +* +* This function chooses the right descriptors for a given +* endpoint according to gadget speed and saves it in the +* endpoint desc field. If the endpoint already has a descriptor +* assigned to it - overwrites it with currently corresponding +* descriptor. The endpoint maxpacket field is updated according +* to the chosen descriptor. +* Note: the supplied function should hold all the descriptors +* for supported speeds +*/ +int config_ep_by_speed (struct usb_gadget *g, +struct usb_function *f, +struct usb_ep *_ep) +{ +return config_ep_by_speed_and_alt (g, f, _ep,0 ); +}EXPORT_SYMBOL_GPL (config_ep_by_speed);/**
include/linux/usb/composite.h +3 -0
@@ -249,6 +249,9 @@ int usb_function_activate(struct usb_function *);int usb_interface_id (struct usb_configuration *,struct usb_function *); +int config_ep_by_speed_and_alt (struct usb_gadget *g,struct usb_function *f, +struct usb_ep *_ep,u8 alt); +int config_ep_by_speed (struct usb_gadget *g,struct usb_function *f,struct usb_ep *_ep);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 31/266 usblp: poison URBs upon disconnect
In reply to Sasha LevinFrom: Oliver Neukum <[email protected]>
[ Upstream commit 296a193b06120aa6ae7cf5c0d7b5e5b55968026e ]
syzkaller reported an URB that should have been killed to be active. We do not understand it, but this should fix the issue if it is real.
--- drivers/usb/class/usblp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/class/usblp.c +4 -1
@@ -468,7 +468,8 @@ static int usblp_release(struct inode *inode, struct file *file)usb_autopm_put_interface (usblp->intf);if (!usblp->present)/* finish cleanup from disconnect */ -usblp_cleanup (usblp); +usblp_cleanup (usblp);/* any URBs must be dead */ +mutex_unlock (&usblp_mutex);return 0 ; }
@@ -1375,9 +1376,11 @@ static void usblp_disconnect(struct usb_interface *intf)usblp_unlink_urbs (usblp);mutex_unlock (&usblp->mut); +usb_poison_anchored_urbs (&usblp->urbs);if (!usblp->used)usblp_cleanup (usblp); +mutex_unlock (&usblp_mutex); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 202/266 NFSv4.1 fix rpc_call_done assignment for BIND_CONN_TO_SESSION
In reply to Sasha LevinFrom: Olga Kornievskaia <[email protected]>
[ Upstream commit 1c709b766e73e54d64b1dde1b7cfbcf25bcb15b9 ]
--- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4proc.c +1 -1
@@ -7870,7 +7870,7 @@ nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata) }static const struct rpc_call_ops nfs4_bind_one_conn_to_session_ops = { - .rpc_call_done = &nfs4_bind_one_conn_to_session_done, + .rpc_call_done = nfs4_bind_one_conn_to_session_done, };/*
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 50/266 PCI: pci-bridge-emul: Fix PCIe bit conflicts
In reply to Sasha LevinFrom: Jon Derrick <[email protected]>
[ Upstream commit c88d19181771bd189147681ef38fc1533ebeff4c ]
This patch fixes two bit conflicts in the pci-bridge-emul driver:
1. Bit 3 of Device Status (19 of Device Control) is marked as both Write-1-to-Clear and Read-Only. It should be Write-1-to-Clear. The Read-Only and Reserved bitmasks are shifted by 1 bit due to this error.
2. Bit 12 of Slot Control is marked as both Read-Write and Reserved. It should be Read-Write.
--- drivers/pci/pci-bridge-emul.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/pci-bridge-emul.c +3 -3
@@ -195,8 +195,8 @@ static const struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = {* RO, the rest is reserved */ .w1c = GENMASK(19, 16), - .ro = GENMASK(20, 19), - .rsvd = GENMASK(31, 21), + .ro = GENMASK(21, 20), + .rsvd = GENMASK(31, 22), }, [PCI_EXP_LNKCAP / 4] = {
@@ -236,7 +236,7 @@ static const struct pci_bridge_reg_behavior pcie_cap_regs_behavior[] = { PCI_EXP_SLTSTA_CC | PCI_EXP_SLTSTA_DLLSC) << 16, .ro = (PCI_EXP_SLTSTA_MRLSS |PCI_EXP_SLTSTA_PDS | PCI_EXP_SLTSTA_EIS) << 16, - .rsvd = GENMASK(15, 12) | (GENMASK(15, 9) << 16), + .rsvd = GENMASK(15, 13) | (GENMASK(15, 9) << 16), }, [PCI_EXP_RTCTL / 4] = {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 210/266 vfio/mdev: Fix reference count leak in add_mdev_supported_type
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit aa8ba13cae3134b8ef1c1b6879f66372531da738 ]
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Thus, replace kfree() by kobject_put() to fix this issue. Previous commit "b8eb718348b8" fixed a similar problem.
--- drivers/vfio/mdev/mdev_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/mdev/mdev_sysfs.c +1 -1
@@ -110,7 +110,7 @@ static struct mdev_type *add_mdev_supported_type(struct mdev_parent *parent,"%s-%s" ,dev_driver_string (parent->dev), group->name);if (ret) { -kfree (type); +kobject_put (&type->kobj);return ERR_PTR (ret); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 219/266 ovl: verify permissions in ovl_path_open()
In reply to Sasha LevinFrom: Miklos Szeredi <[email protected]>
[ Upstream commit 56230d956739b9cb1cbde439d76227d77979a04d ]
Check permission before opening a real file.
ovl_path_open() is used by readdir and copy-up routines.
ovl_permission() theoretically already checked copy up permissions, but it doesn't hurt to re-do these checks during the actual copy-up.
For directory reading ovl_permission() only checks access to topmost underlying layer. Readdir on a merged directory accesses layers below the topmost one as well. Permission wasn't checked for these layers.
Note: modifying ovl_permission() to perform this check would be far more complex and hence more bug prone. The result is less precise permissions returned in access(2). If this turns out to be an issue, we can revisit this bug.
--- fs/overlayfs/util.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
fs/overlayfs/util.c +26 -1
@@ -475,7 +475,32 @@ bool ovl_is_whiteout(struct dentry *dentry)struct file *ovl_path_open (struct path *path,int flags) { -return dentry_open (path, flags |O_NOATIME ,current_cred ()); +struct inode *inode =d_inode (path->dentry); +int err, acc_mode; + +if (flags & ~(O_ACCMODE |O_LARGEFILE )) +BUG (); + +switch (flags &O_ACCMODE ) { +case O_RDONLY : + acc_mode =MAY_READ ; +break ; +case O_WRONLY : + acc_mode =MAY_WRITE ; +break ; +default : +BUG (); + } + + err =inode_permission (inode, acc_mode |MAY_OPEN ); +if (err) +return ERR_PTR (err); + +/* O_NOATIME is an optimization, don't fail if not permitted */ +if (inode_owner_or_capable (inode)) + flags |=O_NOATIME ; + +return dentry_open (path, flags,current_cred ()); }/* Caller should hold ovl_inode->lock */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 221/266 scsi: ufs: Don't update urgent bkops level when toggling auto bkops
In reply to Sasha LevinFrom: Can Guo <[email protected]>
[ Upstream commit be32acff43800c87dc5c707f5d47cc607b76b653 ]
Urgent bkops level is used to compare against actual bkops status read from UFS device. Urgent bkops level is set during initialization and might be updated in exception event handler during runtime. But it should not be updated to the actual bkops status every time when auto bkops is toggled. Otherwise, if urgent bkops level is updated to 0, auto bkops shall always be kept enabled.
--- drivers/scsi/ufs/ufshcd.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +0 -1
@@ -5101,7 +5101,6 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba, err =ufshcd_enable_auto_bkops (hba); else err =ufshcd_disable_auto_bkops (hba); - hba->urgent_bkops_lvl = curr_status; out:return err; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 226/266 drm/amd/display: Revalidate bandwidth before commiting DC updates
In reply to Sasha LevinFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit a24eaa5c51255b344d5a321f1eeb3205f2775498 ]
[Why]
Whenever we switch between tiled formats without also switching pixel formats or doing anything else that recreates the DC plane state we can run into underflow or hangs since we're not updating the DML parameters before committing to the hardware.
[How]
If the update type is FULL then call validate_bandwidth again to update the DML parmeters before committing the state.
This is basically just a workaround and protective measure against update types being added DC where we could run into this issue in the future.
We can only fully validate the state in advance before applying it to the hardware if we recreate all the plane and stream states since we can't modify what's currently in use.
The next step is to update DM to ensure that we're creating the plane and stream states for whatever could potentially be a full update in DC to pre-emptively recreate the state for DC global validation.
The workaround can stay until this has been fixed in DM.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +6 -0
@@ -2230,6 +2230,12 @@ void dc_commit_updates_for_stream(struct dc *dc,copy_stream_update_to_stream (dc, context, stream, stream_update); +if (!dc->res_pool->funcs->validate_bandwidth (dc, context, false)) { +DC_ERROR ("Mode validation failed for stream update!\n" ); +dc_release_state (context); +return ; + } + commit_planes_for_stream( dc, srf_updates,
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 233/266 blktrace: fix endianness in get_pdu_int()
In reply to Sasha LevinFrom: Chaitanya Kulkarni <[email protected]>
[ Upstream commit 71df3fd82e7cccec7b749a8607a4662d9f7febdd ]
In function get_pdu_len() replace variable type from __u64 to __be64. This fixes sparse warning.
--- kernel/trace/blktrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/blktrace.c +1 -1
@@ -1262,7 +1262,7 @@ static inline __u16 t_error(const struct trace_entry *ent)static __u64 get_pdu_int (const struct trace_entry *ent,bool has_cg) { -const __u64 *val =pdu_start (ent, has_cg); +const __be64 *val =pdu_start (ent, has_cg);return be64_to_cpu (*val); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 237/266 ntb_perf: pass correct struct device to dma_alloc_coherent
In reply to Sasha LevinFrom: Sanjay R Mehta <[email protected]>
[ Upstream commit 98f4e140264eeb52f22ff05be6b6dd48237255ac ]
Currently, ntb->dev is passed to dma_alloc_coherent and dma_free_coherent calls. The returned dma_addr_t is the CPU physical address. This works fine as long as IOMMU is disabled. But when IOMMU is enabled, we need to make sure that IOVA is returned for dma_addr_t. So the correct way to achieve this is by changing the first parameter of dma_alloc_coherent() as ntb->pdev->dev instead.
--- drivers/ntb/test/ntb_perf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/ntb/test/ntb_perf.c +4 -4
@@ -556,7 +556,7 @@ static void perf_free_inbuf(struct perf_peer *peer)return ; (void )ntb_mw_clear_trans (peer->perf->ntb, peer->pidx, peer->gidx); -dma_free_coherent (&peer->perf->ntb->dev, peer->inbuf_size, +dma_free_coherent (&peer->perf->ntb->pdev->dev, peer->inbuf_size, peer->inbuf, peer->inbuf_xlat); peer->inbuf =NULL ; }
@@ -585,8 +585,9 @@ static int perf_setup_inbuf(struct perf_peer *peer)perf_free_inbuf (peer); - peer->inbuf =dma_alloc_coherent (&perf->ntb->dev, peer->inbuf_size, - &peer->inbuf_xlat,GFP_KERNEL ); + peer->inbuf =dma_alloc_coherent (&perf->ntb->pdev->dev, + peer->inbuf_size, &peer->inbuf_xlat, +GFP_KERNEL );if (!peer->inbuf) {dev_err (&perf->ntb->dev,"Failed to alloc inbuf of %pa\n" , &peer->inbuf_size);
@@ -1517,4 +1518,3 @@ static void __exit perf_exit(void)destroy_workqueue (perf_wq); }module_exit (perf_exit); -
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 238/266 ntb_tool: pass correct struct device to dma_alloc_coherent
In reply to Sasha LevinFrom: Sanjay R Mehta <[email protected]>
[ Upstream commit 433efe720674efd9fdbcef78be75793393cf05db ]
Currently, ntb->dev is passed to dma_alloc_coherent and dma_free_coherent calls. The returned dma_addr_t is the CPU physical address. This works fine as long as IOMMU is disabled. But when IOMMU is enabled, we need to make sure that IOVA is returned for dma_addr_t. So the correct way to achieve this is by changing the first parameter of dma_alloc_coherent() as ntb->pdev->dev instead.
--- drivers/ntb/test/ntb_tool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/ntb/test/ntb_tool.c +3 -3
@@ -590,7 +590,7 @@ static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx, inmw->size =min_t (resource_size_t, req_size, size); inmw->size =round_up (inmw->size, addr_align); inmw->size =round_up (inmw->size, size_align); - inmw->mm_base =dma_alloc_coherent (&tc->ntb->dev, inmw->size, + inmw->mm_base =dma_alloc_coherent (&tc->ntb->pdev->dev, inmw->size, &inmw->dma_base,GFP_KERNEL );if (!inmw->mm_base)return -ENOMEM ;
@@ -612,7 +612,7 @@ static int tool_setup_mw(struct tool_ctx *tc, int pidx, int widx,return 0 ; err_free_dma: -dma_free_coherent (&tc->ntb->dev, inmw->size, inmw->mm_base, +dma_free_coherent (&tc->ntb->pdev->dev, inmw->size, inmw->mm_base, inmw->dma_base); inmw->mm_base =NULL ; inmw->dma_base =0 ;
@@ -629,7 +629,7 @@ static void tool_free_mw(struct tool_ctx *tc, int pidx, int widx)if (inmw->mm_base !=NULL ) {ntb_mw_clear_trans (tc->ntb, pidx, widx); -dma_free_coherent (&tc->ntb->dev, inmw->size, +dma_free_coherent (&tc->ntb->pdev->dev, inmw->size, inmw->mm_base, inmw->dma_base); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 239/266 NTB: ntb_tool: reading the link file should not end in a NULL byte
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit 912e12813dd03c602e4922fc34709ec4d4380cf0 ]
When running ntb_test this warning is issued:
./ntb_test.sh: line 200: warning: command substitution: ignored null byte in input
This is caused by the kernel returning one more byte than is necessary when reading the link file.
Reduce the number of bytes read back to 2 as it was before the commit that regressed this.
--- drivers/ntb/test/ntb_tool.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/ntb/test/ntb_tool.c +1 -2
@@ -504,7 +504,7 @@ static ssize_t tool_peer_link_read(struct file *filep, char __user *ubuf, buf[1 ] ='\n' ; buf[2 ] ='\0' ; -return simple_read_from_buffer (ubuf, size, offp, buf,3 ); +return simple_read_from_buffer (ubuf, size, offp, buf,2 ); } static TOOL_FOPS_RDWR(tool_peer_link_fops,
@@ -1690,4 +1690,3 @@ static void __exit tool_exit(void)debugfs_remove_recursive (tool_dbgfs_topdir); }module_exit (tool_exit); -
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 240/266 NTB: Revert the change to use the NTB device dev for DMA allocations
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit 40da7d9a93c8941737ef4a1208d32c13ce017fe1 ]
Commit 417cf39cfea9 ("NTB: Set dma mask and dma coherent mask to NTB devices") started using the NTB device for DMA allocations which was turns out was wrong. If the IOMMU is enabled, such alloctanions will always fail with messages such as:
DMAR: Allocating domain for 0000:02:00.1 failed
This is because the IOMMU has not setup the device for such use.
Change the tools back to using the PCI device for allocations seeing it doesn't make sense to add an IOMMU group for the non-physical NTB device. Also remove the code that sets the DMA mask as it no longer makes sense to do this.
--- drivers/ntb/core.c | 1 - 1 file changed, 1 deletion(-)
drivers/ntb/core.c +0 -1
@@ -311,4 +311,3 @@ static void __exit ntb_driver_exit(void)bus_unregister (&ntb_bus); }module_exit (ntb_driver_exit); -
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 241/266 NTB: perf: Don't require one more memory window than number of peers
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit a9c4211ac918ade1522aced6b5acfbe824722f7d ]
ntb_perf should not require more than one memory window per peer. This was probably an off-by-one error.
--- drivers/ntb/test/ntb_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/test/ntb_perf.c +1 -1
@@ -653,7 +653,7 @@ static int perf_init_service(struct perf_ctx *perf) {u64 mask; -if (ntb_peer_mw_count (perf->ntb) < perf->pcnt +1 ) { +if (ntb_peer_mw_count (perf->ntb) < perf->pcnt) {dev_err (&perf->ntb->dev,"Not enough memory windows\n" );return -EINVAL ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 242/266 NTB: perf: Fix support for hardware that doesn't have port numbers
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit b54369a248c2e033bfcf5d6917e08cf9d73d54a6 ]
Legacy drivers do not have port numbers (but is reliably only two ports) and was broken by the recent commit that added mult-port support to ntb_perf. This is especially important to support the cross link topology which is perfectly symmetric and cannot assign unique port numbers easily.
Hardware that returns zero for both the local port and the peer should just always use gidx=0 for the only peer.
--- drivers/ntb/test/ntb_perf.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/ntb/test/ntb_perf.c +10 -0
@@ -1423,6 +1423,16 @@ static int perf_init_peers(struct perf_ctx *perf)if (perf->gidx ==-1 ) perf->gidx = pidx; +/* +* Hardware with only two ports may not have unique port +* numbers. In this case, the gidxs should all be zero. +*/ +if (perf->pcnt ==1 &&ntb_port_number (perf->ntb) ==0 && +ntb_peer_port_number (perf->ntb,0 ) ==0 ) { + perf->gidx =0 ; + perf->peers[0 ].gidx =0 ; + } +for (pidx =0 ; pidx < perf->pcnt; pidx++) { ret =perf_setup_peer_mw (&perf->peers[pidx]);if (ret)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 243/266 NTB: perf: Fix race condition when run with ntb_test
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit 34d8673a01b053b6231a995a4eec9341163d63be ]
When running ntb_test, the script tries to run the ntb_perf test immediately after probing the modules. Since adding multi-port support, this fails seeing the new initialization procedure in ntb_perf can not complete instantly.
To fix this we add a completion which is waited on when a test is started. In this way, run can be written any time after the module is loaded and it will wait for the initialization to complete instead of sending an error.
--- drivers/ntb/test/ntb_perf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/ntb/test/ntb_perf.c +8 -2
@@ -158,6 +158,8 @@ struct perf_peer {/* NTB connection setup service */ struct work_struct service;unsigned long sts; + +struct completion init_comp; };#define to_peer_service (__work) \ container_of(__work, struct perf_peer, service)
@@ -546,6 +548,7 @@ static int perf_setup_outbuf(struct perf_peer *peer)/* Initialization is finally done */ set_bit (PERF_STS_DONE , &peer->sts); +complete_all (&peer->init_comp);return 0 ; }
@@ -637,6 +640,7 @@ static void perf_service_work(struct work_struct *work)perf_setup_outbuf (peer);if (test_and_clear_bit (PERF_CMD_CLEAR , &peer->sts)) { +init_completion (&peer->init_comp);clear_bit (PERF_STS_DONE , &peer->sts);if (test_bit (0 , &peer->perf->busy_flag) && peer == peer->perf->test_peer) {
@@ -1052,8 +1056,9 @@ static int perf_submit_test(struct perf_peer *peer)struct perf_thread *pthr;int tidx, ret; -if (!test_bit (PERF_STS_DONE , &peer->sts)) -return -ENOLINK ; + ret =wait_for_completion_interruptible (&peer->init_comp); +if (ret <0 ) +return ret;if (test_and_set_bit_lock (0 , &perf->busy_flag))return -EBUSY ;
@@ -1419,6 +1424,7 @@ static int perf_init_peers(struct perf_ctx *perf) peer->gidx = pidx; }INIT_WORK (&peer->service, perf_service_work); +init_completion (&peer->init_comp); }if (perf->gidx ==-1 ) perf->gidx = pidx;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 244/266 NTB: ntb_test: Fix bug when counting remote files
In reply to Sasha LevinFrom: Logan Gunthorpe <[email protected]>
[ Upstream commit 2130c0ba69d69bb21f5c52787f2587db00d13d8a ]
When remote files are counted in get_files_count, without using SSH, the code returns 0 because there is a colon prepended to $LOC. $VPATH should have been used instead of $LOC.
--- tools/testing/selftests/ntb/ntb_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ntb/ntb_test.sh +1 -1
@@ -241,7 +241,7 @@ function get_files_count() split_remote $LOC if [[ "$REMOTE" == "" ]]; then - echo $(ls -1 "$LOC"/${NAME}* 2>/dev/null | wc -l) + echo $(ls -1 "$VPATH"/${NAME}* 2>/dev/null | wc -l) else echo $(ssh "$REMOTE" "ls -1 \"$VPATH\"/${NAME}* | \ wc -l" 2> /dev/null)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 86/266 staging: rtl8712: fix multiline derefernce warnings
In reply to Sasha LevinFrom: Aiman Najjar <[email protected]>
[ Upstream commit 269da10b1477c31c660288633c8d613e421b131f ]
This patch fixes remaining checkpatch warnings
in rtl871x_xmit.c:
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->PrivacyKeyIndex' 636: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:636:
+ (u8)psecuritypriv->
+ PrivacyKeyIndex);
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 643: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:643:
+ (u8)psecuritypriv->
+ XGrpKeyid);
WARNING: Avoid multiple line dereference - prefer 'psecuritypriv->XGrpKeyid' 652: FILE: drivers/staging//rtl8712/rtl871x_xmit.c:652:
+ (u8)psecuritypriv->
+ XGrpKeyid);
--- drivers/staging/rtl8712/rtl871x_xmit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/staging/rtl8712/rtl871x_xmit.c +4 -7
@@ -590,7 +590,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,addr_t addr;u8 *pframe, *mem_start, *ptxdesc;struct sta_info *psta; -struct security_priv *psecuritypriv = &padapter->securitypriv; +struct security_priv *psecpriv = &padapter->securitypriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct pkt_attrib *pattrib = &pxmitframe->attrib;
@@ -633,15 +633,13 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,case _WEP40_:case _WEP104_:WEP_IV (pattrib->iv, psta->txpn, - (u8 )psecuritypriv-> - PrivacyKeyIndex); + (u8 )psecpriv->PrivacyKeyIndex);break ;case _TKIP_:if (bmcst)TKIP_IV (pattrib->iv, psta->txpn, - (u8 )psecuritypriv-> - XGrpKeyid); + (u8 )psecpriv->XGrpKeyid);else TKIP_IV (pattrib->iv, psta->txpn,0 );
@@ -649,8 +647,7 @@ sint r8712_xmitframe_coalesce(struct _adapter *padapter, _pkt *pkt,case _AES_:if (bmcst)AES_IV (pattrib->iv, psta->txpn, - (u8 )psecuritypriv-> - XGrpKeyid); + (u8 )psecpriv->XGrpKeyid);else AES_IV (pattrib->iv, psta->txpn,0 );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 246/266 drivers/perf: hisi: Fix wrong value for all counters enable
In reply to Sasha LevinFrom: Shaokun Zhang <[email protected]>
[ Upstream commit 961abd78adcb4c72c343fcd9f9dc5e2ebbe9b448 ]
In L3C uncore PMU drivers, bit16 is used to control all counters enable & disable. Wrong value is given in the driver and its default value is 1'b1, it can work because each PMU counter has its own control bits too. Let's fix the wrong value.
--- drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c +1 -1
@@ -35,7 +35,7 @@/* L3C has 8-counters */ #define L3C_NR_COUNTERS 0x8 -#define L3C_PERF_CTRL_EN 0x20000 +#define L3C_PERF_CTRL_EN 0x10000#define L3C_EVTYPE_NONE 0xff/*
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 88/266 scsi: qedi: Do not flush offload work if ARP not resolved
In reply to Sasha LevinFrom: Nilesh Javali <[email protected]>
[ Upstream commit 927527aea0e2a9c1d336c7d33f77f1911481d008 ]
For an unreachable target, offload_work is not initialized and the endpoint state is set to OFLDCONN_NONE. This results in a WARN_ON due to the check of the work function field being set to zero.
------------[ cut here ]------------
WARNING: CPU: 24 PID: 18587 at ../kernel/workqueue.c:3037 __flush_work+0x1c1/0x1d0
:
Hardware name: HPE ProLiant DL380 Gen10/ProLiant DL380 Gen10, BIOS U30 02/01/2020
RIP: 0010:__flush_work+0x1c1/0x1d0
Code: ba 6d 00 03 80 c9 f0 eb b6 48 c7 c7 20 ee 6c a4 e8 52 d3 04 00 0f 0b 31 c0 e9 d1 fe ff
ff 48 c7 c7 20 ee 6c a4 e8 3d d3 04 00 <0f> 0b 31 c0 e9 bc fe ff ff e8 11 f3 f
00 31 f6
RSP: 0018:ffffac5a8cd47a80 EFLAGS: 00010282
RAX: 0000000000000024 RBX: ffff98d68c1fcaf0 RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffff98ce9fd99898 RDI: ffff98ce9fd99898
RBP: ffff98d68c1fcbc0 R08: 00000000000006fa R09: 0000000000000001
R10: ffffac5a8cd47b50 R11: 0000000000000001 R12: 0000000000000000
R13: 000000000000489b R14: ffff98d68c1fc800 R15: ffff98d692132c00
FS: 00007f65f7f62280(0000) GS:ffff98ce9fd80000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007ffd2435e880 CR3: 0000000809334003 CR4: 00000000007606e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
PKRU: 55555554
Call Trace:
? class_create_release+0x40/0x40
? klist_put+0x2c/0x80
qedi_ep_disconnect+0xdd/0x400 [qedi]
iscsi_if_ep_disconnect.isra.20+0x59/0x70 [scsi_transport_iscsi]
iscsi_if_rx+0x129b/0x1670 [scsi_transport_iscsi]
? __netlink_lookup+0xe7/0x160
netlink_unicast+0x21d/0x300
netlink_sendmsg+0x30f/0x430
sock_sendmsg+0x5b/0x60
____sys_sendmsg+0x1e2/0x240
? copy_msghdr_from_user+0xd9/0x160
___sys_sendmsg+0x88/0xd0
? ___sys_recvmsg+0xa2/0xe0
? hrtimer_try_to_cancel+0x25/0x100
? do_nanosleep+0x9c/0x170
? __sys_sendmsg+0x5e/0xa0
__sys_sendmsg+0x5e/0xa0
do_syscall_64+0x60/0x1f0
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x7f65f6f16107
Code: 64 89 02 48 c7 c0 ff ff ff ff eb b9 0f 1f 80 00 00 00 00 8b 05 aa d2 2b 00 48 63 d2 48
63 ff 85 c0 75 18 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 59 f3 c3 0f 1f 8
0 00 00 00 00 53 48 89 f3 48
RSP: 002b:00007ffd24367ca8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
RAX: ffffffffffffffda RBX: 000055a7aeaaf110 RCX: 00007f65f6f16107
RDX: 0000000000000000 RSI: 00007ffd24367cc0 RDI: 0000000000000003
RBP: 0000000000000070 R08: 0000000000000000 R09: 0000000000000000
R10: 000000000000075c R11: 0000000000000246 R12: 00007ffd24367cc0
R13: 000055a7ae560008 R14: 00007ffd24367db0 R15: 0000000000000000
---[ end trace 54f499c05d41f8bb ]---Only flush if the connection endpoint state if different from OFLDCONN_NONE.
[mkp: clarified commit desc]
--- drivers/scsi/qedi/qedi_iscsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qedi/qedi_iscsi.c +2 -1
@@ -997,7 +997,8 @@ static void qedi_ep_disconnect(struct iscsi_endpoint *ep)if (qedi_ep->state ==EP_STATE_OFLDCONN_START ) goto ep_exit_recover; -flush_work (&qedi_ep->offload_work); +if (qedi_ep->state !=EP_STATE_OFLDCONN_NONE ) +flush_work (&qedi_ep->offload_work);if (qedi_ep->conn) { qedi_conn = qedi_ep->conn;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 90/266 ARM: dts: sun8i-h2-plus-bananapi-m2-zero: Fix led polarity
In reply to Sasha LevinFrom: Vincent Stehlé <[email protected]>
[ Upstream commit 34b6826df7462c541752cf8b1de2691b26d78ae0 ]
The PWR-LED on the bananapi m2 zero board is on when gpio PL10 is low. This has been verified on a board and in the schematics [1].
[1]: http://wiki.banana-pi.org/Banana_Pi_BPI-M2_ZERO#Documents
--- arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts +1 -1
@@ -31,7 +31,7 @@ leds { pwr_led { label = "bananapi-m2-zero:red:pwr"; - gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ + gpios = <&r_pio 0 10 GPIO_ACTIVE_LOW>; /* PL10 */ default-state = "on"; }; };
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 92/266 gpio: dwapb: Append MODULE_ALIAS for platform driver
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit c58220cba2e03618659fa7d5dfae31f5ad4ae9d0 ]
The commit 3d2613c4289f
("GPIO: gpio-dwapb: Enable platform driver binding to MFD driver")
introduced a use of the platform driver but missed to add the following line to it:
MODULE_ALIAS("platform:gpio-dwapb");
Add this to get driver loaded automatically if platform device is registered.
--- drivers/gpio/gpio-dwapb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpio/gpio-dwapb.c +6 -3
@@ -49,7 +49,9 @@#define GPIO_EXT_PORTC 0x58#define GPIO_EXT_PORTD 0x5c +#define DWAPB_DRIVER_NAME "gpio-dwapb"#define DWAPB_MAX_PORTS 4 +#define GPIO_EXT_PORT_STRIDE 0x04/* register stride 32 bits */ #define GPIO_SWPORT_DR_STRIDE 0x0c/* register stride 3*32 bits */ #define GPIO_SWPORT_DDR_STRIDE 0x0c/* register stride 3*32 bits */
@@ -398,7 +400,7 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,return ; err =irq_alloc_domain_generic_chips (gpio->domain, ngpio,2 , -"gpio-dwapb" , handle_level_irq, +DWAPB_DRIVER_NAME , handle_level_irq,IRQ_NOREQUEST ,0 ,IRQ_GC_INIT_NESTED_LOCK );if (err) {
@@ -455,7 +457,7 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,*/ err =devm_request_irq (gpio->dev, pp->irq[0 ], dwapb_irq_handler_mfd, -IRQF_SHARED ,"gpio-dwapb-mfd" , gpio); +IRQF_SHARED ,DWAPB_DRIVER_NAME , gpio);if (err) {dev_err (gpio->dev,"error requesting IRQ\n" );irq_domain_remove (gpio->domain);
@@ -843,7 +845,7 @@ static SIMPLE_DEV_PM_OPS(dwapb_gpio_pm_ops, dwapb_gpio_suspend,static struct platform_driver dwapb_gpio_driver = { .driver = { - .name ="gpio-dwapb" , + .name =DWAPB_DRIVER_NAME , .pm = &dwapb_gpio_pm_ops, .of_match_table =of_match_ptr (dwapb_of_match), .acpi_match_table =ACPI_PTR (dwapb_acpi_match),
@@ -857,3 +859,4 @@ module_platform_driver(dwapb_gpio_driver);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jamie Iles" );MODULE_DESCRIPTION ("Synopsys DesignWare APB GPIO driver" ); +MODULE_ALIAS ("platform:" DWAPB_DRIVER_NAME );
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 257/266 drm/sun4i: hdmi ddc clk: Fix size of m divider
In reply to Sasha LevinFrom: Jernej Skrabec <[email protected]>
[ Upstream commit 54e1e06bcf1cf6e7ac3f86daa5f7454add24b494 ]
m divider in DDC clock register is 4 bits wide. Fix that.
--- drivers/gpu/drm/sun4i/sun4i_hdmi.h | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/sun4i/sun4i_hdmi.h +1 -1
@@ -148,7 +148,7 @@#define SUN4I_HDMI_DDC_CMD_IMPLICIT_WRITE 3#define SUN4I_HDMI_DDC_CLK_REG 0x528 -#define SUN4I_HDMI_DDC_CLK_M (m) (((m) & 0x7) << 3) +#define SUN4I_HDMI_DDC_CLK_M (m) (((m) & 0xf) << 3)#define SUN4I_HDMI_DDC_CLK_N (n) ((n) & 0x7)#define SUN4I_HDMI_DDC_LINE_CTRL_REG 0x540
drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c +1 -1
@@ -33,7 +33,7 @@ static unsigned long sun4i_ddc_calc_divider(unsigned long rate,unsigned long best_rate =0 ;u8 best_m =0 , best_n =0 , _m, _n; -for (_m =0 ; _m <8 ; _m++) { +for (_m =0 ; _m <16 ; _m++) {for (_n =0 ; _n <8 ; _n++) {unsigned long tmp_rate;
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 248/266 f2fs: don't return vmalloc() memory from f2fs_kmalloc()
In reply to Sasha LevinFrom: Eric Biggers <[email protected]>
[ Upstream commit 0b6d4ca04a86b9dababbb76e58d33c437e127b77 ]
kmalloc() returns kmalloc'ed memory, and kvmalloc() returns either kmalloc'ed or vmalloc'ed memory. But the f2fs wrappers, f2fs_kmalloc() and f2fs_kvmalloc(), both return both kinds of memory.
It's redundant to have two functions that do the same thing, and also breaking the standard naming convention is causing bugs since people assume it's safe to kfree() memory allocated by f2fs_kmalloc(). See e.g. the various allocations in fs/f2fs/compress.c.
Fix this by making f2fs_kmalloc() just use kmalloc(). And to avoid re-introducing the allocation failures that the vmalloc fallback was intended to fix, convert the largest allocations to use f2fs_kvmalloc().
--- fs/f2fs/checkpoint.c | 4 ++-- fs/f2fs/f2fs.h | 8 +------- fs/f2fs/node.c | 8 ++++---- fs/f2fs/super.c | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-)
fs/f2fs/checkpoint.c +2 -2
@@ -892,8 +892,8 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi)int i;int err; - sbi->ckpt =f2fs_kzalloc (sbi,array_size (blk_size, cp_blks), -GFP_KERNEL ); + sbi->ckpt =f2fs_kvzalloc (sbi,array_size (blk_size, cp_blks), +GFP_KERNEL );if (!sbi->ckpt)return -ENOMEM ;/*
fs/f2fs/f2fs.h +1 -7
@@ -2789,18 +2789,12 @@ static inline bool f2fs_may_extent_tree(struct inode *inode)static inline void *f2fs_kmalloc (struct f2fs_sb_info *sbi,size_t size,gfp_t flags) { -void *ret; -if (time_to_inject (sbi,FAULT_KMALLOC )) {f2fs_show_injection_info (FAULT_KMALLOC );return NULL ; } - ret =kmalloc (size, flags); -if (ret) -return ret; - -return kvmalloc (size, flags); +return kmalloc (size, flags); } static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi,
fs/f2fs/node.c +4 -4
@@ -2933,7 +2933,7 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi)return 0 ; nm_i->nat_bits_blocks =F2FS_BLK_ALIGN ((nat_bits_bytes <<1 ) +8 ); - nm_i->nat_bits =f2fs_kzalloc (sbi, + nm_i->nat_bits =f2fs_kvzalloc (sbi, nm_i->nat_bits_blocks <<F2FS_BLKSIZE_BITS ,GFP_KERNEL );if (!nm_i->nat_bits)return -ENOMEM ;
@@ -3066,9 +3066,9 @@ static int init_free_nid_cache(struct f2fs_sb_info *sbi)int i; nm_i->free_nid_bitmap = -f2fs_kzalloc (sbi,array_size (sizeof (unsigned char *), - nm_i->nat_blocks), -GFP_KERNEL ); +f2fs_kvzalloc (sbi,array_size (sizeof (unsigned char *), + nm_i->nat_blocks), +GFP_KERNEL );if (!nm_i->free_nid_bitmap)return -ENOMEM ;
fs/f2fs/super.c +1 -1
@@ -2889,7 +2889,7 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi)if (nr_sectors & (bdev_zone_sectors (bdev) -1 ))FDEV (devi).nr_blkz++; -FDEV (devi).blkz_seq =f2fs_kzalloc (sbi, +FDEV (devi).blkz_seq =f2fs_kvzalloc (sbi,BITS_TO_LONGS (FDEV (devi).nr_blkz) *sizeof (unsigned long ),GFP_KERNEL );
Signature · 8 lines
2.25.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Sasha Levin
maintainerPATCH 258/266 libbpf: Handle GCC noreturn-turned-volatile quirk
In reply to Sasha LevinFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 32022fd97ed34f6812802bf1288db27c313576f4 ]
Handle a GCC quirk of emitting extra volatile modifier in DWARF (and subsequently preserved in BTF by pahole) for function pointers marked as __attribute__((noreturn)). This was the way to mark such functions before GCC 2.5 added noreturn attribute. Drop such func_proto modifiers, similarly to how it's done for array (also to handle GCC quirk/bug).
Such volatile attribute is emitted by GCC only, so existing selftests can't express such test. Simple repro is like this (compiled with GCC + BTF generated by pahole):
struct my_struct {
void __attribute__((noreturn)) (*fn)(int);
};
struct my_struct a;Without this fix, output will be:
struct my_struct {
voidvolatile (*fn)(int);
};With the fix:
struct my_struct {
void (*fn)(int);
};--- tools/lib/bpf/btf_dump.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-)
tools/lib/bpf/btf_dump.c +24 -9
@@ -1141,6 +1141,20 @@ static void btf_dump_emit_mods(struct btf_dump *d, struct id_stack *decl_stack) } } +static void btf_dump_drop_mods (struct btf_dump *d,struct id_stack *decl_stack) +{ +const struct btf_type *t; +__u32 id; + +while (decl_stack->cnt) { + id = decl_stack->ids[decl_stack->cnt -1 ]; + t =btf__type_by_id (d->btf, id); +if (!btf_is_mod (t)) +return ; + decl_stack->cnt--; + } +} +static void btf_dump_emit_name (const struct btf_dump *d,const char *name,bool last_was_ptr) {
@@ -1239,14 +1253,7 @@ static void btf_dump_emit_type_chain(struct btf_dump *d,* a const/volatile modifier for array, so we are * going to silently skip them here. */ -while (decls->cnt) { - next_id = decls->ids[decls->cnt -1 ]; - next_t =btf__type_by_id (d->btf, next_id); -if (btf_is_mod (next_t)) - decls->cnt--; -else -break ; - } +btf_dump_drop_mods (d, decls);if (decls->cnt ==0 ) {btf_dump_emit_name (d, fname, last_was_ptr);
@@ -1274,7 +1281,15 @@ static void btf_dump_emit_type_chain(struct btf_dump *d,__u16 vlen =btf_vlen (t);int i; -btf_dump_emit_mods (d, decls); +/* +* GCC emits extra volatile qualifier for +* __attribute__((noreturn)) function pointers. Clang +* doesn't do it. It's a GCC quirk for backwards +* compatibility with code written for GCC <2.5. So, +* similarly to extra qualifiers for array, just drop +* them, instead of handling them. +*/ +btf_dump_drop_mods (d, decls);if (decls->cnt) {btf_dump_printf (d," (" );btf_dump_emit_type_chain (d, decls, fname, lvl);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 97/266 arm64: dts: qcom: fix pm8150 gpio interrupts
In reply to Sasha LevinFrom: Jonathan Marek <[email protected]>
[ Upstream commit 61d2ca503d0b55d2849fd656ce51d8e1e9ba0b6c ]
This was mistakenly copied from the downstream dts, however the upstream driver works differently.
I only tested this with the pm8150_gpios node (used with volume button), but the 2 others should be the same.
--- arch/arm64/boot/dts/qcom/pm8150.dtsi | 14 ++------------ arch/arm64/boot/dts/qcom/pm8150b.dtsi | 14 ++------------ arch/arm64/boot/dts/qcom/pm8150l.dtsi | 14 ++------------ 3 files changed, 6 insertions(+), 36 deletions(-)
arch/arm64/boot/dts/qcom/pm8150.dtsi +2 -12
@@ -73,18 +73,8 @@ pm8150_gpios: gpio@c000 { reg = <0xc000>; gpio-controller; #gpio-cells = <2>; - interrupts = <0x0 0xc0 0x0 IRQ_TYPE_NONE>, - <0x0 0xc1 0x0 IRQ_TYPE_NONE>, - <0x0 0xc2 0x0 IRQ_TYPE_NONE>, - <0x0 0xc3 0x0 IRQ_TYPE_NONE>, - <0x0 0xc4 0x0 IRQ_TYPE_NONE>, - <0x0 0xc5 0x0 IRQ_TYPE_NONE>, - <0x0 0xc6 0x0 IRQ_TYPE_NONE>, - <0x0 0xc7 0x0 IRQ_TYPE_NONE>, - <0x0 0xc8 0x0 IRQ_TYPE_NONE>, - <0x0 0xc9 0x0 IRQ_TYPE_NONE>, - <0x0 0xca 0x0 IRQ_TYPE_NONE>, - <0x0 0xcb 0x0 IRQ_TYPE_NONE>; + interrupt-controller; + #interrupt-cells = <2>; }; };
arch/arm64/boot/dts/qcom/pm8150b.dtsi +2 -12
@@ -62,18 +62,8 @@ pm8150b_gpios: gpio@c000 { reg = <0xc000>; gpio-controller; #gpio-cells = <2>; - interrupts = <0x2 0xc0 0x0 IRQ_TYPE_NONE>, - <0x2 0xc1 0x0 IRQ_TYPE_NONE>, - <0x2 0xc2 0x0 IRQ_TYPE_NONE>, - <0x2 0xc3 0x0 IRQ_TYPE_NONE>, - <0x2 0xc4 0x0 IRQ_TYPE_NONE>, - <0x2 0xc5 0x0 IRQ_TYPE_NONE>, - <0x2 0xc6 0x0 IRQ_TYPE_NONE>, - <0x2 0xc7 0x0 IRQ_TYPE_NONE>, - <0x2 0xc8 0x0 IRQ_TYPE_NONE>, - <0x2 0xc9 0x0 IRQ_TYPE_NONE>, - <0x2 0xca 0x0 IRQ_TYPE_NONE>, - <0x2 0xcb 0x0 IRQ_TYPE_NONE>; + interrupt-controller; + #interrupt-cells = <2>; }; };
arch/arm64/boot/dts/qcom/pm8150l.dtsi +2 -12
@@ -56,18 +56,8 @@ pm8150l_gpios: gpio@c000 { reg = <0xc000>; gpio-controller; #gpio-cells = <2>; - interrupts = <0x4 0xc0 0x0 IRQ_TYPE_NONE>, - <0x4 0xc1 0x0 IRQ_TYPE_NONE>, - <0x4 0xc2 0x0 IRQ_TYPE_NONE>, - <0x4 0xc3 0x0 IRQ_TYPE_NONE>, - <0x4 0xc4 0x0 IRQ_TYPE_NONE>, - <0x4 0xc5 0x0 IRQ_TYPE_NONE>, - <0x4 0xc6 0x0 IRQ_TYPE_NONE>, - <0x4 0xc7 0x0 IRQ_TYPE_NONE>, - <0x4 0xc8 0x0 IRQ_TYPE_NONE>, - <0x4 0xc9 0x0 IRQ_TYPE_NONE>, - <0x4 0xca 0x0 IRQ_TYPE_NONE>, - <0x4 0xcb 0x0 IRQ_TYPE_NONE>; + interrupt-controller; + #interrupt-cells = <2>; }; };
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 263/266 nfs: set invalid blocks after NFSv4 writes
In reply to Sasha LevinFrom: Zheng Bin <[email protected]>
[ Upstream commit 3a39e778690500066b31fe982d18e2e394d3bce2 ]
Use the following command to test nfsv4(size of file1M is 1MB):
mount -t nfs -o vers=4.0,actimeo=60 127.0.0.1/dir1 /mnt cp file1M /mnt
du -h /mnt/file1M -->0 within 60s, then 1M
When write is done(cp file1M /mnt), will call this:nfs_writeback_done
nfs4_write_done
nfs4_write_done_cb
nfs_writeback_update_inode
nfs_post_op_update_inode_force_wcc_locked(change, ctime, mtimenfs_post_op_update_inode_force_wcc_locked
nfs_set_cache_invalid
nfs_refresh_inode_locked
nfs_update_inode
nfsd write response contains change, ctime, mtime, the flag will be clear after nfs_update_inode. Howerver, write response does not contain space_used, previous open response contains space_used whose value is 0, so inode->i_blocks is still 0.
nfs_getattr -->called by "du -h"
do_update |= force_sync || nfs_attribute_cache_expired -->false in 60s cache_validity = READ_ONCE(NFS_I(inode)->cache_validity)
do_update |= cache_validity & (NFS_INO_INVALID_ATTR -->false
if (do_update) {
__nfs_revalidate_inode
}
Within 60s, does not send getattr request to nfsd, thus "du -h /mnt/file1M" is 0.
Add a NFS_INO_INVALID_BLOCKS flag, set it when nfsv4 write is done.
--- fs/nfs/inode.c | 14 +++++++++++--- include/linux/nfs_fs.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-)
fs/nfs/inode.c +11 -3
@@ -826,6 +826,8 @@ int nfs_getattr(const struct path *path, struct kstat *stat, do_update |= cache_validity &NFS_INO_INVALID_ATIME ;if (request_mask & (STATX_CTIME |STATX_MTIME )) do_update |= cache_validity &NFS_INO_REVAL_PAGECACHE ; +if (request_mask &STATX_BLOCKS ) + do_update |= cache_validity &NFS_INO_INVALID_BLOCKS ;if (do_update) {/* Update the attribute cache */ if (!(server->flags &NFS_MOUNT_NOAC ))
@@ -1750,7 +1752,8 @@ int nfs_post_op_update_inode_force_wcc_locked(struct inode *inode, struct nfs_fa status =nfs_post_op_update_inode_locked (inode, fattr,NFS_INO_INVALID_CHANGE |NFS_INO_INVALID_CTIME - |NFS_INO_INVALID_MTIME ); + |NFS_INO_INVALID_MTIME + |NFS_INO_INVALID_BLOCKS );return status; }
@@ -1857,7 +1860,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR |NFS_INO_INVALID_ATIME |NFS_INO_REVAL_FORCED - |NFS_INO_REVAL_PAGECACHE ); + |NFS_INO_REVAL_PAGECACHE + |NFS_INO_INVALID_BLOCKS );/* Do atomic weak cache consistency updates */ nfs_wcc_update_inode (inode, fattr);
@@ -2019,8 +2023,12 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) inode->i_blocks =nfs_calc_block_size (fattr->du.nfs3.used); }else if (fattr->valid &NFS_ATTR_FATTR_BLOCKS_USED ) inode->i_blocks = fattr->du.nfs2.blocks; -else +else { + nfsi->cache_validity |= save_cache_validity & + (NFS_INO_INVALID_BLOCKS + |NFS_INO_REVAL_FORCED ); cache_revalidated = false; + }/* Update attrtimeo value if we're out of the unstable period */ if (attr_changed) {
include/linux/nfs_fs.h +1 -0
@@ -225,6 +225,7 @@ struct nfs4_copy_state {#define NFS_INO_INVALID_OTHER BIT(12)/* other attrs are invalid */ #define NFS_INO_DATA_INVAL_DEFER \ BIT(13)/* Deferred cache invalidation */ +#define NFS_INO_INVALID_BLOCKS BIT(14)/* cached blocks are invalid */ #define NFS_INO_INVALID_ATTR (NFS_INO_INVALID_CHANGE \ | NFS_INO_INVALID_CTIME \
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 98/266 firmware: qcom_scm: fix bogous abuse of dma-direct internals
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 459b1f86f1cba7de813fbc335df476c111feec22 ]
As far as the device is concerned the dma address is the physical address. There is no need to convert it to a physical address, especially not using dma-direct internals that are not available to drivers and which will interact badly with IOMMUs. Last but not least the commit introducing it claimed to just fix a type issue, but actually changed behavior.
--- drivers/firmware/qcom_scm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/firmware/qcom_scm.c +3 -6
@@ -9,7 +9,6 @@#include <linux/init.h> #include <linux/cpumask.h> #include <linux/export.h> -#include <linux/dma-direct.h> #include <linux/dma-mapping.h> #include <linux/module.h> #include <linux/types.h>
@@ -441,8 +440,7 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,struct qcom_scm_mem_map_info *mem_to_map;phys_addr_t mem_to_map_phys;phys_addr_t dest_phys; -phys_addr_t ptr_phys; -dma_addr_t ptr_dma; +dma_addr_t ptr_phys;size_t mem_to_map_sz;size_t dest_sz;size_t src_sz;
@@ -459,10 +457,9 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, ptr_sz =ALIGN (src_sz,SZ_64 ) +ALIGN (mem_to_map_sz,SZ_64 ) +ALIGN (dest_sz,SZ_64 ); - ptr =dma_alloc_coherent (__scm->dev, ptr_sz, &ptr_dma,GFP_KERNEL ); + ptr =dma_alloc_coherent (__scm->dev, ptr_sz, &ptr_phys,GFP_KERNEL );if (!ptr)return -ENOMEM ; - ptr_phys =dma_to_phys (__scm->dev, ptr_dma);/* Fill source vmid detail */ src = ptr;
@@ -490,7 +487,7 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, ret =__qcom_scm_assign_mem (__scm->dev, mem_to_map_phys, mem_to_map_sz, ptr_phys, src_sz, dest_phys, dest_sz); -dma_free_coherent (__scm->dev, ptr_sz, ptr, ptr_dma); +dma_free_coherent (__scm->dev, ptr_sz, ptr, ptr_phys);if (ret) {dev_err (__scm->dev,"Assign memory protection call failed %d\n" , ret);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 102/266 ALSA: usb-audio: Fix racy list management in output queue
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 5b6cc38f3f3f37109ce72b60bda215a5f6892c0b ]
The linked list entry from FIFO is peeked at queue_pending_output_urbs() but the actual element pop-out is performed outside the spinlock, and it's potentially racy.
Do delete the link at the right place inside the spinlock.
--- sound/usb/endpoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/usb/endpoint.c +3 -3
@@ -346,17 +346,17 @@ static void queue_pending_output_urbs(struct snd_usb_endpoint *ep) ep->next_packet_read_pos %=MAX_URBS ;/* take URB out of FIFO */ -if (!list_empty (&ep->ready_playback_urbs)) +if (!list_empty (&ep->ready_playback_urbs)) { ctx =list_first_entry (&ep->ready_playback_urbs, struct snd_urb_ctx, ready_list); +list_del_init (&ctx->ready_list); + } }spin_unlock_irqrestore (&ep->lock, flags);if (ctx ==NULL )return ; -list_del_init (&ctx->ready_list); -/* copy over the length information */ for (i =0 ; i < packet->packets; i++) ctx->packet_size[i] = packet->packet_size[i];
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 145/266 ALSA: usb-audio: Add duplex sound support for USB devices using implicit feedback
In reply to Sasha LevinFrom: Erwin Burema <[email protected]>
[ Upstream commit 10ce77e4817fef99e1166be7e6685a80c63bf77f ]
For USB sound devices using implicit feedback the endpoint used for this feedback should be able to be opened twice, once for required feedback and second time for audio data. This way these devices can be put in duplex audio mode. Since this only works if the settings of the endpoint don't change a check is included for this.
This fixes bug 207023 ("MOTU M2 regression on duplex audio") and should also fix bug 103751 ("M-Audio Fast Track Ultra usb audio device will not operate full-duplex")
--- sound/usb/card.h | 1 + sound/usb/endpoint.c | 195 ++++++++++++++++++++++++++++++++++++++++++- sound/usb/pcm.c | 5 ++ 3 files changed, 197 insertions(+), 4 deletions(-)
sound/usb/card.h +1 -0
@@ -108,6 +108,7 @@ struct snd_usb_endpoint {int iface, altsetting;int skip_packets;/* quirks for devices to ignore the first n packets in a stream */ +bool is_implicit_feedback;/* This endpoint is used as implicit feedback */ spinlock_t lock;struct list_head list;
sound/usb/endpoint.c +191 -4
213 lines not on this page · raw message
sound/usb/pcm.c +5 -0
@@ -386,6 +386,8 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,if (!subs->sync_endpoint)return -EINVAL ; + subs->sync_endpoint->is_implicit_feedback =1 ; + subs->data_endpoint->sync_master = subs->sync_endpoint;return 1 ;
@@ -484,12 +486,15 @@ static int set_sync_endpoint(struct snd_usb_substream *subs, implicit_fb ?SND_USB_ENDPOINT_TYPE_DATA : SND_USB_ENDPOINT_TYPE_SYNC); +if (!subs->sync_endpoint) {if (is_playback && attr ==USB_ENDPOINT_SYNC_NONE )return 0 ;return -EINVAL ; } + subs->sync_endpoint->is_implicit_feedback = implicit_fb; + subs->data_endpoint->sync_master = subs->sync_endpoint;return 0 ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 146/266 HID: Add quirks for Trust Panora Graphic Tablet
In reply to Sasha LevinFrom: Cristian Klein <[email protected]>
[ Upstream commit fb68ada81e65d593b51544fa43c284322107a742 ]
The Trust Panora Graphic Tablet has two interfaces. Interface zero reports pen movement, pen pressure and pen buttons. Interface one reports tablet buttons and tablet scroll. Both use the mouse protocol.
Without these quirks, libinput gets confused about what device it talks to.
For completeness, here is the usbhid-dump:
``` $ sudo usbhid-dump -d 145f:0212 003:013:001:DESCRIPTOR 1588949402.559961 05 0D 09 01 A1 01 85 07 A1 02 09 00 75 08 95 07 81 02 C0 C0 09 0E A1 01 85 05 09 23 A1 02 09 52 09 53 25 0A 75 08 95 02 B1 02 C0 C0 05 0C 09 36 A1 00 85 06 05 09 19 01 29 20 15 00 25 01 95 20 75 01 81 02 C0 003:013:000:DESCRIPTOR 1588949402.563942 05 01 09 02 A1 01 85 08 09 01 A1 00 05 09 19 01 29 03 15 00 25 01 95 03 75 01 81 02 95 05 81 01 05 01 09 30 09 31 09 38 09 00 15 81 25 7F 75 08 95 04 81 06 C0 C0 05 01 09 02 A1 01 85 09 09 01 A1 00 05 09 19 01 29 03 15 00 25 01 95 03 75 01 81 02 95 05 81 01 05 01 09 30 09 31 26 FF 7F 95 02 75 10 81 02 05 0D 09 30 26 FF 03 95 01 75 10 81 02 C0 C0 05 01 09 00 A1 01 85 04 A1 00 26 FF 00 09 00 75 08 95 07 B1 02 C0 C0 ```
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-quirks.c | 1 + 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -1147,6 +1147,9 @@#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882 0x8882#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8883 0x8883 +#define USB_VENDOR_ID_TRUST 0x145f +#define USB_DEVICE_ID_TRUST_PANORA_TABLET 0x0212 +#define USB_VENDOR_ID_TURBOX 0x062a#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201#define USB_DEVICE_ID_ASUS_MD_5110 0x5110
drivers/hid/hid-quirks.c +1 -0
@@ -168,6 +168,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8883), HID_QUIRK_NOGET }, + { HID_USB_DEVICE(USB_VENDOR_ID_TRUST, USB_DEVICE_ID_TRUST_PANORA_TABLET), HID_QUIRK_MULTI_INPUT | HID_QUIRK_HIDINPUT_FORCE }, { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_KNA5), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWA60), HID_QUIRK_MULTI_INPUT },
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 163/266 RDMA/hns: Bugfix for querying qkey
In reply to Sasha LevinFrom: Lijun Ou <[email protected]>
[ Upstream commit 349be276509455ac2f19fa4051ed773082c6a27e ]
The qkey queried through the query ud qp verb is a fixed value and it should be read from qp context.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -1
@@ -4564,7 +4564,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, qp_attr->path_mig_state =IB_MIG_ARMED ; qp_attr->ah_attr.type =RDMA_AH_ATTR_TYPE_ROCE ;if (hr_qp->ibqp.qp_type ==IB_QPT_UD ) - qp_attr->qkey =V2_QKEY_VAL ; + qp_attr->qkey =le32_to_cpu (context.qkey_xrcd); qp_attr->rq_psn = roce_get_field(context.byte_108_rx_reqepsn, V2_QPC_BYTE_108_RX_REQ_EPSN_M,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 173/266 PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port
In reply to Sasha LevinFrom: Bjorn Helgaas <[email protected]>
[ Upstream commit 7b38fd9760f51cc83d80eed2cfbde8b5ead9e93a ]
Except for Endpoints, we enable PTM at enumeration-time. Previously we did not account for the fact that Switch Downstream Ports are not permitted to have a PTM capability; their PTM behavior is controlled by the Upstream Port (PCIe r5.0, sec 7.9.16). Since Downstream Ports don't have a PTM capability, we did not mark them as "ptm_enabled", which meant that pci_enable_ptm() on an Endpoint failed because there was no PTM path to it.
Mark Downstream Ports as "ptm_enabled" if their Upstream Port has PTM enabled.
--- drivers/pci/pcie/ptm.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/pci/pcie/ptm.c +17 -5
@@ -39,10 +39,6 @@ void pci_ptm_init(struct pci_dev *dev)if (!pci_is_pcie (dev))return ; - pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_PTM ); -if (!pos) -return ; -/* * Enable PTM only on interior devices (root ports, switch ports, * etc.) on the assumption that it causes no link traffic until an
@@ -52,6 +48,23 @@ void pci_ptm_init(struct pci_dev *dev) pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END))return ; +/* +* Switch Downstream Ports are not permitted to have a PTM +* capability; their PTM behavior is controlled by the Upstream +* Port (PCIe r5.0, sec 7.9.16). +*/ + ups =pci_upstream_bridge (dev); +if (pci_pcie_type (dev) ==PCI_EXP_TYPE_DOWNSTREAM && + ups && ups->ptm_enabled) { + dev->ptm_granularity = ups->ptm_granularity; + dev->ptm_enabled =1 ; +return ; + } + + pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_PTM ); +if (!pos) +return ; +pci_read_config_dword (dev, pos +PCI_PTM_CAP , &cap); local_clock = (cap &PCI_PTM_GRANULARITY_MASK ) >>8 ;
@@ -61,7 +74,6 @@ void pci_ptm_init(struct pci_dev *dev)* the spec recommendation (PCIe r3.1, sec 7.32.3), select the * furthest upstream Time Source as the PTM Root. */ - ups =pci_upstream_bridge (dev);if (ups && ups->ptm_enabled) { ctrl =PCI_PTM_CTRL_ENABLE ;if (ups->ptm_granularity ==0 )
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 188/266 mfd: stmfx: Disable IRQ in suspend to avoid spurious interrupt
In reply to Sasha LevinFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 97eda5dcc2cde5dcc778bef7a9344db3b6bf8ef5 ]
When STMFX supply is stopped, spurious interrupt can occur. To avoid that, disable the interrupt in suspend before disabling the regulator and re-enable it at the end of resume.
--- drivers/mfd/stmfx.c | 6 ++++++ include/linux/mfd/stmfx.h | 1 + 2 files changed, 7 insertions(+)
drivers/mfd/stmfx.c +6 -0
@@ -296,6 +296,8 @@ static int stmfx_irq_init(struct i2c_client *client)if (ret) goto irq_exit; + stmfx->irq = client->irq; +return 0 ; irq_exit:
@@ -486,6 +488,8 @@ static int stmfx_suspend(struct device *dev)if (ret)return ret; +disable_irq (stmfx->irq); +if (stmfx->vdd)return regulator_disable (stmfx->vdd);
@@ -529,6 +533,8 @@ static int stmfx_resume(struct device *dev)if (ret)return ret; +enable_irq (stmfx->irq); + return 0; }#endif
include/linux/mfd/stmfx.h +1 -0
@@ -109,6 +109,7 @@ struct stmfx {struct device *dev;struct regmap *map;struct regulator *vdd; +int irq;struct irq_domain *irq_domain;struct mutex lock;/* IRQ bus lock */ u8 irq_src;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 191/266 vfio/pci: fix memory leaks of eventfd ctx
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 1518ac272e789cae8c555d69951b032a275b7602 ]
Finished a qemu-kvm (-device vfio-pci,host=0001:01:00.0) triggers a few memory leaks after a while because vfio_pci_set_ctx_trigger_single() calls eventfd_ctx_fdget() without the matching eventfd_ctx_put() later. Fix it by calling eventfd_ctx_put() for those memory in vfio_pci_release() before vfio_device_release().
unreferenced object 0xebff008981cc2b00 (size 128):
comm "qemu-kvm", pid 4043, jiffies 4294994816 (age 9796.310s) hex dump (first 32 bytes):
01 00 00 00 6b 6b 6b 6b 00 00 00 00 ad 4e ad de ....kkkk.....N.. ff ff ff ff 6b 6b 6b 6b ff ff ff ff ff ff ff ff ....kkkk........
backtrace:
[<00000000917e8f8d>] slab_post_alloc_hook+0x74/0x9c
[<00000000df0f2aa2>] kmem_cache_alloc_trace+0x2b4/0x3d4
[<000000005fcec025>] do_eventfd+0x54/0x1ac
[<0000000082791a69>] __arm64_sys_eventfd2+0x34/0x44
[<00000000b819758c>] do_el0_svc+0x128/0x1dc
[<00000000b244e810>] el0_sync_handler+0xd0/0x268
[<00000000d495ef94>] el0_sync+0x164/0x180unreferenced object 0x29ff008981cc4180 (size 128):
comm "qemu-kvm", pid 4043, jiffies 4294994818 (age 9796.290s) hex dump (first 32 bytes):
01 00 00 00 6b 6b 6b 6b 00 00 00 00 ad 4e ad de ....kkkk.....N.. ff ff ff ff 6b 6b 6b 6b ff ff ff ff ff ff ff ff ....kkkk........
backtrace:
[<00000000917e8f8d>] slab_post_alloc_hook+0x74/0x9c
[<00000000df0f2aa2>] kmem_cache_alloc_trace+0x2b4/0x3d4
[<000000005fcec025>] do_eventfd+0x54/0x1ac
[<0000000082791a69>] __arm64_sys_eventfd2+0x34/0x44
[<00000000b819758c>] do_el0_svc+0x128/0x1dc
[<00000000b244e810>] el0_sync_handler+0xd0/0x268
[<00000000d495ef94>] el0_sync+0x164/0x180--- drivers/vfio/pci/vfio_pci.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/vfio/pci/vfio_pci.c +4 -0
@@ -472,6 +472,10 @@ static void vfio_pci_release(void *device_data)if (!(--vdev->refcnt)) {vfio_spapr_pci_eeh_release (vdev->pdev);vfio_pci_disable (vdev); +if (vdev->err_trigger) +eventfd_ctx_put (vdev->err_trigger); +if (vdev->req_trigger) +eventfd_ctx_put (vdev->req_trigger); }mutex_unlock (&vdev->reflck->lock);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 193/266 clk: bcm2835: Fix return type of bcm2835_register_gate
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit f376c43bec4f8ee8d1ba5c5c4cfbd6e84fb279cb ]
bcm2835_register_gate is used as a callback for the clk_register member of bcm2835_clk_desc, which expects a struct clk_hw * return type but bcm2835_register_gate returns a struct clk *.
This discrepancy is hidden by the fact that bcm2835_register_gate is cast to the typedef bcm2835_clk_register by the _REGISTER macro. This turns out to be a control flow integrity violation, which is how this was noticed.
Change the return type of bcm2835_register_gate to be struct clk_hw * and use clk_hw_register_gate to do so. This should be a non-functional change as clk_register_gate calls clk_hw_register_gate anyways but this is needed to avoid issues with further changes.
--- drivers/clk/bcm/clk-bcm2835.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clk/bcm/clk-bcm2835.c +5 -5
@@ -1448,13 +1448,13 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,return &clock->hw; } -static struct clk *bcm2835_register_gate (struct bcm2835_cprman *cprman, +static struct clk_hw *bcm2835_register_gate (struct bcm2835_cprman *cprman,const struct bcm2835_gate_data *data) { -return clk_register_gate (cprman->dev, data->name, data->parent, -CLK_IGNORE_UNUSED |CLK_SET_RATE_GATE , - cprman->regs + data->ctl_reg, -CM_GATE_BIT ,0 , &cprman->regs_lock); +return clk_hw_register_gate (cprman->dev, data->name, data->parent, +CLK_IGNORE_UNUSED |CLK_SET_RATE_GATE , + cprman->regs + data->ctl_reg, +CM_GATE_BIT ,0 , &cprman->regs_lock); } typedef struct clk_hw *(*bcm2835_clk_register)(struct bcm2835_cprman *cprman,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 194/266 scsi: ufs-qcom: Fix scheduling while atomic issue
In reply to Sasha LevinFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 3be60b564de49875e47974c37fabced893cd0931 ]
ufs_qcom_dump_dbg_regs() uses usleep_range, a sleeping function, but can be called from atomic context in the following flow:
ufshcd_intr -> ufshcd_sl_intr -> ufshcd_check_errors -> ufshcd_print_host_regs -> ufshcd_vops_dbg_register_dump -> ufs_qcom_dump_dbg_regs
This causes a boot crash on the Lenovo Miix 630 when the interrupt is handled on the idle thread.
Fix the issue by switching to udelay().
--- drivers/scsi/ufs/ufs-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +3 -3
@@ -1546,11 +1546,11 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba)/* sleep a bit intermittently as we are dumping too much data */ ufs_qcom_print_hw_debug_reg_all (hba,NULL , ufs_qcom_dump_regs_wrapper); -usleep_range (1000 ,1100 ); +udelay (1000 );ufs_qcom_testbus_read (hba); -usleep_range (1000 ,1100 ); +udelay (1000 );ufs_qcom_print_unipro_testbus (hba); -usleep_range (1000 ,1100 ); +udelay (1000 ); }/**
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 197/266 clk: sprd: return correct type of value for _sprd_pll_recalc_rate
In reply to Sasha LevinFrom: Chunyan Zhang <[email protected]>
[ Upstream commit c2f30986d418f26abefc2eec90ebf06716c970d2 ]
The function _sprd_pll_recalc_rate() defines return value to unsigned long, but it would return a negative value when malloc fail, changing to return its parent_rate makes more sense, since if the callback .recalc_rate() is not set, the framework returns the parent_rate as well.
--- drivers/clk/sprd/pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sprd/pll.c +1 -1
@@ -105,7 +105,7 @@ static unsigned long _sprd_pll_recalc_rate(const struct sprd_pll *pll, cfg =kcalloc (regs_num,sizeof (*cfg),GFP_KERNEL );if (!cfg) -return -ENOMEM ; +return parent_rate;for (i =0 ; i < regs_num; i++) cfg[i] =sprd_pll_read (pll, i);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 204/266 PCI: Avoid FLR for AMD Starship USB 3.0
In reply to Sasha LevinFrom: Kevin Buettner <[email protected]>
[ Upstream commit 5727043c73fdfe04597971b5f3f4850d879c1f4f ]
The AMD Starship USB 3.0 host controller advertises Function Level Reset support, but it apparently doesn't work. Add a quirk to prevent use of FLR on this device.
Without this quirk, when attempting to assign (pass through) an AMD Starship USB 3.0 host controller to a guest OS, the system becomes increasingly unresponsive over the course of several minutes, eventually requiring a hard reset. Shortly after attempting to start the guest, I see these messages:
vfio-pci 0000:05:00.3: not ready 1023ms after FLR; waiting vfio-pci 0000:05:00.3: not ready 2047ms after FLR; waiting vfio-pci 0000:05:00.3: not ready 4095ms after FLR; waiting vfio-pci 0000:05:00.3: not ready 8191ms after FLR; waiting
And then eventually:
vfio-pci 0000:05:00.3: not ready 65535ms after FLR; giving up
INFO: NMI handler (perf_event_nmi_handler) took too long to run: 0.000 msecs
perf: interrupt took too long (642744 > 2500), lowering kernel.perf_event_max_sample_rate to 1000
INFO: NMI handler (perf_event_nmi_handler) took too long to run: 82.270 msecs
INFO: NMI handler (perf_event_nmi_handler) took too long to run: 680.608 msecs
INFO: NMI handler (perf_event_nmi_handler) took too long to run: 100.952 msecs
...
watchdog: BUG: soft lockup - CPU#3 stuck for 22s! [qemu-system-x86:7487]
Tested on a Micro-Star International Co., Ltd. MS-7C59/Creator TRX40 motherboard with an AMD Ryzen Threadripper 3970X.
--- drivers/pci/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/quirks.c +2 -0
@@ -5134,6 +5134,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap);* FLR may cause the following to devices to hang: * * AMD Starship/Matisse HD Audio Controller 0x1487 +* AMD Starship USB 3.0 Host Controller 0x148c * AMD Matisse USB 3.0 Host Controller 0x149c * Intel 82579LM Gigabit Ethernet Controller 0x1502 * Intel 82579V Gigabit Ethernet Controller 0x1503
@@ -5144,6 +5145,7 @@ static void quirk_no_flr(struct pci_dev *dev) dev->dev_flags |=PCI_DEV_FLAGS_NO_FLR_RESET ; }DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_AMD ,0x1487 , quirk_no_flr); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_AMD ,0x148c , quirk_no_flr);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_AMD ,0x149c , quirk_no_flr);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_INTEL ,0x1502 , quirk_no_flr);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_INTEL ,0x1503 , quirk_no_flr);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 229/266 lib/zlib: remove outdated and incorrect pre-increment optimization
In reply to Sasha LevinFrom: Jann Horn <[email protected]>
[ Upstream commit acaab7335bd6f0c0b54ce3a00bd7f18222ce0f5f ]
The zlib inflate code has an old micro-optimization based on the assumption that for pre-increment memory accesses, the compiler will generate code that fits better into the processor's pipeline than what would be generated for post-increment memory accesses.
This optimization was already removed in upstream zlib in 2016:
https://github.com/madler/zlib/commit/9aaec95e8211
This optimization causes UB according to C99, which says in section 6.5.6 "Additive operators": "If both the pointer operand and the result point to elements of the same array object, or one past the last element of the array object, the evaluation shall not produce an overflow; otherwise, the behavior is undefined".
This UB is not only a theoretical concern, but can also cause trouble for future work on compiler-based sanitizers.
According to the zlib commit, this optimization also is not optimal anymore with modern compilers.
Replace uses of OFF, PUP and UP_UNALIGNED with their definitions in the POSTINC case, and remove the macro definitions, just like in the upstream patch.
--- lib/zlib_inflate/inffast.c | 91 +++++++++++++++----------------------- 1 file changed, 35 insertions(+), 56 deletions(-)
lib/zlib_inflate/inffast.c +35 -56
@@ -10,17 +10,6 @@ #ifndef ASMINF -/* Allow machine dependent optimization for post-increment or pre-increment. - Based on testing to date, - Pre-increment preferred for: - - PowerPC G3 (Adler) - - MIPS R5000 (Randers-Pehrson) - Post-increment preferred for: - - none - No measurable difference: - - Pentium III (Anderson) - - M68060 (Nikl) - */ union uu { unsigned short us; unsigned char b[2];
@@ -38,16 +27,6 @@ get_unaligned16(const unsigned short *p)return mm.us; } -#ifdef POSTINC -# define OFF 0 -# define PUP (a) *(a)++ -# define UP_UNALIGNED (a) get_unaligned16((a)++) -#else -# define OFF 1 -# define PUP (a) *++(a) -# define UP_UNALIGNED (a) get_unaligned16(++(a)) -#endif -/* Decode literal, length, and distance codes and write out the resulting literal and match bytes until either not enough input or output is
@@ -115,9 +94,9 @@ void inflate_fast(z_streamp strm, unsigned start)/* copy state to local variables */ state = (struct inflate_state *)strm->state; - in = strm->next_in -OFF ; + in = strm->next_in; last = in + (strm->avail_in -5 ); - out = strm->next_out -OFF ; + out = strm->next_out; beg = out - (start - strm->avail_out); end = out + (strm->avail_out -257 );#ifdef INFLATE_STRICT
@@ -138,9 +117,9 @@ void inflate_fast(z_streamp strm, unsigned start)input data or output space */ do { if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; - hold += (unsigned long)(PUP(in)) << bits; + hold += (unsigned long)(*in++) << bits; bits += 8; } this = lcode[hold & lmask];
@@ -150,14 +129,14 @@ void inflate_fast(z_streamp strm, unsigned start) bits -= op; op = (unsigned )(this.op);if (op ==0 ) {/* literal */ -PUP (out) = (unsigned char )(this.val); + *out++ = (unsigned char )(this.val); }else if (op &16 ) {/* length base */ len = (unsigned )(this.val); op &=15 ;/* number of extra bits */ if (op) {if (bits < op) { - hold += (unsigned long )(PUP (in)) << bits; + hold += (unsigned long )(*in++) << bits; bits +=8 ; } len += (unsigned )hold & ((1U << op) -1 );
@@ -165,9 +144,9 @@ void inflate_fast(z_streamp strm, unsigned start) bits -= op; }if (bits <15 ) { - hold += (unsigned long )(PUP (in)) << bits; + hold += (unsigned long )(*in++) << bits; bits +=8 ; - hold += (unsigned long )(PUP (in)) << bits; + hold += (unsigned long )(*in++) << bits; bits +=8 ; } this = dcode[hold & dmask];
@@ -180,10 +159,10 @@ void inflate_fast(z_streamp strm, unsigned start) dist = (unsigned )(this.val); op &=15 ;/* number of extra bits */ if (bits < op) { - hold += (unsigned long )(PUP (in)) << bits; + hold += (unsigned long )(*in++) << bits; bits +=8 ;if (bits < op) { - hold += (unsigned long )(PUP (in)) << bits; + hold += (unsigned long )(*in++) << bits; bits +=8 ; } }
@@ -205,13 +184,13 @@ void inflate_fast(z_streamp strm, unsigned start) state->mode =BAD ;break ; } - from = window -OFF ; + from = window;if (write ==0 ) {/* very common case */ from += wsize - op;if (op < len) {/* some from window */ len -= op;do { -PUP (out) =PUP (from); + *out++ = *from++; }while (--op); from = out - dist;/* rest from output */ }
@@ -222,14 +201,14 @@ void inflate_fast(z_streamp strm, unsigned start)if (op < len) {/* some from end of window */ len -= op;do { -PUP (out) =PUP (from); + *out++ = *from++; }while (--op); - from = window -OFF ; + from = window;if (write < len) {/* some from start of window */ op = write; len -= op;do { -PUP (out) =PUP (from); + *out++ = *from++; }while (--op); from = out - dist;/* rest from output */ }
@@ -240,21 +219,21 @@ void inflate_fast(z_streamp strm, unsigned start)if (op < len) {/* some from window */ len -= op;do { -PUP (out) =PUP (from); + *out++ = *from++; }while (--op); from = out - dist;/* rest from output */ } }while (len >2 ) { -PUP (out) =PUP (from); -PUP (out) =PUP (from); -PUP (out) =PUP (from); + *out++ = *from++; + *out++ = *from++; + *out++ = *from++; len -=3 ; }if (len) { -PUP (out) =PUP (from); + *out++ = *from++;if (len >1 ) -PUP (out) =PUP (from); + *out++ = *from++; } }else {
@@ -264,29 +243,29 @@ void inflate_fast(z_streamp strm, unsigned start) from = out - dist;/* copy direct from output */ /* minimum length is three */ /* Align out addr */ -if (!((long )(out -1 +OFF ) &1 )) { -PUP (out) =PUP (from); +if (!((long )(out -1 ) &1 )) { + *out++ = *from++; len--; } - sout = (unsigned short *)(out -OFF ); + sout = (unsigned short *)(out);if (dist >2 ) {unsigned short *sfrom; - sfrom = (unsigned short *)(from -OFF ); + sfrom = (unsigned short *)(from); loops = len >>1 ; do#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS -PUP (sout) =PUP (sfrom); + *sout++ = *sfrom++;#else -PUP (sout) =UP_UNALIGNED (sfrom); + *sout++ =get_unaligned16 (sfrom++);#endif while (--loops); - out = (unsigned char *)sout +OFF ; - from = (unsigned char *)sfrom +OFF ; + out = (unsigned char *)sout; + from = (unsigned char *)sfrom; }else {/* dist == 1 or dist == 2 */ unsigned short pat16; - pat16 = *(sout-1 +OFF ); + pat16 = *(sout-1 );if (dist ==1 ) {union uu mm;/* copy one char pattern to both bytes */
@@ -296,12 +275,12 @@ void inflate_fast(z_streamp strm, unsigned start) } loops = len >>1 ;do -PUP (sout) = pat16; + *sout++ = pat16;while (--loops); - out = (unsigned char *)sout +OFF ; + out = (unsigned char *)sout; }if (len &1 ) -PUP (out) =PUP (from); + *out++ = *from++; } }else if ((op &64 ) ==0 ) {/* 2nd level distance code */
@@ -336,8 +315,8 @@ void inflate_fast(z_streamp strm, unsigned start) hold &= (1U << bits) -1 ;/* update state and return */ - strm->next_in = in +OFF ; - strm->next_out = out +OFF ; + strm->next_in = in; + strm->next_out = out; strm->avail_in = (unsigned )(in < last ?5 + (last - in) :5 - (in - last)); strm->avail_out = (unsigned )(out < end ?257 + (end - out) :257 - (out - end));
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 236/266 net: marvell: Fix OF_MDIO config check
In reply to Sasha LevinFrom: Dan Murphy <[email protected]>
[ Upstream commit 5cd119d9a05f1c1a08778a7305b4ca0f16bc1e20 ]
When CONFIG_OF_MDIO is set to be a module the code block is not compiled. Use the IS_ENABLED macro that checks for both built in as well as module.
--- drivers/net/phy/marvell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/marvell.c +1 -1
@@ -358,7 +358,7 @@ static int m88e1101_config_aneg(struct phy_device *phydev)return marvell_config_aneg (phydev); } -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED (CONFIG_OF_MDIO )/* Set and/or override some configuration registers based on the * marvell,reg-init property stored in the of_node for the phydev. *
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 251/266 ASoC: SOF: nocodec: conditionally set dpcm_capture/dpcm_playback flags
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit ba4e5abc6c4e173af7c941c03c067263b686665d ]
With additional checks on dailinks, we see errors such as
[ 3.000418] sof-nocodec sof-nocodec: CPU DAI DMIC01 Pin for rtd
NoCodec-6 does not support playback
It's not clear why we set the dpcm_playback and dpcm_capture flags unconditionally, add a check on number of channels for each direction to avoid invalid configurations.
--- sound/soc/sof/nocodec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/sof/nocodec.c +4 -2
@@ -52,8 +52,10 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].platforms->name =dev_name (dev); links[i].codecs->dai_name ="snd-soc-dummy-dai" ; links[i].codecs->name ="snd-soc-dummy" ; - links[i].dpcm_playback =1 ; - links[i].dpcm_capture =1 ; +if (ops->drv[i].playback.channels_min) + links[i].dpcm_playback =1 ; +if (ops->drv[i].capture.channels_min) + links[i].dpcm_capture =1 ; } card->dai_link = links;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 261/266 net/filter: Permit reading NET in load_bytes_relative when MAC not set
In reply to Sasha LevinFrom: YiFei Zhu <[email protected]>
[ Upstream commit 0f5d82f187e1beda3fe7295dfc500af266a5bd80 ]
Added a check in the switch case on start_header that checks for the existence of the header, and in the case that MAC is not set and the caller requests for MAC, -EFAULT. If the caller requests for NET then MAC's existence is completely ignored.
There is no function to check NET header's existence and as far as cgroup_skb/egress is concerned it should always be set.
Removed for ptr >= the start of header, considering offset is bounded unsigned and should always be true. len <= end - mac is redundant to ptr + len <= end.
--- net/core/filter.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/core/filter.c +9 -7
@@ -1766,25 +1766,27 @@ BPF_CALL_5(bpf_skb_load_bytes_relative, const struct sk_buff *, skb, u32, offset, void *, to, u32, len, u32, start_header) {u8 *end =skb_tail_pointer (skb); -u8 *net =skb_network_header (skb); -u8 *mac =skb_mac_header (skb); -u8 *ptr; +u8 *start, *ptr; -if (unlikely (offset >0xffff || len > (end - mac))) +if (unlikely (offset >0xffff )) goto err_clear;switch (start_header) {case BPF_HDR_START_MAC : - ptr = mac + offset; +if (unlikely (!skb_mac_header_was_set (skb))) + goto err_clear; + start =skb_mac_header (skb);break ;case BPF_HDR_START_NET : - ptr = net + offset; + start =skb_network_header (skb);break ;default : goto err_clear; } -if (likely (ptr >= mac && ptr + len <= end)) { + ptr = start + offset; + +if (likely (ptr + len <= end)) {memcpy (to, ptr, len);return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 262/266 nvme-pci: use simple suspend when a HMB is enabled
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit b97120b15ebd3de51325084136d3b9c3cce656d6 ]
While the NVMe specification allows the device to access the host memory buffer in host DRAM from all power states, hosts will fail access to DRAM during S3 and similar power states.
--- drivers/nvme/host/pci.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/nvme/host/pci.c +6 -0
@@ -2962,9 +2962,15 @@ static int nvme_suspend(struct device *dev)* the PCI bus layer to put it into D3 in order to take the PCIe link * down, so as to allow the platform to achieve its minimum low-power * state (which may not be possible if the link is up). +* +* If a host memory buffer is enabled, shut down the device as the NVMe +* specification allows the device to access the host memory buffer in +* host DRAM from all power states, but hosts will fail access to DRAM +* during S3. */ if (pm_suspend_via_firmware () || !ctrl->npss || !pcie_aspm_enabled (pdev) || + ndev->nr_host_mem_descs || (ndev->ctrl.quirks &NVME_QUIRK_SIMPLE_SUSPEND ))return nvme_disable_prepare_reset (ndev, true);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 5/266 ASoC: SOF: imx8: Fix randbuild error
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit fe17e6cdc0fefca96ba9659be4b2b07487cbf0c5 ]
when do randconfig like this:CONFIG_SND_SOC_SOF_IMX8_SUPPORT=yCONFIG_SND_SOC_SOF_IMX8=yCONFIG_SND_SOC_SOF_OF=yCONFIG_IMX_DSP=mCONFIG_IMX_SCU=y
there is a link error:
sound/soc/sof/imx/imx8.o: In function 'imx8_send_msg':
imx8.c:(.text+0x380): undefined reference to 'imx_dsp_ring_doorbell'
Select IMX_DSP in SND_SOC_SOF_IMX8_SUPPORT to fix this
--- sound/soc/sof/imx/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/imx/Kconfig +1 -1
@@ -14,7 +14,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL config SND_SOC_SOF_IMX8_SUPPORT bool "SOF support for i.MX8" depends on IMX_SCU - depends on IMX_DSP + select IMX_DSP help This adds support for Sound Open Firmware for NXP i.MX8 platforms Say Y if you have such a device.
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 19/266 ALSA: hda/realtek - Introduce polarity for micmute LED GPIO
In reply to Sasha LevinFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit dbd13179780555ecd3c992dea1222ca31920e892 ]
Currently mute LED and micmute LED share the same GPIO polarity.
So split the polarity for mute and micmute, in case they have different polarities.
--- sound/pci/hda/patch_realtek.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/pci/hda/patch_realtek.c +8 -6
@@ -81,6 +81,7 @@ struct alc_spec {/* mute LED for HP laptops, see alc269_fixup_mic_mute_hook() */ int mute_led_polarity; +int micmute_led_polarity;hda_nid_t mute_led_nid;hda_nid_t cap_mute_led_nid;
@@ -4080,11 +4081,9 @@ static void alc269_fixup_hp_mute_led_mic3(struct hda_codec *codec,/* update LED status via GPIO */ static void alc_update_gpio_led (struct hda_codec *codec,unsigned int mask, -bool enabled) +int polarity,bool enabled) { -struct alc_spec *spec = codec->spec; - -if (spec->mute_led_polarity) +if (polarity) enabled = !enabled;alc_update_gpio_data (codec, mask, !enabled);/* muted -> LED on */ }
@@ -4095,7 +4094,8 @@ static void alc_fixup_gpio_mute_hook(void *private_data, int enabled)struct hda_codec *codec = private_data;struct alc_spec *spec = codec->spec; -alc_update_gpio_led (codec, spec->gpio_mute_led_mask, enabled); +alc_update_gpio_led (codec, spec->gpio_mute_led_mask, + spec->mute_led_polarity, enabled); }/* turn on/off mic-mute LED via GPIO per capture hook */
@@ -4104,6 +4104,7 @@ static void alc_gpio_micmute_update(struct hda_codec *codec)struct alc_spec *spec = codec->spec;alc_update_gpio_led (codec, spec->gpio_mic_led_mask, + spec->micmute_led_polarity, spec->gen.micmute_led.led_value); }
@@ -5808,7 +5809,8 @@ static void alc280_hp_gpio4_automute_hook(struct hda_codec *codec,snd_hda_gen_hp_automute (codec, jack);/* mute_led_polarity is set to 0, so we pass inverted value here */ -alc_update_gpio_led (codec,0x10 , !spec->gen.hp_jack_present); +alc_update_gpio_led (codec,0x10 , spec->mute_led_polarity, + !spec->gen.hp_jack_present); }/* Manage GPIOs for HP EliteBook Folio 9480m.
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 20/266 ALSA: isa/wavefront: prevent out of bounds write in ioctl
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 7f0d5053c5a9d23fe5c2d337495a9d79038d267b ]
The "header->number" comes from the ioctl and it needs to be clamped to prevent out of bounds writes.
--- sound/isa/wavefront/wavefront_synth.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
sound/isa/wavefront/wavefront_synth.c +7 -1
@@ -1171,7 +1171,10 @@ wavefront_send_alias (snd_wavefront_t *dev, wavefront_patch_info *header)"alias for %d\n" , header->number, header->hdr.a.OriginalSample); - + +if (header->number >=WF_MAX_SAMPLE ) +return -EINVAL ; +munge_int32 (header->number, &alias_hdr[0 ],2 );munge_int32 (header->hdr.a.OriginalSample, &alias_hdr[2 ],2 ); munge_int32 (*((unsigned int *)&header->hdr.a.sampleStartOffset),
@@ -1202,6 +1205,9 @@ wavefront_send_multisample (snd_wavefront_t *dev, wavefront_patch_info *header)int num_samples;unsigned char *msample_hdr; +if (header->number >=WF_MAX_SAMPLE ) +return -EINVAL ; + msample_hdr =kmalloc (WF_MSAMPLE_BYTES ,GFP_KERNEL );if (! msample_hdr)return -ENOMEM ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 41/266 ASoC: SOF: Do nothing when DSP PM callbacks are not set
In reply to Sasha LevinFrom: Daniel Baluta <[email protected]>
[ Upstream commit c26fde3b15ed41f5f452f1da727795f787833287 ]
This provides a better separation between runtime and PM sleep callbacks.
Only do nothing if given runtime flag is set and calback is not set.
With the current implementation, if PM sleep callback is set but runtime callback is not set then at runtime resume we reload the firmware even if we do not support runtime resume callback.
--- sound/soc/sof/pm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
sound/soc/sof/pm.c +8 -2
@@ -266,7 +266,10 @@ static int sof_resume(struct device *dev, bool runtime_resume)int ret;/* do nothing if dsp resume callbacks are not set */ -if (!sof_ops (sdev)->resume || !sof_ops (sdev)->runtime_resume) +if (!runtime_resume && !sof_ops (sdev)->resume) +return 0 ; + +if (runtime_resume && !sof_ops (sdev)->runtime_resume)return 0 ;/* DSP was never successfully started, nothing to resume */
@@ -346,7 +349,10 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)int ret;/* do nothing if dsp suspend callback is not set */ -if (!sof_ops (sdev)->suspend) +if (!runtime_suspend && !sof_ops (sdev)->suspend) +return 0 ; + +if (runtime_suspend && !sof_ops (sdev)->runtime_suspend)return 0 ;if (sdev->fw_state !=SOF_FW_BOOT_COMPLETE )
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 67/266 ASoC: qcom: q6asm-dai: kCFI fix
In reply to Sasha LevinFrom: John Stultz <[email protected]>
[ Upstream commit a6b675a89e51a1cdad0481b809b7840d3f86e4b5 ]
Fixes the following kCFI crash seen on db845c, caused by the function prototypes not matching the callback function prototype.
[ 82.585661] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000001 [ 82.595387] Mem abort info: [ 82.599463] ESR = 0x96000005 [ 82.602658] EC = 0x25: DABT (current EL), IL = 32 bits [ 82.608177] SET = 0, FnV = 0 [ 82.611829] EA = 0, S1PTW = 0 [ 82.615369] Data abort info: [ 82.618751] ISV = 0, ISS = 0x00000005 [ 82.622641] CM = 0, WnR = 0 [ 82.625774] user pgtable: 4k pages, 39-bit VAs, pgdp=0000000174259000 [ 82.632292] [0000000000000001] pgd=0000000000000000, pud=0000000000000000 [ 82.639167] Internal error: Oops: 96000005 [#1] PREEMPT SMP [ 82.644795] Modules linked in: hci_uart btqca xhci_plat_hcd xhci_pci_renesas xhci_pci xhci_hcd wcn36xx wcnss_ctrl wcd934x vctrl_regulator ufs_qcom syscon_reboot_e [ 82.644927] qcom_apcs_ipc_mailbox q6asm_dai q6routing q6asm q6afe_dai q6adm q6afe q6core q6dsp_common pm8941_pwrkey pm8916_wdt platform_mhu pinctrl_spmi_mpp pine [ 82.812982] CPU: 3 PID: 240 Comm: kworker/u16:4 Tainted: G W 5.6.0-rc7-mainline-00960-g0c34353d11b9-dirty #1 [ 82.824201] Hardware name: Thundercomm Dragonboard 845c (DT) [ 82.829937] Workqueue: qcom_apr_rx apr_rxwq [apr] [ 82.834698] pstate: 80c00005 (Nzcv daif +PAN +UAO) [ 82.839553] pc : __cfi_check_fail+0x4/0x1c [q6asm_dai] [ 82.844754] lr : __cfi_check+0x3a8/0x3b0 [q6asm_dai] [ 82.849767] sp : ffffffc0105f3c20 [ 82.853123] x29: ffffffc0105f3c30 x28: 0000000000000020 [ 82.858489] x27: ffffff80f4588400 x26: ffffff80f458ec94 [ 82.863854] x25: ffffff80f458ece8 x24: ffffffe3670c7000 [ 82.869220] x23: ffffff8094bb7b34 x22: ffffffe367137000 [ 82.874585] x21: bd07909b332eada6 x20: 0000000000000001 [ 82.879950] x19: ffffffe36713863c x18: ffffff80f8df4430 [ 82.885316] x17: 0000000000000001 x16: ffffffe39d15e660 [ 82.890681] x15: 0000000000000001 x14: 0000000000000027 [ 82.896047] x13: 0000000000000000 x12: ffffffe39e6465a0 [ 82.901413] x11: 0000000000000051 x10: 000000000000ffff [ 82.906779] x9 : 000ffffffe366c19 x8 : c3c5f18762d1ceef [ 82.912145] x7 : 0000000000000000 x6 : ffffffc010877698 [ 82.917511] x5 : ffffffc0105f3c00 x4 : 0000000000000000 [ 82.922877] x3 : 0000000000000000 x2 : 0000000000000001 [ 82.928243] x1 : ffffffe36713863c x0 : 0000000000000001 [ 82.933610] Call trace: [ 82.936099] __cfi_check_fail+0x4/0x1c [q6asm_dai] [ 82.940955] q6asm_srvc_callback+0x22c/0x618 [q6asm] [ 82.945973] apr_rxwq+0x1a8/0x27c [apr] [ 82.949861] process_one_work+0x2e8/0x54c [ 82.953919] worker_thread+0x27c/0x4d4 [ 82.957715] kthread+0x144/0x154 [ 82.960985] ret_from_fork+0x10/0x18 [ 82.964603] Code: a8c37bfd f85f8e5e d65f03c0 b40000a0 (39400008) [ 82.970762] ---[ end trace 410accb839617143 ]--- [ 82.975429] Kernel panic - not syncing: Fatal exception
--- sound/soc/qcom/qdsp6/q6asm-dai.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/qcom/qdsp6/q6asm-dai.c +2 -2
@@ -171,7 +171,7 @@ static const struct snd_compr_codec_caps q6asm_compr_caps = { };static void event_handler (uint32_t opcode,uint32_t token, -uint32_t *payload,void *priv) +void *payload,void *priv) {struct q6asm_dai_rtd *prtd = priv;struct snd_pcm_substream *substream = prtd->substream;
@@ -494,7 +494,7 @@ static struct snd_pcm_ops q6asm_dai_ops = { };static void compress_event_handler (uint32_t opcode,uint32_t token, -uint32_t *payload,void *priv) +void *payload,void *priv) {struct q6asm_dai_rtd *prtd = priv;struct snd_compr_stream *substream = prtd->cstream;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 14/266 ARM: integrator: Add some Kconfig selections
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit d2854bbe5f5c4b4bec8061caf4f2e603d8819446 ]
The CMA and DMA_CMA Kconfig options need to be selected by the Integrator in order to produce boot console on some Integrator systems.
The REGULATOR and REGULATOR_FIXED_VOLTAGE need to be selected in order to boot the system from an external MMC card when using MMCI/PL181 from the device tree probe path.
Select these things directly from the Kconfig so we are sure to be able to bring the systems up with console from any device tree.
--- arch/arm/mach-integrator/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-integrator/Kconfig +4 -3
@@ -4,6 +4,8 @@ menuconfig ARCH_INTEGRATOR depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6 select ARM_AMBA select COMMON_CLK_VERSATILE + select CMA + select DMA_CMA select HAVE_TCM select ICST select MFD_SYSCON
@@ -35,14 +37,13 @@ config INTEGRATOR_IMPD1 select ARM_VIC select GPIO_PL061 select GPIOLIB + select REGULATOR + select REGULATOR_FIXED_VOLTAGE help The IM-PD1 is an add-on logic module for the Integrator which allows ARM(R) Ltd PrimeCells to be developed and evaluated. The IM-PD1 can be found on the Integrator/PP2 platform. - To compile this driver as a module, choose M here: the - module will be called impd1. - config INTEGRATOR_CM7TDMI bool "Integrator/CM7TDMI core module" depends on ARCH_INTEGRATOR_AP
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 15/266 ARM: dts: stm32: Add missing ethernet PHY reset on AV96
In reply to Sasha LevinFrom: Marek Vasut <[email protected]>
[ Upstream commit 010ca9fe500bfe365860b50220ff80541c18f0e1 ]
Add PHY reset GPIO on AV96 ethernet PHY.
--- arch/arm/boot/dts/stm32mp157a-avenger96.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/stm32mp157a-avenger96.dts +3 -0
@@ -91,6 +91,9 @@ mdio0 { #address-cells = <1>; #size-cells = <0>; compatible = "snps,dwmac-mdio"; + reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>; + reset-delay-us = <1000>; + phy0: ethernet-phy@7 { reg = <7>; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 106/266 slimbus: ngd: get drvdata from correct device
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit b58c663059b484f7ff547d076a34cf6d7a302e56 ]
Get drvdata directly from parent instead of ngd dev, as ngd dev can probe defer and previously set drvdata will become null.
--- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/slimbus/qcom-ngd-ctrl.c +2 -2
@@ -1354,7 +1354,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, ngd->pdev->driver_override =QCOM_SLIM_NGD_DRV_NAME ; ngd->pdev->dev.of_node = node; ctrl->ngd = ngd; -platform_set_drvdata (ngd->pdev, ctrl);platform_device_add (ngd->pdev); ngd->base = ctrl->base + ngd->id * data->offset +
@@ -1369,12 +1368,13 @@ static int of_qcom_slim_ngd_register(struct device *parent,static int qcom_slim_ngd_probe (struct platform_device *pdev) { -struct qcom_slim_ngd_ctrl *ctrl =platform_get_drvdata (pdev);struct device *dev = &pdev->dev; +struct qcom_slim_ngd_ctrl *ctrl =dev_get_drvdata (dev->parent);int ret; ctrl->ctrl.dev = dev; +platform_set_drvdata (pdev, ctrl);pm_runtime_use_autosuspend (dev);pm_runtime_set_autosuspend_delay (dev,QCOM_SLIM_NGD_AUTOSUSPEND );pm_runtime_set_suspended (dev);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 18/266 arm64: dts: meson: fixup SCP sram nodes
In reply to Sasha LevinFrom: Neil Armstrong <[email protected]>
[ Upstream commit 9ecded10b4b6af238da0c86197b0418912e7513e ]
The GX and AXG SCP sram nodes were using invalid compatible and node names for the sram entries.
Fixup the sram entries node names, and use proper compatible for them.
It notably fixes:
sram@c8000000: 'scp-shmem@0', 'scp-shmem@200' do not match any of the regexes: '^([a-z]*-)?sram(-section)?@[a-f0-9]+$', 'pinctrl-[0-9]+'
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +++--- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +3 -3
@@ -1728,18 +1728,18 @@ sd_emmc_c: mmc@7000 { }; sram: sram@fffc0000 { - compatible = "amlogic,meson-axg-sram", "mmio-sram"; + compatible = "mmio-sram"; reg = <0x0 0xfffc0000 0x0 0x20000>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x0 0xfffc0000 0x20000>; - cpu_scp_lpri: scp-shmem@13000 { + cpu_scp_lpri: scp-sram@13000 { compatible = "amlogic,meson-axg-scp-shmem"; reg = <0x13000 0x400>; }; - cpu_scp_hpri: scp-shmem@13400 { + cpu_scp_hpri: scp-sram@13400 { compatible = "amlogic,meson-axg-scp-shmem"; reg = <0x13400 0x400>; };
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +5 -5
@@ -345,20 +345,20 @@ gic: interrupt-controller@c4301000 { }; sram: sram@c8000000 { - compatible = "amlogic,meson-gx-sram", "amlogic,meson-gxbb-sram", "mmio-sram"; + compatible = "mmio-sram"; reg = <0x0 0xc8000000 0x0 0x14000>; #address-cells = <1>; #size-cells = <1>; ranges = <0 0x0 0xc8000000 0x14000>; - cpu_scp_lpri: scp-shmem@0 { - compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem"; + cpu_scp_lpri: scp-sram@0 { + compatible = "amlogic,meson-gxbb-scp-shmem"; reg = <0x13000 0x400>; }; - cpu_scp_hpri: scp-shmem@200 { - compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem"; + cpu_scp_hpri: scp-sram@200 { + compatible = "amlogic,meson-gxbb-scp-shmem"; reg = <0x13400 0x400>; }; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 114/266 soundwire: slave: don't init debugfs on device registration error
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 8893ab5e8ee5d7c12e0fc1dca4a309475064473d ]
The error handling flow seems incorrect, there is no reason to try and add debugfs support if the device registration did not succeed. Return on error.
--- drivers/soundwire/slave.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/soundwire/slave.c +2 -0
@@ -57,6 +57,8 @@ static int sdw_slave_add(struct sdw_bus *bus,list_del (&slave->node);mutex_unlock (&bus->bus_lock);put_device (&slave->dev); + +return ret; }sdw_slave_debugfs_init (slave);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 30/266 clk: samsung: Mark top ISP and CAM clocks on Exynos542x as critical
In reply to Sasha LevinFrom: Marek Szyprowski <[email protected]>
[ Upstream commit e47bd937e602bb4379546095d1bd0b9871fa60c2 ]
The TOP 'aclk*_isp', 'aclk550_cam', 'gscl_wa' and 'gscl_wb' clocks must be kept enabled all the time to allow proper access to power management control for the ISP and CAM power domains. The last two clocks, although related to GScaler device and GSCL power domain, provides also the I_WRAP_CLK signal to MIPI CSIS0/1 devices, which are a part of CAM power domain and are needed for proper power on/off sequence.
Currently there are no drivers for the devices, which are part of CAM and ISP power domains yet. This patch only fixes the race between disabling the unused power domains and disabling unused clocks, which randomly resulted in the following error during boot:
Power domain CAM disable failed
Power domain ISP disable failed
--- drivers/clk/samsung/clk-exynos5420.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/clk/samsung/clk-exynos5420.c +9 -7
@@ -540,7 +540,7 @@ static const struct samsung_div_clock exynos5800_div_clks[] __initconst = {static const struct samsung_gate_clock exynos5800_gate_clks[]__initconst = {GATE (CLK_ACLK550_CAM ,"aclk550_cam" ,"mout_user_aclk550_cam" , -GATE_BUS_TOP ,24 ,0 ,0 ), +GATE_BUS_TOP ,24 ,CLK_IS_CRITICAL ,0 ),GATE (CLK_ACLK432_SCALER ,"aclk432_scaler" ,"mout_user_aclk432_scaler" ,GATE_BUS_TOP ,27 ,CLK_IS_CRITICAL ,0 ), };
@@ -940,25 +940,25 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = {GATE (0 ,"aclk300_jpeg" ,"mout_user_aclk300_jpeg" ,GATE_BUS_TOP ,4 ,CLK_IGNORE_UNUSED ,0 ),GATE (0 ,"aclk333_432_isp0" ,"mout_user_aclk333_432_isp0" , -GATE_BUS_TOP ,5 ,0 ,0 ), +GATE_BUS_TOP ,5 ,CLK_IS_CRITICAL ,0 ),GATE (0 ,"aclk300_gscl" ,"mout_user_aclk300_gscl" ,GATE_BUS_TOP ,6 ,CLK_IS_CRITICAL ,0 ),GATE (0 ,"aclk333_432_gscl" ,"mout_user_aclk333_432_gscl" ,GATE_BUS_TOP ,7 ,CLK_IGNORE_UNUSED ,0 ),GATE (0 ,"aclk333_432_isp" ,"mout_user_aclk333_432_isp" , -GATE_BUS_TOP ,8 ,0 ,0 ), +GATE_BUS_TOP ,8 ,CLK_IS_CRITICAL ,0 ),GATE (CLK_PCLK66_GPIO ,"pclk66_gpio" ,"mout_user_pclk66_gpio" ,GATE_BUS_TOP ,9 ,CLK_IGNORE_UNUSED ,0 ),GATE (0 ,"aclk66_psgen" ,"mout_user_aclk66_psgen" ,GATE_BUS_TOP ,10 ,CLK_IGNORE_UNUSED ,0 ),GATE (0 ,"aclk266_isp" ,"mout_user_aclk266_isp" , -GATE_BUS_TOP ,13 ,0 ,0 ), +GATE_BUS_TOP ,13 ,CLK_IS_CRITICAL ,0 ),GATE (0 ,"aclk166" ,"mout_user_aclk166" ,GATE_BUS_TOP ,14 ,CLK_IGNORE_UNUSED ,0 ),GATE (CLK_ACLK333 ,"aclk333" ,"mout_user_aclk333" ,GATE_BUS_TOP ,15 ,CLK_IS_CRITICAL ,0 ),GATE (0 ,"aclk400_isp" ,"mout_user_aclk400_isp" , -GATE_BUS_TOP ,16 ,0 ,0 ), +GATE_BUS_TOP ,16 ,CLK_IS_CRITICAL ,0 ),GATE (0 ,"aclk400_mscl" ,"mout_user_aclk400_mscl" ,GATE_BUS_TOP ,17 ,CLK_IS_CRITICAL ,0 ), GATE(0, "aclk200_disp1", "mout_user_aclk200_disp1",
@@ -1158,8 +1158,10 @@ static const struct samsung_gate_clock exynos5x_gate_clks[] __initconst = { GATE_IP_GSCL1, 3, 0, 0),GATE (CLK_SMMU_FIMCL1 ,"smmu_fimcl1" ,"dout_gscl_blk_333" ,GATE_IP_GSCL1 ,4 ,0 ,0 ), -GATE (CLK_GSCL_WA ,"gscl_wa" ,"sclk_gscl_wa" ,GATE_IP_GSCL1 ,12 ,0 ,0 ), -GATE (CLK_GSCL_WB ,"gscl_wb" ,"sclk_gscl_wb" ,GATE_IP_GSCL1 ,13 ,0 ,0 ), +GATE (CLK_GSCL_WA ,"gscl_wa" ,"sclk_gscl_wa" ,GATE_IP_GSCL1 ,12 , +CLK_IS_CRITICAL ,0 ), +GATE (CLK_GSCL_WB ,"gscl_wb" ,"sclk_gscl_wb" ,GATE_IP_GSCL1 ,13 , +CLK_IS_CRITICAL ,0 ),GATE (CLK_SMMU_FIMCL3 ,"smmu_fimcl3," ,"dout_gscl_blk_333" ,GATE_IP_GSCL1 ,16 ,0 ,0 ), GATE(CLK_FIMC_LITE3, "fimc_lite3", "aclk333_432_gscl",
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 32/266 serial: 8250: Fix max baud limit in generic 8250 port
In reply to Sasha LevinFrom: Serge Semin <[email protected]>
[ Upstream commit 7b668c064ec33f3d687c3a413d05e355172e6c92 ]
Standard 8250 UART ports are designed in a way so they can communicate with baud rates up to 1/16 of a reference frequency. It's expected from most of the currently supported UART controllers. That's why the former version of serial8250_get_baud_rate() method called uart_get_baud_rate() with min and max baud rates passed as (port->uartclk / 16 / UART_DIV_MAX) and ((port->uartclk + tolerance) / 16) respectively. Doing otherwise, like it was suggested in commit ("serial: 8250_mtk: support big baud rate."), caused acceptance of bauds, which was higher than the normal UART controllers actually supported. As a result if some user-space program requested to set a baud greater than (uartclk / 16) it would have been permitted without truncation, but then serial8250_get_divisor(baud) (which calls uart_get_divisor() to get the reference clock divisor) would have returned a zero divisor. Setting zero divisor will cause an unpredictable effect varying from chip to chip. In case of DW APB UART the communications just stop.
Lets fix this problem by getting back the limitation of (uartclk + tolerance) / 16 maximum baud supported by the generic 8250 port. Mediatek 8250 UART ports driver developer shouldn't have touched it in the first place notably seeing he already provided a custom version of set_termios() callback in that glue-driver which took into account the extended baud rate values and accordingly updated the standard and vendor-specific divisor latch registers anyway.
--- drivers/tty/serial/8250/8250_port.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_port.c +3 -1
@@ -2539,6 +2539,8 @@ static unsigned int serial8250_get_baud_rate(struct uart_port *port,struct ktermios *termios, struct ktermios *old) { + unsigned int tolerance = port->uartclk / 100; +/* * Ask the core to calculate the divisor for us. * Allow 1% tolerance at the upper limit so uart clks marginally
@@ -2547,7 +2549,7 @@ static unsigned int serial8250_get_baud_rate(struct uart_port *port,*/ return uart_get_baud_rate (port, termios, old, port->uartclk /16 /UART_DIV_MAX , - port->uartclk); + (port->uartclk + tolerance) /16 ); }void
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 113/266 ASoC: max98373: reorder max98373_reset() in resume
In reply to Sasha LevinFrom: Yong Zhi <[email protected]>
[ Upstream commit 1a446873d7dd3a450f685928ce7f1907bde4583d ]
During S3 test, the following error was observed:
[ 726.174237] i2c_designware i2c_designware.0: platform_pm_resume+0x0/0x3d returned 0 after 0 usecs [ 726.184187] max98373 i2c-MX98373:00: calling max98373_resume+0x0/0x30 [snd_soc_max98373] @ 12698, parent: i2c-11 [ 726.195589] max98373 i2c-MX98373:00: Reset command failed. (ret:-16)
When calling regmap_update_bits(), since map->reg_update_bits is NULL, _regmap_read() is entered with the following logic:
if (!map->cache_bypass) {
ret = regcache_read(map, reg, val);
if (ret == 0)
return 0;
}
if (map->cache_only)
return -EBUSY;regcache_read() hits -EINVAL because MAX98373_R2000_SW_RESET is volatile, as map->cache_only is set by codec suspend, thus -EBUSY is returned. Fix by moving max98373_reset() after cache_only set to false in max98373_resume().
--- sound/soc/codecs/max98373.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/max98373.c +1 -1
@@ -850,8 +850,8 @@ static int max98373_resume(struct device *dev) {struct max98373_priv *max98373 =dev_get_drvdata (dev); -max98373_reset (max98373, dev);regcache_cache_only (max98373->regmap, false); +max98373_reset (max98373, dev);regcache_sync (max98373->regmap);return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 127/266 ALSA: firewire-lib: fix invalid assignment to union data for directional parameter
In reply to Sasha LevinFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit 8304cf77c92038cd1c50c27b69d30be695cc8003 ]
Although the value of FDF is used just for outgoing stream, the assignment to union member is done for both directions of stream. At present this causes no issue because the value of same position is reassigned later for opposite stream. However, it's better to add if statement.
--- sound/firewire/amdtp-am824.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/firewire/amdtp-am824.c +2 -1
@@ -82,7 +82,8 @@ int amdtp_am824_set_parameters(struct amdtp_stream *s, unsigned int rate,if (err <0 )return err; - s->ctx_data.rx.fdf =AMDTP_FDF_AM824 | s->sfc; +if (s->direction ==AMDTP_OUT_STREAM ) + s->ctx_data.rx.fdf =AMDTP_FDF_AM824 | s->sfc; p->pcm_channels = pcm_channels; p->midi_ports = midi_ports;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 37/266 arm64: dts: armada-3720-turris-mox: fix SFP binding
In reply to Sasha LevinFrom: Marek Behún <[email protected]>
[ Upstream commit c2671acbbbd822ef077cc168991e0a7dbe2172c9 ]
The sfp compatible should be 'sff,sfp', not 'sff,sfp+'. We used patched kernel where the latter was working.
--- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +1 -1
@@ -95,7 +95,7 @@ sdhci1_pwrseq: sdhci1-pwrseq { }; sfp: sfp { - compatible = "sff,sfp+"; + compatible = "sff,sfp"; i2c-bus = <&i2c0>; los-gpio = <&moxtet_sfp 0 GPIO_ACTIVE_HIGH>; tx-fault-gpio = <&moxtet_sfp 1 GPIO_ACTIVE_HIGH>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 38/266 arm64: dts: juno: Fix GIC child nodes
In reply to Sasha LevinFrom: Andre Przywara <[email protected]>
[ Upstream commit a78aee9e434932a500db36cc6d88daeff3745e9f ]
The GIC DT nodes for the Juno boards were not fully compliant with the DT binding, which has certain expectations about child nodes and their size and address cells values.
Use smaller #address-cells and #size-cells values, as the binding requests, and adjust the reg properties accordingly.
This requires adjusting the interrupt nexus nodes as well, as one field of the interrupt-map property depends on the GIC's address-size.
--- arch/arm64/boot/dts/arm/juno-base.dtsi | 50 +++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-)
arch/arm64/boot/dts/arm/juno-base.dtsi +25 -25
@@ -62,35 +62,35 @@ gic: interrupt-controller@2c010000 { <0x0 0x2c02f000 0 0x2000>, <0x0 0x2c04f000 0 0x2000>, <0x0 0x2c06f000 0 0x2000>; - #address-cells = <2>; + #address-cells = <1>; #interrupt-cells = <3>; - #size-cells = <2>; + #size-cells = <1>; interrupt-controller; interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(6) | IRQ_TYPE_LEVEL_HIGH)>; - ranges = <0 0 0 0x2c1c0000 0 0x40000>; + ranges = <0 0 0x2c1c0000 0x40000>; v2m_0: v2m@0 { compatible = "arm,gic-v2m-frame"; msi-controller; - reg = <0 0 0 0x10000>; + reg = <0 0x10000>; }; v2m@10000 { compatible = "arm,gic-v2m-frame"; msi-controller; - reg = <0 0x10000 0 0x10000>; + reg = <0x10000 0x10000>; }; v2m@20000 { compatible = "arm,gic-v2m-frame"; msi-controller; - reg = <0 0x20000 0 0x10000>; + reg = <0x20000 0x10000>; }; v2m@30000 { compatible = "arm,gic-v2m-frame"; msi-controller; - reg = <0 0x30000 0 0x10000>; + reg = <0x30000 0x10000>; }; };
@@ -519,10 +519,10 @@ pcie_ctlr: pcie@40000000 { <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gic 0 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gic 0 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gic 0 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map = <0 0 0 1 &gic 0 GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 2 &gic 0 GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &gic 0 GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &gic 0 GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; msi-parent = <&v2m_0>; status = "disabled"; iommu-map-mask = <0x0>; /* RC has no means to output PCI RID */
@@ -786,19 +786,19 @@ smb@8000000 { #interrupt-cells = <1>; interrupt-map-mask = <0 0 15>; - interrupt-map = <0 0 0 &gic 0 0 GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, - <0 0 1 &gic 0 0 GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, - <0 0 2 &gic 0 0 GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>, - <0 0 3 &gic 0 0 GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, - <0 0 4 &gic 0 0 GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>, - <0 0 5 &gic 0 0 GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, - <0 0 6 &gic 0 0 GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>, - <0 0 7 &gic 0 0 GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>, - <0 0 8 &gic 0 0 GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>, - <0 0 9 &gic 0 0 GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>, - <0 0 10 &gic 0 0 GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>, - <0 0 11 &gic 0 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, - <0 0 12 &gic 0 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map = <0 0 0 &gic 0 GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>, + <0 0 1 &gic 0 GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, + <0 0 2 &gic 0 GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>, + <0 0 3 &gic 0 GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, + <0 0 4 &gic 0 GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>, + <0 0 5 &gic 0 GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, + <0 0 6 &gic 0 GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>, + <0 0 7 &gic 0 GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>, + <0 0 8 &gic 0 GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>, + <0 0 9 &gic 0 GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>, + <0 0 10 &gic 0 GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>, + <0 0 11 &gic 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, + <0 0 12 &gic 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>; }; site2: tlx@60000000 {
@@ -808,6 +808,6 @@ site2: tlx@60000000 { ranges = <0 0 0x60000000 0x10000000>; #interrupt-cells = <1>; interrupt-map-mask = <0 0>; - interrupt-map = <0 0 &gic 0 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map = <0 0 &gic 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>; }; };
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 130/266 ASoC: SOF: core: fix error return code in sof_probe_continue()
In reply to Sasha LevinFrom: Wei Yongjun <[email protected]>
[ Upstream commit 7d8785bc7adbb4dc5ba8ee06994107637848ded8 ]
Fix to return negative error code -ENOMEM from the IPC init error handling case instead of 0, as done elsewhere in this function.
--- sound/soc/sof/core.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/sof/core.c +1 -0
@@ -372,6 +372,7 @@ static int sof_probe_continue(struct snd_sof_dev *sdev)/* init the IPC */ sdev->ipc =snd_sof_ipc_init (sdev);if (!sdev->ipc) { + ret = -ENOMEM ;dev_err (sdev->dev,"error: failed to init DSP IPC %d\n" , ret); goto ipc_err; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 43/266 PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register
In reply to Sasha LevinFrom: Pali Rohár <[email protected]>
[ Upstream commit 90c6cb4a355e7befcb557d217d1d8b8bd5875a05 ]
Trying to change Link Status register does not have any effect as this is a read-only register. Trying to overwrite bits for Negotiated Link Width does not make sense.
In future proper change of link width can be done via Lane Count Select bits in PCIe Control 0 register.
Trying to unconditionally enable ASPM L0s via ASPM Control bits in Link Control register is wrong. There should be at least some detection if endpoint supports L0s as isn't mandatory.
Moreover ASPM Control bits in Link Control register are controlled by pcie/aspm.c code which sets it according to system ASPM settings, immediately after aardvark driver probes. So setting these bits by aardvark driver has no long running effect.
Remove code which touches ASPM L0s bits from this driver and let kernel's ASPM implementation to set ASPM state properly.
Some users are reporting issues that this code is problematic for some Intel wifi cards and removing it fixes them, see e.g.:
https://bugzilla.kernel.org/show_bug.cgi?id=196339
If problems with Intel wifi cards occur even after this commit, then pcie/aspm.c code could be modified / hooked to not enable ASPM L0s state for affected problematic cards.
--- drivers/pci/controller/pci-aardvark.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/pci/controller/pci-aardvark.c +0 -4
@@ -344,10 +344,6 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)advk_pcie_wait_for_link (pcie); - reg =PCIE_CORE_LINK_L0S_ENTRY | - (1 <<PCIE_CORE_LINK_WIDTH_SHIFT ); -advk_writel (pcie, reg,PCIE_CORE_LINK_CTRL_STAT_REG ); - reg =advk_readl (pcie,PCIE_CORE_CMD_STATUS_REG ); reg |=PCIE_CORE_CMD_MEM_ACCESS_EN | PCIE_CORE_CMD_IO_ACCESS_EN |
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 135/266 ASoC: ux500: mop500: Fix some refcounted resources issues
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 4e8748fcaeec073e3ba794871ce86c545e4f961f ]
There are 2 issues here:
- if one of the 'of_parse_phandle' fails, calling 'mop500_of_node_put()' is a no-op because the 'mop500_dai_links' structure has not been initialized yet, so the referenced are not decremented
- The reference stored in 'mop500_dai_links[i].codecs' is refcounted only once in the probe and must be decremented only once.
--- sound/soc/ux500/mop500.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
sound/soc/ux500/mop500.c +7 -4
@@ -63,10 +63,11 @@ static void mop500_of_node_put(void) {int i; -for (i =0 ; i <2 ; i++) { +for (i =0 ; i <2 ; i++)of_node_put (mop500_dai_links[i].cpus->of_node); -of_node_put (mop500_dai_links[i].codecs->of_node); - } + +/* Both links use the same codec, which is refcounted only once */ +of_node_put (mop500_dai_links[0 ].codecs->of_node); } static int mop500_of_probe(struct platform_device *pdev,
@@ -81,7 +82,9 @@ static int mop500_of_probe(struct platform_device *pdev,if (!(msp_np[0 ] && msp_np[1 ] && codec_np)) {dev_err (&pdev->dev,"Phandle missing or invalid\n" ); -mop500_of_node_put (); +for (i =0 ; i <2 ; i++) +of_node_put (msp_np[i]); +of_node_put (codec_np);return -EINVAL ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 47/266 coresight: tmc: Fix TMC mode read in tmc_read_prepare_etb()
In reply to Sasha LevinFrom: Sai Prakash Ranjan <[email protected]>
[ Upstream commit 347adb0d6385c3220dc01ab61807a5b1892901cc ]
On some QCOM platforms like SC7180, SDM845 and SM8150, reading TMC mode register without proper coresight power management can lead to async exceptions like the one in the call trace below in tmc_read_prepare_etb(). This can happen if the user tries to read the TMC etf data via device node without setting up source and the sink first. Fix this by having a check for coresight sysfs mode before reading TMC mode management register.
Kernel panic - not syncing: Asynchronous SError Interrupt CPU: 7 PID: 2605 Comm: hexdump Tainted: G S 5.4.30 #122 Call trace: dump_backtrace+0x0/0x188 show_stack+0x20/0x2c dump_stack+0xdc/0x144 panic+0x168/0x36c panic+0x0/0x36c arm64_serror_panic+0x78/0x84 do_serror+0x130/0x138 el1_error+0x84/0xf8 tmc_read_prepare_etb+0x88/0xb8 tmc_open+0x40/0xd8 misc_open+0x120/0x158 chrdev_open+0xb8/0x1a4 do_dentry_open+0x268/0x3a0 vfs_open+0x34/0x40 path_openat+0x39c/0xdf4 do_filp_open+0x90/0x10c do_sys_open+0x150/0x3e8 __arm64_compat_sys_openat+0x28/0x34 el0_svc_common+0xa8/0x160 el0_svc_compat_handler+0x2c/0x38 el0_svc_compat+0x8/0x10
--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +8 -8
@@ -596,13 +596,6 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) goto out; } -/* There is no point in reading a TMC in HW FIFO mode */ - mode =readl_relaxed (drvdata->base +TMC_MODE ); -if (mode !=TMC_MODE_CIRCULAR_BUFFER ) { - ret = -EINVAL ; - goto out; - } -/* Don't interfere if operated from Perf */ if (drvdata->mode ==CS_MODE_PERF ) { ret = -EINVAL ;
@@ -616,8 +609,15 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata) }/* Disable the TMC if need be */ -if (drvdata->mode ==CS_MODE_SYSFS ) +if (drvdata->mode ==CS_MODE_SYSFS ) { +/* There is no point in reading a TMC in HW FIFO mode */ + mode =readl_relaxed (drvdata->base +TMC_MODE ); +if (mode !=TMC_MODE_CIRCULAR_BUFFER ) { + ret = -EINVAL ; + goto out; + }__tmc_etb_disable_hw (drvdata); + } drvdata->reading = true; out:
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 134/266 SoC: rsnd: add interrupt support for SSI BUSIF buffer
In reply to Sasha LevinFrom: Yongbo Zhang <[email protected]>
[ Upstream commit 66c705d07d784fb6b4622c6e47b6acae357472db ]
SSI BUSIF buffer is possible to overflow or underflow, especially in a hypervisor environment. If there is no interrupt support, it will eventually lead to errors in pcm data.
This patch adds overflow and underflow interrupt support for SSI BUSIF buffer.
--- sound/soc/sh/rcar/gen.c | 8 +++ sound/soc/sh/rcar/rsnd.h | 9 +++ sound/soc/sh/rcar/ssi.c | 145 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+)
sound/soc/sh/rcar/gen.c +8 -0
@@ -224,6 +224,14 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)RSND_GEN_S_REG (SSI_SYS_STATUS5 ,0x884 ),RSND_GEN_S_REG (SSI_SYS_STATUS6 ,0x888 ),RSND_GEN_S_REG (SSI_SYS_STATUS7 ,0x88c ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE0 ,0x850 ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE1 ,0x854 ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE2 ,0x858 ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE3 ,0x85c ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE4 ,0x890 ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE5 ,0x894 ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE6 ,0x898 ), +RSND_GEN_S_REG (SSI_SYS_INT_ENABLE7 ,0x89c ),RSND_GEN_S_REG (HDMI0_SEL ,0x9e0 ), RSND_GEN_S_REG(HDMI1_SEL, 0x9e4),
sound/soc/sh/rcar/rsnd.h +9 -0
@@ -189,6 +189,14 @@ enum rsnd_reg {SSI_SYS_STATUS5 ,SSI_SYS_STATUS6 ,SSI_SYS_STATUS7 , +SSI_SYS_INT_ENABLE0 , +SSI_SYS_INT_ENABLE1 , +SSI_SYS_INT_ENABLE2 , +SSI_SYS_INT_ENABLE3 , +SSI_SYS_INT_ENABLE4 , +SSI_SYS_INT_ENABLE5 , +SSI_SYS_INT_ENABLE6 , +SSI_SYS_INT_ENABLE7 ,HDMI0_SEL ,HDMI1_SEL , SSI9_BUSIF0_MODE,
@@ -237,6 +245,7 @@ enum rsnd_reg {#define SSI9_BUSIF_ADINR (i) (SSI9_BUSIF0_ADINR + (i))#define SSI9_BUSIF_DALIGN (i) (SSI9_BUSIF0_DALIGN + (i))#define SSI_SYS_STATUS (i) (SSI_SYS_STATUS0 + (i)) +#define SSI_SYS_INT_ENABLE (i) (SSI_SYS_INT_ENABLE0 + (i))struct rsnd_priv ;
sound/soc/sh/rcar/ssi.c +145 -0
193 lines not on this page · raw message
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 57/266 clk: zynqmp: fix memory leak in zynqmp_register_clocks
In reply to Sasha LevinFrom: Quanyang Wang <[email protected]>
[ Upstream commit 58b0fb86260063f86afecaebf4056c876fff2a19 ]
This is detected by kmemleak running on zcu102 board:
unreferenced object 0xffffffc877e48180 (size 128):
comm "swapper/0", pid 1, jiffies 4294892909 (age 315.436s) hex dump (first 32 bytes):
64 70 5f 76 69 64 65 6f 5f 72 65 66 5f 64 69 76 dp_video_ref_div 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 1............... backtrace:
[<00000000c9be883b>] __kmalloc_track_caller+0x200/0x380 [<00000000f02c3809>] kvasprintf+0x7c/0x100 [<00000000e51dde4d>] kasprintf+0x60/0x80 [<0000000092298b05>] zynqmp_register_clocks+0x29c/0x398 [<00000000faaff182>] zynqmp_clock_probe+0x3cc/0x4c0 [<000000005f5986f0>] platform_drv_probe+0x58/0xa8 [<00000000d5810136>] really_probe+0xd8/0x2a8 [<00000000f5b671be>] driver_probe_device+0x5c/0x100 [<0000000038f91fcf>] __device_attach_driver+0x98/0xb8 [<000000008a3f2ac2>] bus_for_each_drv+0x74/0xd8 [<000000001cb2783d>] __device_attach+0xe0/0x140 [<00000000c268031b>] device_initial_probe+0x24/0x30 [<000000006998de4b>] bus_probe_device+0x9c/0xa8 [<00000000647ae6ff>] device_add+0x3c0/0x610 [<0000000071c14bb8>] of_device_add+0x40/0x50 [<000000004bb5d132>] of_platform_device_create_pdata+0xbc/0x138
This is because that when num_nodes is larger than 1, clk_out is allocated using kasprintf for these nodes but only the last node's clk_out is freed.
--- drivers/clk/zynqmp/clkc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/clk/zynqmp/clkc.c +9 -6
@@ -558,7 +558,7 @@ static struct clk_hw *zynqmp_register_clk_topology(int clk_id, char *clk_name, {int j;u32 num_nodes, clk_dev_id; -char *clk_out =NULL ; +char *clk_out[MAX_NODES ];struct clock_topology *nodes;struct clk_hw *hw =NULL ;
@@ -572,16 +572,16 @@ static struct clk_hw *zynqmp_register_clk_topology(int clk_id, char *clk_name,* Intermediate clock names are postfixed with type of clock. */ if (j != (num_nodes -1 )) { - clk_out =kasprintf (GFP_KERNEL ,"%s%s" , clk_name, + clk_out[j] =kasprintf (GFP_KERNEL ,"%s%s" , clk_name, clk_type_postfix[nodes[j].type]); }else { - clk_out =kasprintf (GFP_KERNEL ,"%s" , clk_name); + clk_out[j] =kasprintf (GFP_KERNEL ,"%s" , clk_name); }if (!clk_topology[nodes[j].type])continue ; - hw = (*clk_topology[nodes[j].type])(clk_out, clk_dev_id, + hw = (*clk_topology[nodes[j].type])(clk_out[j], clk_dev_id, parent_names, num_parents, &nodes[j]);
@@ -590,9 +590,12 @@ static struct clk_hw *zynqmp_register_clk_topology(int clk_id, char *clk_name, __func__, clk_dev_id, clk_name, PTR_ERR(hw)); - parent_names[0 ] = clk_out; + parent_names[0 ] = clk_out[j]; } -kfree (clk_out); + +for (j =0 ; j < num_nodes; j++) +kfree (clk_out[j]); +return hw; }
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 136/266 ASoC: ti: omap-mcbsp: Fix an error handling path in 'asoc_mcbsp_probe()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 03990fd58d2b7c8f7d53e514ba9b8749fac260f9 ]
If an error occurs after the call to 'omap_mcbsp_init()', the reference to 'mcbsp->fclk' must be decremented, as already done in the remove function.
This can be achieved easily by using the devm_ variant of 'clk_get()' when the reference is taken in 'omap_mcbsp_init()'
This fixes the leak in the probe and has the side effect to simplify both the error handling path of 'omap_mcbsp_init()' and the remove function.
--- sound/soc/ti/omap-mcbsp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/ti/omap-mcbsp.c +2 -6
@@ -686,7 +686,7 @@ static int omap_mcbsp_init(struct platform_device *pdev) mcbsp->dma_data[1 ].addr =omap_mcbsp_dma_reg_params (mcbsp,SNDRV_PCM_STREAM_CAPTURE ); - mcbsp->fclk =clk_get (&pdev->dev,"fck" ); + mcbsp->fclk =devm_clk_get (&pdev->dev,"fck" );if (IS_ERR (mcbsp->fclk)) { ret =PTR_ERR (mcbsp->fclk);dev_err (mcbsp->dev,"unable to get fck: %d\n" , ret);
@@ -711,7 +711,7 @@ static int omap_mcbsp_init(struct platform_device *pdev)if (ret) {dev_err (mcbsp->dev,"Unable to create additional controls\n" ); - goto err_thres; +return ret; } }
@@ -724,8 +724,6 @@ static int omap_mcbsp_init(struct platform_device *pdev) err_st:if (mcbsp->pdata->buffer_size)sysfs_remove_group (&mcbsp->dev->kobj, &additional_attr_group); -err_thres: -clk_put (mcbsp->fclk);return ret; }
@@ -1442,8 +1440,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)omap_mcbsp_st_cleanup (pdev); -clk_put (mcbsp->fclk); -return 0 ; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 87/266 arm64: dts: mt8173: fix unit name warnings
In reply to Sasha LevinFrom: Hsin-Yi Wang <[email protected]>
[ Upstream commit 72b29215aced394d01ca25e432963b619daa0098 ]
Fixing several unit name warnings:
Warning (unit_address_vs_reg): /oscillator@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /oscillator@1: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /oscillator@2: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /thermal-zones/cpu_thermal/trips/trip-point@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /thermal-zones/cpu_thermal/trips/trip-point@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /thermal-zones/cpu_thermal/trips/cpu_crit@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /thermal-zones/cpu_thermal/cooling-maps/map@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /thermal-zones/cpu_thermal/cooling-maps/map@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /reserved-memory/vpu_dma_mem_region: node has a reg or ranges property, but no unit name Warning (simple_bus_reg): /soc/pinctrl@10005000: simple-bus unit address format error, expected "1000b000" Warning (simple_bus_reg): /soc/interrupt-controller@10220000: simple-bus unit address format error, expected "10221000"
--- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/mediatek/mt8173.dtsi +11 -11
@@ -238,21 +238,21 @@ psci { cpu_on = <0x84000003>; }; - clk26m: oscillator@0 { + clk26m: oscillator0 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>; clock-output-names = "clk26m"; }; - clk32k: oscillator@1 { + clk32k: oscillator1 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <32000>; clock-output-names = "clk32k"; }; - cpum_ck: oscillator@2 { + cpum_ck: oscillator2 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <0>;
@@ -268,19 +268,19 @@ cpu_thermal: cpu_thermal { sustainable-power = <1500>; /* milliwatts */ trips { - threshold: trip-point@0 { + threshold: trip-point0 { temperature = <68000>; hysteresis = <2000>; type = "passive"; }; - target: trip-point@1 { + target: trip-point1 { temperature = <85000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit: cpu_crit@0 { + cpu_crit: cpu_crit0 { temperature = <115000>; hysteresis = <2000>; type = "critical";
@@ -288,13 +288,13 @@ cpu_crit: cpu_crit@0 { }; cooling-maps { - map@0 { + map0 { trip = <&target>; cooling-device = <&cpu0 0 0>, <&cpu1 0 0>; contribution = <3072>; }; - map@1 { + map1 { trip = <&target>; cooling-device = <&cpu2 0 0>, <&cpu3 0 0>;
@@ -308,7 +308,7 @@ reserved-memory { #address-cells = <2>; #size-cells = <2>; ranges; - vpu_dma_reserved: vpu_dma_mem_region { + vpu_dma_reserved: vpu_dma_mem_region@b7000000 { compatible = "shared-dma-pool"; reg = <0 0xb7000000 0 0x500000>; alignment = <0x1000>;
@@ -360,7 +360,7 @@ syscfg_pctl_a: syscfg_pctl_a@10005000 { reg = <0 0x10005000 0 0x1000>; }; - pio: pinctrl@10005000 { + pio: pinctrl@1000b000 { compatible = "mediatek,mt8173-pinctrl"; reg = <0 0x1000b000 0 0x1000>; mediatek,pctl-regmap = <&syscfg_pctl_a>;
@@ -567,7 +567,7 @@ mipi_tx1: mipi-dphy@10216000 { status = "disabled"; }; - gic: interrupt-controller@10220000 { + gic: interrupt-controller@10221000 { compatible = "arm,gic-400"; #interrupt-cells = <3>; interrupt-parent = <&gic>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 108/266 clk: meson: meson8b: Fix the polarity of the RESET_N lines
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 0d3051c790ed2ef6bd91b92b07220313f06b95b3 ]
CLKC_RESET_VID_DIVIDER_CNTL_RESET_N_POST and CLKC_RESET_VID_DIVIDER_CNTL_RESET_N_PRE are active low. This means:
- asserting them requires setting the register value to 0
- de-asserting them requires setting the register value to 1
Set the register value accordingly for these two reset lines by setting the inverted the register value compared to all other reset lines.
--- drivers/clk/meson/meson8b.c | 79 ++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 23 deletions(-)
drivers/clk/meson/meson8b.c +56 -23
@@ -3491,54 +3491,87 @@ static struct clk_regmap *const meson8b_clk_regmaps[] = {static const struct meson8b_clk_reset_line {u32 reg;u8 bit_idx; +bool active_low; } meson8b_clk_reset_bits[] = { [CLKC_RESET_L2_CACHE_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =30 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =30 , + .active_low = false, }, [CLKC_RESET_AXI_64_TO_128_BRIDGE_A5_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =29 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =29 , + .active_low = false, }, [CLKC_RESET_SCU_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =28 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =28 , + .active_low = false, }, [CLKC_RESET_CPU3_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =27 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =27 , + .active_low = false, }, [CLKC_RESET_CPU2_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =26 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =26 , + .active_low = false, }, [CLKC_RESET_CPU1_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =25 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =25 , + .active_low = false, }, [CLKC_RESET_CPU0_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =24 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =24 , + .active_low = false, }, [CLKC_RESET_A5_GLOBAL_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =18 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =18 , + .active_low = false, }, [CLKC_RESET_A5_AXI_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =17 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =17 , + .active_low = false, }, [CLKC_RESET_A5_ABP_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL0 , .bit_idx =16 + .reg =HHI_SYS_CPU_CLK_CNTL0 , + .bit_idx =16 , + .active_low = false, }, [CLKC_RESET_AXI_64_TO_128_BRIDGE_MMC_SOFT_RESET ] = { - .reg =HHI_SYS_CPU_CLK_CNTL1 , .bit_idx =30 + .reg =HHI_SYS_CPU_CLK_CNTL1 , + .bit_idx =30 , + .active_low = false, }, [CLKC_RESET_VID_CLK_CNTL_SOFT_RESET ] = { - .reg =HHI_VID_CLK_CNTL , .bit_idx =15 + .reg =HHI_VID_CLK_CNTL , + .bit_idx =15 , + .active_low = false, }, [CLKC_RESET_VID_DIVIDER_CNTL_SOFT_RESET_POST ] = { - .reg =HHI_VID_DIVIDER_CNTL , .bit_idx =7 + .reg =HHI_VID_DIVIDER_CNTL , + .bit_idx =7 , + .active_low = false, }, [CLKC_RESET_VID_DIVIDER_CNTL_SOFT_RESET_PRE ] = { - .reg =HHI_VID_DIVIDER_CNTL , .bit_idx =3 + .reg =HHI_VID_DIVIDER_CNTL , + .bit_idx =3 , + .active_low = false, }, [CLKC_RESET_VID_DIVIDER_CNTL_RESET_N_POST ] = { - .reg =HHI_VID_DIVIDER_CNTL , .bit_idx =1 + .reg =HHI_VID_DIVIDER_CNTL , + .bit_idx =1 , + .active_low = true, }, [CLKC_RESET_VID_DIVIDER_CNTL_RESET_N_PRE ] = { - .reg =HHI_VID_DIVIDER_CNTL , .bit_idx =0 + .reg =HHI_VID_DIVIDER_CNTL , + .bit_idx =0 , + .active_low = true, }, };
@@ -3547,22 +3580,22 @@ static int meson8b_clk_reset_update(struct reset_controller_dev *rcdev, {struct meson8b_clk_reset *meson8b_clk_reset = container_of(rcdev, struct meson8b_clk_reset, reset); -unsigned long flags;const struct meson8b_clk_reset_line *reset; +unsigned int value =0 ; +unsigned long flags;if (id >=ARRAY_SIZE (meson8b_clk_reset_bits))return -EINVAL ; reset = &meson8b_clk_reset_bits[id]; +if (assert != reset->active_low) + value =BIT (reset->bit_idx); +spin_lock_irqsave (&meson_clk_lock, flags); -if (assert) -regmap_update_bits (meson8b_clk_reset->regmap, reset->reg, -BIT (reset->bit_idx),BIT (reset->bit_idx)); -else -regmap_update_bits (meson8b_clk_reset->regmap, reset->reg, -BIT (reset->bit_idx),0 ); +regmap_update_bits (meson8b_clk_reset->regmap, reset->reg, +BIT (reset->bit_idx), value);spin_unlock_irqrestore (&meson_clk_lock, flags);
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 157/266 ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT8-A tablet
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 0e0e10fde0e9808d1991268f5dca69fb36c025f7 ]
The Toshiba Encore WT8-A tablet almost fully works with the default settings for non-CR Bay Trail devices. The only problem is that its jack-detect switch is not inverted (it is active high instead of the normal active low).
Add a quirk for this model using the default settings + BYT_RT5640_JD_NOT_INV.
--- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/soc/intel/boards/bytcr_rt5640.c +12 -0
@@ -742,6 +742,18 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {BYT_RT5640_SSP0_AIF1 | BYT_RT5640_MCLK_EN), }, + { /* Toshiba Encore WT8-A */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TOSHIBA WT8-A"), + }, + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | +BYT_RT5640_JD_SRC_JD2_IN4N | +BYT_RT5640_OVCD_TH_2000UA | +BYT_RT5640_OVCD_SF_0P75 | +BYT_RT5640_JD_NOT_INV | + BYT_RT5640_MCLK_EN), + }, { /* Catch-all for generic Insyde tablets, must be last */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 109/266 clk: meson: meson8b: Fix the vclk_div{1, 2, 4, 6, 12}_en gate bits
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 8bb629cfb28f4dad9d47f69249366e50ae5edc25 ]
The DIV{1,2,4,6,12}_EN bits are actually located in HHI_VID_CLK_CNTL register:
- HHI_VID_CLK_CNTL[0] = DIV1_EN
- HHI_VID_CLK_CNTL[1] = DIV2_EN
- HHI_VID_CLK_CNTL[2] = DIV4_EN
- HHI_VID_CLK_CNTL[3] = DIV6_EN
- HHI_VID_CLK_CNTL[4] = DIV12_EN
Update the bits accordingly so we will enable the bits in the correct register once we switch these clocks to be mutable.
--- drivers/clk/meson/meson8b.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clk/meson/meson8b.c +5 -5
@@ -1207,7 +1207,7 @@ static struct clk_regmap meson8b_vclk_in_en = {static struct clk_regmap meson8b_vclk_div1_gate = { .data = &(struct clk_regmap_gate_data ){ - .offset =HHI_VID_CLK_DIV , + .offset =HHI_VID_CLK_CNTL , .bit_idx =0 , }, .hw.init = &(struct clk_init_data ){
@@ -1237,7 +1237,7 @@ static struct clk_fixed_factor meson8b_vclk_div2_div = {static struct clk_regmap meson8b_vclk_div2_div_gate = { .data = &(struct clk_regmap_gate_data ){ - .offset =HHI_VID_CLK_DIV , + .offset =HHI_VID_CLK_CNTL , .bit_idx =1 , }, .hw.init = &(struct clk_init_data ){
@@ -1267,7 +1267,7 @@ static struct clk_fixed_factor meson8b_vclk_div4_div = {static struct clk_regmap meson8b_vclk_div4_div_gate = { .data = &(struct clk_regmap_gate_data ){ - .offset =HHI_VID_CLK_DIV , + .offset =HHI_VID_CLK_CNTL , .bit_idx =2 , }, .hw.init = &(struct clk_init_data ){
@@ -1297,7 +1297,7 @@ static struct clk_fixed_factor meson8b_vclk_div6_div = {static struct clk_regmap meson8b_vclk_div6_div_gate = { .data = &(struct clk_regmap_gate_data ){ - .offset =HHI_VID_CLK_DIV , + .offset =HHI_VID_CLK_CNTL , .bit_idx =3 , }, .hw.init = &(struct clk_init_data ){
@@ -1327,7 +1327,7 @@ static struct clk_fixed_factor meson8b_vclk_div12_div = {static struct clk_regmap meson8b_vclk_div12_div_gate = { .data = &(struct clk_regmap_gate_data ){ - .offset =HHI_VID_CLK_DIV , + .offset =HHI_VID_CLK_CNTL , .bit_idx =4 , }, .hw.init = &(struct clk_init_data ){
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 190/266 ASoC: fix incomplete error-handling in img_i2s_in_probe.
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit 25bf943e4e7b47282bd86ae7d39e039217ebb007 ]
Function "pm_runtime_get_sync()" is not handled by "pm_runtime_put()" if "PTR_ERR(rst) == -EPROBE_DEFER". Fix this issue by adding "pm_runtime_put()" into this error path.
--- sound/soc/img/img-i2s-in.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/img/img-i2s-in.c +1 -0
@@ -482,6 +482,7 @@ static int img_i2s_in_probe(struct platform_device *pdev)if (IS_ERR (rst)) {if (PTR_ERR (rst) == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ; +pm_runtime_put (&pdev->dev); goto err_suspend; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 112/266 clk: meson: meson8b: Don't rely on u-boot to init all GP_PLL registers
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit a29ae8600d50ece1856b062a39ed296b8b952259 ]
Not all u-boot versions initialize the HHI_GP_PLL_CNTL[2-5] registers. In that case all HHI_GPLL_PLL_CNTL[1-5] registers are 0x0 and when booting Linux the PLL fails to lock.
The initialization sequence from u-boot is:
- put the PLL into reset
- write 0x59C88000 to HHI_GP_PLL_CNTL2
- write 0xCA463823 to HHI_GP_PLL_CNTL3
- write 0x0286A027 to HHI_GP_PLL_CNTL4
- write 0x00003000 to HHI_GP_PLL_CNTL5
- set M, N, OD and the enable bit
- take the PLL out of reset
- check if it has locked
- disable the PLL
In Linux we already initialize M, N, OD, the enable and the reset bits. Also the HHI_GP_PLL_CNTL[2-5] registers with these magic values (the exact meaning is unknown) so the PLL can lock when the vendor u-boot did not initialize these registers yet.
--- drivers/clk/meson/meson8b.c | 9 +++++++++ drivers/clk/meson/meson8b.h | 4 ++++ 2 files changed, 13 insertions(+)
drivers/clk/meson/meson8b.c +9 -0
@@ -1910,6 +1910,13 @@ static struct clk_regmap meson8b_mali = { }, }; +static const struct reg_sequence meson8m2_gp_pll_init_regs[] = { + { .reg =HHI_GP_PLL_CNTL2 , .def =0x59c88000 }, + { .reg =HHI_GP_PLL_CNTL3 , .def =0xca463823 }, + { .reg =HHI_GP_PLL_CNTL4 , .def =0x0286a027 }, + { .reg =HHI_GP_PLL_CNTL5 , .def =0x00003000 }, +}; +static const struct pll_params_table meson8m2_gp_pll_params_table[] = {PLL_PARAMS (182 ,3 ), {/* sentinel */ },
@@ -1943,6 +1950,8 @@ static struct clk_regmap meson8m2_gp_pll_dco = { .width = 1, }, .table = meson8m2_gp_pll_params_table, + .init_regs = meson8m2_gp_pll_init_regs, + .init_count = ARRAY_SIZE(meson8m2_gp_pll_init_regs), }, .hw.init = &(struct clk_init_data ){ .name ="gp_pll_dco" ,
drivers/clk/meson/meson8b.h +4 -0
@@ -20,6 +20,10 @@* [0] http://dn.odroid.com/S805/Datasheet/S805_Datasheet%20V0.8%2020150126.pdf */ #define HHI_GP_PLL_CNTL 0x40/* 0x10 offset in data sheet */ +#define HHI_GP_PLL_CNTL2 0x44/* 0x11 offset in data sheet */ +#define HHI_GP_PLL_CNTL3 0x48/* 0x12 offset in data sheet */ +#define HHI_GP_PLL_CNTL4 0x4C/* 0x13 offset in data sheet */ +#define HHI_GP_PLL_CNTL5 0x50/* 0x14 offset in data sheet */ #define HHI_VIID_CLK_DIV 0x128/* 0x4a offset in data sheet */ #define HHI_VIID_CLK_CNTL 0x12c/* 0x4b offset in data sheet */ #define HHI_GCLK_MPEG0 0x140/* 0x50 offset in data sheet */
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 209/266 ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed
In reply to Sasha LevinFrom: Xiyu Yang <[email protected]>
[ Upstream commit 36124fb19f1ae68a500cd76a76d40c6e81bee346 ]
fsl_asrc_dma_hw_params() invokes dma_request_channel() or fsl_asrc_get_dma_channel(), which returns a reference of the specified dma_chan object to "pair->dma_chan[dir]" with increased refcnt.
The reference counting issue happens in one exception handling path of fsl_asrc_dma_hw_params(). When config DMA channel failed for Back-End, the function forgets to decrease the refcnt increased by dma_request_channel() or fsl_asrc_get_dma_channel(), causing a refcnt leak.
Fix this issue by calling dma_release_channel() when config DMA channel failed.
--- sound/soc/fsl/fsl_asrc_dma.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/fsl_asrc_dma.c +1 -0
@@ -241,6 +241,7 @@ static int fsl_asrc_dma_hw_params(struct snd_pcm_substream *substream, ret =dmaengine_slave_config (pair->dma_chan[dir], &config_be);if (ret) {dev_err (dev,"failed to config DMA channel for Back-End\n" ); +dma_release_channel (pair->dma_chan[dir]);return ret; }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 155/266 usb/ohci-platform: Fix a warning when hibernating
In reply to Sasha LevinFrom: Qais Yousef <[email protected]>
[ Upstream commit 1cb3b0095c3d0bb96912bfbbce4fc006d41f367c ]
The following warning was observed when attempting to suspend to disk using a USB flash as a swap device.
[ 111.779649] ------------[ cut here ]------------ [ 111.788382] URB (____ptrval____) submitted while active [ 111.796646] WARNING: CPU: 3 PID: 365 at drivers/usb/core/urb.c:363 usb_submit_urb+0x3d8/0x590 [ 111.805417] Modules linked in: [ 111.808584] CPU: 3 PID: 365 Comm: kworker/3:2 Not tainted 5.6.0-rc6-00002-gdfd1731f9a3e-dirty #545 [ 111.817796] Hardware name: ARM Juno development board (r2) (DT) [ 111.823896] Workqueue: usb_hub_wq hub_event [ 111.828217] pstate: 60000005 (nZCv daif -PAN -UAO) [ 111.833156] pc : usb_submit_urb+0x3d8/0x590 [ 111.837471] lr : usb_submit_urb+0x3d8/0x590 [ 111.841783] sp : ffff800018de38b0 [ 111.845205] x29: ffff800018de38b0 x28: 0000000000000003 [ 111.850682] x27: ffff000970530b20 x26: ffff8000133fd000 [ 111.856159] x25: ffff8000133fd000 x24: ffff800018de3b38 [ 111.861635] x23: 0000000000000004 x22: 0000000000000c00 [ 111.867112] x21: 0000000000000000 x20: 00000000fffffff0 [ 111.872589] x19: ffff0009704e7a00 x18: ffffffffffffffff [ 111.878065] x17: 00000000a7c8f4bc x16: 000000002af33de8 [ 111.883542] x15: ffff8000133fda88 x14: 0720072007200720 [ 111.889019] x13: 0720072007200720 x12: 0720072007200720 [ 111.894496] x11: 0000000000000000 x10: 00000000a5286134 [ 111.899973] x9 : 0000000000000002 x8 : ffff000970c837a0 [ 111.905449] x7 : 0000000000000000 x6 : ffff800018de3570 [ 111.910926] x5 : 0000000000000001 x4 : 0000000000000003 [ 111.916401] x3 : 0000000000000000 x2 : ffff800013427118 [ 111.921879] x1 : 9d4e965b4b7d7c00 x0 : 0000000000000000 [ 111.927356] Call trace: [ 111.929892] usb_submit_urb+0x3d8/0x590 [ 111.933852] hub_activate+0x108/0x7f0 [ 111.937633] hub_resume+0xac/0x148 [ 111.941149] usb_resume_interface.isra.10+0x60/0x138 [ 111.946265] usb_resume_both+0xe4/0x140 [ 111.950225] usb_runtime_resume+0x24/0x30 [ 111.954365] __rpm_callback+0xdc/0x138 [ 111.958236] rpm_callback+0x34/0x98 [ 111.961841] rpm_resume+0x4a8/0x720 [ 111.965445] rpm_resume+0x50c/0x720 [ 111.969049] __pm_runtime_resume+0x4c/0xb8 [ 111.973276] usb_autopm_get_interface+0x28/0x60 [ 111.977948] hub_event+0x80/0x16d8 [ 111.981466] process_one_work+0x2a4/0x748 [ 111.985604] worker_thread+0x48/0x498 [ 111.989387] kthread+0x13c/0x140 [ 111.992725] ret_from_fork+0x10/0x18 [ 111.996415] irq event stamp: 354 [ 111.999756] hardirqs last enabled at (353): [<ffff80001019ea1c>] console_unlock+0x504/0x5b8 [ 112.008441] hardirqs last disabled at (354): [<ffff8000100a95d0>] do_debug_exception+0x1a8/0x258 [ 112.017479] softirqs last enabled at (350): [<ffff8000100818a4>] __do_softirq+0x4bc/0x568 [ 112.025984] softirqs last disabled at (343): [<ffff8000101145a4>] irq_exit+0x144/0x150 [ 112.034129] ---[ end trace dc96030b9cf6c8a3 ]---
The problem was tracked down to a missing call to pm_runtime_set_active() on resume in ohci-platform.
--- drivers/usb/host/ohci-platform.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/host/ohci-platform.c +5 -0
@@ -299,6 +299,11 @@ static int ohci_platform_resume(struct device *dev) }ohci_resume (hcd, false); + +pm_runtime_disable (dev); +pm_runtime_set_active (dev); +pm_runtime_enable (dev); +return 0 ; }#endif /* CONFIG_PM_SLEEP */
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 250/266 ASoC: core: only convert non DPCM link to DPCM link
In reply to Sasha LevinFrom: Bard Liao <[email protected]>
[ Upstream commit 607fa205a7e4dfad28b8a67ab1c985756ddbccb0 ]
Additional checks for valid DAIs expose a corner case, where existing BE dailinks get modified, e.g. HDMI links are tagged with dpcm_capture=1 even if the DAIs are for playback.
This patch makes those changes conditional and flags configuration issues when a BE dailink is has no_pcm=0 but dpcm_playback or dpcm_capture=1 (which makes no sense).
As discussed on the alsa-devel mailing list, there are redundant flags for dpcm_playback, dpcm_capture, playback_only, capture_only. This will have to be cleaned-up in a future update. For now only correct and flag problematic configurations.
--- sound/soc/soc-core.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
sound/soc/soc-core.c +19 -3
@@ -1895,9 +1895,25 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dai_link->platforms->name = component->name;/* convert non BE into BE */ - dai_link->no_pcm =1 ; - dai_link->dpcm_playback =1 ; - dai_link->dpcm_capture =1 ; +if (!dai_link->no_pcm) { + dai_link->no_pcm =1 ; + +if (dai_link->dpcm_playback) +dev_warn (card->dev, +"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n" , + dai_link->name); +if (dai_link->dpcm_capture) +dev_warn (card->dev, +"invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n" , + dai_link->name); + +/* convert normal link into DPCM one */ +if (!(dai_link->dpcm_playback || + dai_link->dpcm_capture)) { + dai_link->dpcm_playback = !dai_link->capture_only; + dai_link->dpcm_capture = !dai_link->playback_only; + } + }/* override any BE fixups */ dai_link->be_hw_params_fixup =
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 252/266 ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 199a5e8fda54ab3c8c6f6bf980c004e97ebf5ccb ]
The Toshiba Encore WT10-A tablet almost fully works with the default settings for Bay Trail CR devices. The only issue is that it uses a digital mic. connected the the DMIC1 input instead of an analog mic.
Add a quirk for this model using the default settings with the input-map replaced with BYT_RT5640_DMIC1_MAP.
--- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/soc/intel/boards/bytcr_rt5640.c +12 -0
@@ -754,6 +754,18 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {BYT_RT5640_JD_NOT_INV | BYT_RT5640_MCLK_EN), }, + { /* Toshiba Encore WT10-A */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "TOSHIBA WT10-A-103"), + }, + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | +BYT_RT5640_JD_SRC_JD1_IN4P | +BYT_RT5640_OVCD_TH_2000UA | +BYT_RT5640_OVCD_SF_0P75 | +BYT_RT5640_SSP0_AIF2 | + BYT_RT5640_MCLK_EN), + }, { /* Catch-all for generic Insyde tablets, must be last */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 166/266 firmware: imx: scu: Fix possible memory leak in imx_scu_probe()
In reply to Sasha LevinFrom: Wei Yongjun <[email protected]>
[ Upstream commit 89f12d6509bff004852c51cb713a439a86816b24 ]
'chan_name' is malloced in imx_scu_probe() and should be freed before leaving from the error handling cases, otherwise it will cause memory leak.
--- drivers/firmware/imx/imx-scu.c | 1 + 1 file changed, 1 insertion(+)
drivers/firmware/imx/imx-scu.c +1 -0
@@ -300,6 +300,7 @@ static int imx_scu_probe(struct platform_device *pdev)if (ret != -EPROBE_DEFER )dev_err (dev,"Failed to request mbox chan %s ret %d\n" , chan_name, ret); +kfree (chan_name);return ret; }
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 175/266 PCI: amlogic: meson: Don't use FAST_LINK_MODE to set up link
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 87dccf09323fc363bd0d072fcc12b96622ab8c69 ]
The vim3l board does not work with a standard PCIe switch (ASM1184e), spitting all kind of errors - hinting at HW misconfiguration (no link, port enumeration issues, etc).
According to the the Synopsys DWC PCIe Reference Manual, in the section dedicated to the PLCR register, bit 7 is described (FAST_LINK_MODE) as:
"Sets all internal timers to fast mode for simulation purposes."
it is sound to set this bit from a simulation perspective, but on actual silicon, which expects timers to have a nominal value, it is not.
Make sure the FAST_LINK_MODE bit is cleared when configuring the RC to solve this problem.
--- drivers/pci/controller/dwc/pci-meson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pci-meson.c +2 -2
@@ -301,11 +301,11 @@ static void meson_pcie_init_dw(struct meson_pcie *mp)meson_cfg_writel (mp, val,PCIE_CFG0 ); val =meson_elb_readl (mp,PCIE_PORT_LINK_CTRL_OFF ); - val &= ~LINK_CAPABLE_MASK ; + val &= ~(LINK_CAPABLE_MASK |FAST_LINK_MODE );meson_elb_writel (mp, val,PCIE_PORT_LINK_CTRL_OFF ); val =meson_elb_readl (mp,PCIE_PORT_LINK_CTRL_OFF ); - val |=LINK_CAPABLE_X1 |FAST_LINK_MODE ; + val |=LINK_CAPABLE_X1 ;meson_elb_writel (mp, val,PCIE_PORT_LINK_CTRL_OFF ); val =meson_elb_readl (mp,PCIE_GEN2_CTRL_OFF );
Signature · 7 lines
2.25.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 253/266 ASoC: rt5645: Add platform-data for Asus T101HA
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 79d4f823a06796656289f97b922493da5690e46c ]
The Asus T101HA uses the default jack-detect mode 3, but instead of using an analog microphone it is using a DMIC on dmic-data-pin 1, like the Asus T100HA. Note unlike the T100HA its jack-detect is not inverted.
Add a DMI quirk with the correct settings for this model.
--- sound/soc/codecs/rt5645.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
sound/soc/codecs/rt5645.c +14 -0
@@ -3625,6 +3625,12 @@ static const struct rt5645_platform_data asus_t100ha_platform_data = { .inv_jd1_1 = true, }; +static const struct rt5645_platform_data asus_t101ha_platform_data = { + .dmic1_data_pin =RT5645_DMIC_DATA_IN2N , + .dmic2_data_pin =RT5645_DMIC2_DISABLE , + .jd_mode =3 , +}; +static const struct rt5645_platform_data lenovo_ideapad_miix_310_pdata = { .jd_mode =3 , .in2_diff = true,
@@ -3702,6 +3708,14 @@ static const struct dmi_system_id dmi_platform_data[] = { }, .driver_data = (void *)&asus_t100ha_platform_data, }, + { + .ident = "ASUS T101HA", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "T101HA"), + }, + .driver_data = (void *)&asus_t101ha_platform_data, + }, { .ident ="MINIX Z83-4" , .matches = {
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 180/266 usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit eafa80041645cd7604c4357b1a0cd4a3c81f2227 ]
Currently pointer ep is being dereferenced before it is null checked leading to a null pointer dereference issue. Fix this by only assigning pointer udc once ep is known to be not null. Also remove a debug message that requires a valid udc which may not be possible at that point.
Addresses-Coverity: ("Dereference before null check")
--- drivers/usb/gadget/udc/lpc32xx_udc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/usb/gadget/udc/lpc32xx_udc.c +6 -5
@@ -1614,17 +1614,17 @@ static int lpc32xx_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) { struct lpc32xx_ep *ep = container_of(_ep, struct lpc32xx_ep, ep); -struct lpc32xx_udc *udc = ep->udc; +struct lpc32xx_udc *udc;u16 maxpacket;u32 tmp;unsigned long flags;/* Verify EP data */ if ((!_ep) || (!ep) || (!desc) || - (desc->bDescriptorType !=USB_DT_ENDPOINT )) { -dev_dbg (udc->dev,"bad ep or descriptor\n" ); + (desc->bDescriptorType !=USB_DT_ENDPOINT ))return -EINVAL ; - } + + udc = ep->udc; maxpacket =usb_endpoint_maxp (desc);if ((maxpacket ==0 ) || (maxpacket > ep->maxpacket)) {dev_dbg (udc->dev,"bad ep descriptor's packet size\n" );
@@ -1872,7 +1872,7 @@ static int lpc32xx_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)static int lpc32xx_ep_set_halt (struct usb_ep *_ep,int value) { struct lpc32xx_ep *ep = container_of(_ep, struct lpc32xx_ep, ep); -struct lpc32xx_udc *udc = ep->udc; +struct lpc32xx_udc *udc;unsigned long flags;if ((!ep) || (ep->hwep_num <=1 ))
@@ -1882,6 +1882,7 @@ static int lpc32xx_ep_set_halt(struct usb_ep *_ep, int value)if (ep->is_in)return -EAGAIN ; + udc = ep->udc;spin_lock_irqsave (&udc->lock, flags);if (value ==1 ) {
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 186/266 mfd: stmfx: Reset chip on resume as supply was disabled
In reply to Sasha LevinFrom: Amelie Delaunay <[email protected]>
[ Upstream commit e583649d87ec090444aa5347af0927cd6e8581ae ]
STMFX supply is disabled during suspend. To avoid a too early access to the STMFX firmware on resume, reset the chip and wait for its firmware to be loaded.
--- drivers/mfd/stmfx.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mfd/stmfx.c +7 -0
@@ -501,6 +501,13 @@ static int stmfx_resume(struct device *dev) } } +/* Reset STMFX - supply has been stopped during suspend */ + ret =stmfx_chip_reset (stmfx); +if (ret) { +dev_err (stmfx->dev,"Failed to reset chip: %d\n" , ret); +return ret; + } + ret =regmap_raw_write (stmfx->map,STMFX_REG_SYS_CTRL , &stmfx->bkp_sysctrl,sizeof (stmfx->bkp_sysctrl));if (ret)
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 187/266 mfd: stmfx: Fix stmfx_irq_init error path
In reply to Sasha LevinFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 60c2c4bcb9202acad4cc26af20b44b6bd7874f7b ]
In case the interrupt signal can't be configured, IRQ domain needs to be removed.
--- drivers/mfd/stmfx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/mfd/stmfx.c +7 -2
@@ -287,14 +287,19 @@ static int stmfx_irq_init(struct i2c_client *client) ret =regmap_write (stmfx->map,STMFX_REG_IRQ_OUT_PIN , irqoutpin);if (ret) -return ret; + goto irq_exit; ret =devm_request_threaded_irq (stmfx->dev, client->irq,NULL , stmfx_irq_handler, irqtrigger |IRQF_ONESHOT ,"stmfx" , stmfx);if (ret) -stmfx_irq_exit (client); + goto irq_exit; + +return 0 ; + +irq_exit: +stmfx_irq_exit (client);return ret; }
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 199/266 misc: xilinx-sdfec: improve get_user_pages_fast() error handling
In reply to Sasha LevinFrom: John Hubbard <[email protected]>
[ Upstream commit 57343d51613227373759f5b0f2eede257fd4b82e ]
This fixes the case of get_user_pages_fast() returning a -errno. The result needs to be stored in a signed integer. And for safe signed/unsigned comparisons, it's best to keep everything signed. And get_user_pages_fast() also expects a signed value for number of pages to pin.
Therefore, change most relevant variables, from u32 to int. Leave "n" unsigned, for convenience in checking for overflow. And provide a WARN_ON_ONCE() and early return, if overflow occurs.
Also, as long as we're tidying up: rename the page array from page, to pages, in order to match the conventions used in most other call sites.
--- drivers/misc/xilinx_sdfec.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/misc/xilinx_sdfec.c +17 -10
@@ -602,10 +602,10 @@ static int xsdfec_table_write(struct xsdfec_dev *xsdfec, u32 offset, const u32 depth) {u32 reg =0 ; -u32 res; -u32 n, i; +int res, i, nr_pages; +u32 n;u32 *addr =NULL ; -struct page *page[MAX_NUM_PAGES ]; +struct page *pages[MAX_NUM_PAGES ];/* * Writes that go beyond the length of
@@ -622,15 +622,22 @@ static int xsdfec_table_write(struct xsdfec_dev *xsdfec, u32 offset,if ((len *XSDFEC_REG_WIDTH_JUMP ) %PAGE_SIZE ) n +=1 ; - res =get_user_pages_fast ((unsigned long )src_ptr, n,0 , page); -if (res < n) { -for (i =0 ; i < res; i++) -put_page (page[i]); +if (WARN_ON_ONCE (n >INT_MAX )) +return -EINVAL ; + + nr_pages = n; + + res =get_user_pages_fast ((unsigned long )src_ptr, nr_pages,0 , pages); +if (res < nr_pages) { +if (res >0 ) { +for (i =0 ; i < res; i++) +put_page (pages[i]); + }return -EINVAL ; } - for (i = 0; i < n; i++) { - addr = kmap(page[i]); + for (i = 0; i < nr_pages; i++) { + addr = kmap(pages[i]); do { xsdfec_regwrite(xsdfec, base_addr + ((offset + reg) *
@@ -639,7 +646,7 @@ static int xsdfec_table_write(struct xsdfec_dev *xsdfec, u32 offset, reg++; }while ((reg < len) && ((reg *XSDFEC_REG_WIDTH_JUMP ) %PAGE_SIZE )); -put_page (page[i]); +put_page (pages[i]); }return reg; }
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 212/266 mailbox: zynqmp-ipi: Fix NULL vs IS_ERR() check in zynqmp_ipi_mbox_probe()
In reply to Sasha LevinFrom: Wei Yongjun <[email protected]>
[ Upstream commit 445aeeb569f8d7904f8cf80b7c6826bb651ef80e ]
In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). So we should check whether the return value of devm_ioremap() is NULL instead of IS_ERR.
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +8 -12
@@ -504,10 +504,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->req_buf_size =resource_size (&res); mchan->req_buf =devm_ioremap (mdev, res.start, mchan->req_buf_size); -if (IS_ERR (mchan->req_buf)) { +if (!mchan->req_buf) {dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); - ret =PTR_ERR (mchan->req_buf); -return ret; +return -ENOMEM ; } }else if (ret != -ENODEV ) {dev_err (mdev,"Unmatched resource %s, %d.\n" , name, ret);
@@ -520,10 +519,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->resp_buf_size =resource_size (&res); mchan->resp_buf =devm_ioremap (mdev, res.start, mchan->resp_buf_size); -if (IS_ERR (mchan->resp_buf)) { +if (!mchan->resp_buf) {dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); - ret =PTR_ERR (mchan->resp_buf); -return ret; +return -ENOMEM ; } }else if (ret != -ENODEV ) {dev_err (mdev,"Unmatched resource %s.\n" , name);
@@ -543,10 +541,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->req_buf_size =resource_size (&res); mchan->req_buf =devm_ioremap (mdev, res.start, mchan->req_buf_size); -if (IS_ERR (mchan->req_buf)) { +if (!mchan->req_buf) {dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); - ret =PTR_ERR (mchan->req_buf); -return ret; +return -ENOMEM ; } }else if (ret != -ENODEV ) {dev_err (mdev,"Unmatched resource %s.\n" , name);
@@ -559,10 +556,9 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, mchan->resp_buf_size =resource_size (&res); mchan->resp_buf =devm_ioremap (mdev, res.start, mchan->resp_buf_size); -if (IS_ERR (mchan->resp_buf)) { +if (!mchan->resp_buf) {dev_err (mdev,"Unable to map IPI buffer I/O memory\n" ); - ret =PTR_ERR (mchan->resp_buf); -return ret; +return -ENOMEM ; } }else if (ret != -ENODEV ) {dev_err (mdev,"Unmatched resource %s.\n" , name);
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 222/266 pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 9eb728321286c4b31e964d2377fca2368526d408 ]
When 'pinctrl_register()' has been turned into 'devm_pinctrl_register()', an error handling path has not been updated.
Axe a now unneeded 'pinctrl_unregister()'.
--- drivers/pinctrl/freescale/pinctrl-imx1-core.c | 1 - 1 file changed, 1 deletion(-)
drivers/pinctrl/freescale/pinctrl-imx1-core.c +0 -1
@@ -638,7 +638,6 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev, ret =of_platform_populate (pdev->dev.of_node,NULL ,NULL , &pdev->dev);if (ret) { -pinctrl_unregister (ipctl->pctl);dev_err (&pdev->dev,"Failed to populate subdevices\n" );return ret; }
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 223/266 pinctrl: freescale: imx: Fix an error handling path in 'imx_pinctrl_probe()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 11d8da5cabf7c6c3263ba2cd9c00260395867048 ]
'pinctrl_unregister()' should not be called to undo 'devm_pinctrl_register_and_init()', it is already handled by the framework.
This simplifies the error handling paths of the probe function. The 'imx_free_resources()' can be removed as well.
--- drivers/pinctrl/freescale/pinctrl-imx.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
drivers/pinctrl/freescale/pinctrl-imx.c +2 -17
@@ -774,16 +774,6 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev,return 0 ; } -/* -* imx_free_resources() - free memory used by this driver -* @info: info driver instance -*/ -static void imx_free_resources (struct imx_pinctrl *ipctl) -{ -if (ipctl->pctl) -pinctrl_unregister (ipctl->pctl); -} -int imx_pinctrl_probe (struct platform_device *pdev,const struct imx_pinctrl_soc_info *info) {
@@ -874,23 +864,18 @@ int imx_pinctrl_probe(struct platform_device *pdev, &ipctl->pctl);if (ret) {dev_err (&pdev->dev,"could not register IMX pinctrl driver\n" ); - goto free; +return ret; } ret =imx_pinctrl_probe_dt (pdev, ipctl);if (ret) {dev_err (&pdev->dev,"fail to probe dt properties\n" ); - goto free; +return ret; }dev_info (&pdev->dev,"initialized IMX pinctrl driver\n" );return pinctrl_enable (ipctl->pctl); - -free: -imx_free_resources (ipctl); - -return ret; }static int __maybe_unused imx_pinctrl_suspend (struct device *dev)
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 224/266 pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource leak in case of error in 'imx_pinctrl_probe()'
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit ba403242615c2c99e27af7984b1650771a2cc2c9 ]
Use 'devm_of_iomap()' instead 'of_iomap()' to avoid a resource leak in case of error.
Update the error handling code accordingly.
--- drivers/pinctrl/freescale/pinctrl-imx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/pinctrl/freescale/pinctrl-imx.c +4 -3
@@ -824,12 +824,13 @@ int imx_pinctrl_probe(struct platform_device *pdev,return -EINVAL ; } - ipctl->input_sel_base =of_iomap (np,0 ); + ipctl->input_sel_base =devm_of_iomap (&pdev->dev, np, +0 ,NULL );of_node_put (np); -if (!ipctl->input_sel_base) { +if (IS_ERR (ipctl->input_sel_base)) {dev_err (&pdev->dev,"iomuxc input select base address not found\n" ); -return -ENOMEM ; +return PTR_ERR (ipctl->input_sel_base); } } }
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 259/266 scsi: acornscsi: Fix an error handling path in acornscsi_probe()
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 42c76c9848e13dbe0538d7ae0147a269dfa859cb ]
'ret' is known to be 0 at this point. Explicitly return -ENOMEM if one of the 'ecardm_iomap()' calls fail.
--- drivers/scsi/arm/acornscsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/arm/acornscsi.c +3 -1
@@ -2911,8 +2911,10 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ashost->base =ecardm_iomap (ec,ECARD_RES_MEMC ,0 ,0 ); ashost->fast =ecardm_iomap (ec,ECARD_RES_IOCFAST ,0 ,0 ); -if (!ashost->base || !ashost->fast) +if (!ashost->base || !ashost->fast) { + ret = -ENOMEM ; goto out_put; + } host->irq = ec->irq; ashost->host = host;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH AUTOSEL 5.4 191/266] vfio/pci: fix memory leaks of eventfd ctx
In reply to Sasha LevinQuoted 49 lines · On Wed, 17 Jun 2020 21:15:16 -0400 Sasha Levin <[email protected]> wrote:
From: Qian Cai <[email protected]>
[ Upstream commit
1518ac272e789cae8c555d69951b032a275b7602]Finished a qemu-kvm (-device vfio-pci,host=0001:01:00.0) triggers a few memory leaks after a while because
vfio_pci_set_ctx_trigger_single()callseventfd_ctx_fdget()without the matchingeventfd_ctx_put()later. Fix it by callingeventfd_ctx_put()for those memory invfio_pci_release()beforevfio_device_release().unreferenced object
0xebff008981cc2b00(size 128):
comm "qemu-kvm", pid 4043, jiffies 4294994816 (age 9796.310s) hex dump (first 32 bytes):
01 00 00 00 6b 6b 6b 6b 00 00 00 00 ad 4e ad de ....kkkk.....N.. ff ff ff ff 6b 6b 6b 6b ff ff ff ff ff ff ff ff ....kkkk........
backtrace:[<00000000917e8f8d>] slab_post_alloc_hook+0x74/0x9c [<00000000df0f2aa2>] kmem_cache_alloc_trace+0x2b4/0x3d4 [<000000005fcec025>] do_eventfd+0x54/0x1ac [<0000000082791a69>] __arm64_sys_eventfd2+0x34/0x44 [<00000000b819758c>] do_el0_svc+0x128/0x1dc [<00000000b244e810>] el0_sync_handler+0xd0/0x268 [<00000000d495ef94>] el0_sync+0x164/0x180unreferenced object
0x29ff008981cc4180(size 128):
comm "qemu-kvm", pid 4043, jiffies 4294994818 (age 9796.290s) hex dump (first 32 bytes):
01 00 00 00 6b 6b 6b 6b 00 00 00 00 ad 4e ad de ....kkkk.....N.. ff ff ff ff 6b 6b 6b 6b ff ff ff ff ff ff ff ff ....kkkk........
backtrace:[<00000000917e8f8d>] slab_post_alloc_hook+0x74/0x9c [<00000000df0f2aa2>] kmem_cache_alloc_trace+0x2b4/0x3d4 [<000000005fcec025>] do_eventfd+0x54/0x1ac [<0000000082791a69>] __arm64_sys_eventfd2+0x34/0x44 [<00000000b819758c>] do_el0_svc+0x128/0x1dc [<00000000b244e810>] el0_sync_handler+0xd0/0x268 [<00000000d495ef94>] el0_sync+0x164/0x180Signed-off-by Qian Cai <[email protected]>Signed-off-by Alex Williamson <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/vfio/pci/vfio_pci.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/vfio/pci/vfio_pci.c +0
-0
drivers/vfio/pci/vfio_pci.c static void vfio_pci_release(void *device_data) · line 481
Quoted 10 lines
drivers/vfio/pci/vfio_pci.c +4
-0@@ -472,6 +472,10 @@ static void vfio_pci_release(void *device_data)if (!(--vdev->refcnt)) {vfio_spapr_pci_eeh_release (vdev->pdev);vfio_pci_disable (vdev); +if (vdev->err_trigger) +eventfd_ctx_put (vdev->err_trigger); +if (vdev->req_trigger) +eventfd_ctx_put (vdev->req_trigger); }mutex_unlock (&vdev->reflck->lock);
This has a fix pending, I'd suggest not picking it on its own:
https://lore.kernel.org/kvm/[email protected]/
https://lore.kernel.org/kvm/[email protected]/
Thanks,
Alex
Sasha Levin
maintainerPATCH 260/266 x86/idt: Keep spurious entries unset in system_vectors
In reply to Sasha LevinFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit 1f1fbc70c10e81f70e9fbe2102d439c883269811 ]
With commit dc20b2d52653 ("x86/idt: Move interrupt gate initialization to IDT code") non assigned system vectors are also marked as used in 'used_vectors' (now 'system_vectors') bitmap. This makes checks in arch_show_interrupts() whether a particular system vector is allocated to always pass and e.g. 'Hyper-V reenlightenment interrupts' entry always shows up in /proc/interrupts.
Another side effect of having all unassigned system vectors marked as used is that irq_matrix_debug_show() will wrongly count them among 'System' vectors.
As it is now ensured that alloc_intr_gate() is not called after init, it is possible to leave unused entries in 'system_vectors' unset to fix these issues.
--- arch/x86/kernel/idt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/kernel/idt.c +5 -1
@@ -318,7 +318,11 @@ void __init idt_setup_apic_and_irq_gates(void)#ifdef CONFIG_X86_LOCAL_APIC for_each_clear_bit_from (i, system_vectors,NR_VECTORS ) { -set_bit (i, system_vectors); +/* +* Don't set the non assigned system vectors in the +* system_vectors bitmap. Otherwise they show up in +* /proc/interrupts. +*/ entry = spurious_entries_start +8 * (i -FIRST_SYSTEM_VECTOR );set_intr_gate (i, entry); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 220/266 scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj
In reply to Sasha LevinFrom: Qiushi Wu <[email protected]>
[ Upstream commit 0267ffce562c8bbf9b57ebe0e38445ad04972890 ]
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object.
--- drivers/scsi/iscsi_boot_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/iscsi_boot_sysfs.c +1 -1
@@ -352,7 +352,7 @@ iscsi_boot_create_kobj(struct iscsi_boot_kset *boot_kset, boot_kobj->kobj.kset = boot_kset->kset;if (kobject_init_and_add (&boot_kobj->kobj, &iscsi_boot_ktype,NULL , name, index)) { -kfree (boot_kobj); +kobject_put (&boot_kobj->kobj);return NULL ; } boot_kobj->data = data;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 201/266 net: sunrpc: Fix off-by-one issues in 'rpc_ntop6'
In reply to Sasha LevinFrom: Fedor Tokarev <[email protected]>
[ Upstream commit 118917d696dc59fd3e1741012c2f9db2294bed6f ]
Fix off-by-one issues in 'rpc_ntop6':
- 'snprintf' returns the number of characters which would have been written if enough space had been available, excluding the terminating null byte. Thus, a return value of 'sizeof(scopebuf)' means that the last character was dropped.
- 'strcat' adds a terminating null byte to the string, thus if len == buflen, the null byte is written past the end of the buffer.
--- net/sunrpc/addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/addr.c +2 -2
@@ -82,11 +82,11 @@ static size_t rpc_ntop6(const struct sockaddr *sap, rc =snprintf (scopebuf,sizeof (scopebuf),"%c%u" ,IPV6_SCOPE_DELIMITER , sin6->sin6_scope_id); -if (unlikely ((size_t )rc >sizeof (scopebuf))) +if (unlikely ((size_t )rc >=sizeof (scopebuf)))return 0 ; len += rc; -if (unlikely (len > buflen)) +if (unlikely (len >= buflen))return 0 ;strcat (buf, scopebuf);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 183/266 scripts: headers_install: Exit with error on config leak
In reply to Sasha LevinFrom: Siddharth Gupta <[email protected]>
[ Upstream commit 5967577231f9b19acd5a59485e9075964065bbe3 ]
Misuse of CONFIG_* in UAPI headers should result in an error. These config options can be set in userspace by the user application which includes these headers to control the APIs and structures being used in a kernel which supports multiple targets.
--- scripts/headers_install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
scripts/headers_install.sh +6 -5
@@ -64,7 +64,7 @@ configs=$(sed -e ' d ' $OUTFILE) -# The entries in the following list are not warned. +# The entries in the following list do not result in an error. # Please do not add a new entry. This list is only for existing ones. # The list will be reduced gradually, and deleted eventually. (hopefully) #
@@ -98,18 +98,19 @@ include/uapi/linux/raw.h:CONFIG_MAX_RAW_DEVS for c in $configs do - warn=1 + leak_error=1 for ignore in $config_leak_ignores do if echo "$INFILE:$c" | grep -q "$ignore$"; then - warn= + leak_error= break fi done - if [ "$warn" = 1 ]; then - echo "warning: $INFILE: leak $c to user-space" >&2 + if [ "$leak_error" = 1 ]; then + echo "error: $INFILE: leak $c to user-space" >&2 + exit 1 fi done
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 158/266 USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe()
In reply to Sasha LevinFrom: Tang Bin <[email protected]>
[ Upstream commit d49292025f79693d3348f8e2029a8b4703be0f0a ]
The function ehci_mxc_drv_probe() does not perform sufficient error checking after executing platform_get_irq(), thus fix it.
--- drivers/usb/host/ehci-mxc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/ehci-mxc.c +2 -0
@@ -50,6 +50,8 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); +if (irq <0 ) +return irq; hcd =usb_create_hcd (&ehci_mxc_hc_driver, dev,dev_name (dev));if (!hcd)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 148/266 habanalabs: increase timeout during reset
In reply to Sasha LevinFrom: Oded Gabbay <[email protected]>
[ Upstream commit 7a65ee046b2238e053f6ebb610e1a082cfc49490 ]
When doing training, the DL framework (e.g. tensorflow) performs hundreds of thousands of memory allocations and mappings. In case the driver needs to perform hard-reset during training, the driver kills the application and unmaps all those memory allocations. Unfortunately, because of that large amount of mappings, the driver isn't able to do that in the current timeout (5 seconds). Therefore, increase the timeout significantly to 30 seconds to avoid situation where the driver resets the device with active mappings, which sometime can cause a kernel bug.
BTW, it doesn't mean we will spend all the 30 seconds because the reset thread checks every one second if the unmap operation is done.
--- drivers/misc/habanalabs/habanalabs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/habanalabs/habanalabs.h +1 -1
@@ -23,7 +23,7 @@#define HL_MMAP_CB_MASK (0x8000000000000000ull >> PAGE_SHIFT) -#define HL_PENDING_RESET_PER_SEC 5 +#define HL_PENDING_RESET_PER_SEC 30#define HL_DEVICE_TIMEOUT_USEC 1000000/* 1 s */
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 133/266 scsi: mpt3sas: Fix double free warnings
In reply to Sasha LevinFrom: Suganath Prabu S <[email protected]>
[ Upstream commit cbbfdb2a2416c9f0cde913cf09670097ac281282 ]
Fix following warning from Smatch static analyser:
drivers/scsi/mpt3sas/mpt3sas_base.c:5256 _base_allocate_memory_pools()
warn: 'ioc->hpr_lookup' double freed
drivers/scsi/mpt3sas/mpt3sas_base.c:5256 _base_allocate_memory_pools()
warn: 'ioc->internal_lookup' double freed
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_base.c +2 -0
@@ -4777,7 +4777,9 @@ _base_release_memory_pools(struct MPT3SAS_ADAPTER *ioc) }kfree (ioc->hpr_lookup); + ioc->hpr_lookup =NULL ;kfree (ioc->internal_lookup); + ioc->internal_lookup =NULL ;if (ioc->chain_lookup) {for (i =0 ; i < ioc->scsiio_depth; i++) { for (j = ioc->chains_per_prp_buffer;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 122/266 serial: amba-pl011: Make sure we initialize the port.lock spinlock
In reply to Sasha LevinFrom: John Stultz <[email protected]>
[ Upstream commit 8508f4cba308f785b2fd4b8c38849c117b407297 ]
Valentine reported seeing:
[ 3.626638] INFO: trying to register non-static key. [ 3.626639] the code is fine but needs lockdep annotation. [ 3.626640] turning off the locking correctness validator. [ 3.626644] CPU: 7 PID: 51 Comm: kworker/7:1 Not tainted 5.7.0-rc2-00115-g8c2e9790f196 #116 [ 3.626646] Hardware name: HiKey960 (DT) [ 3.626656] Workqueue: events deferred_probe_work_func [ 3.632476] sd 0:0:0:0: [sda] Optimal transfer size 8192 bytes not a multiple of physical block size (16384 bytes) [ 3.640220] Call trace: [ 3.640225] dump_backtrace+0x0/0x1b8 [ 3.640227] show_stack+0x20/0x30 [ 3.640230] dump_stack+0xec/0x158 [ 3.640234] register_lock_class+0x598/0x5c0 [ 3.640235] __lock_acquire+0x80/0x16c0 [ 3.640236] lock_acquire+0xf4/0x4a0 [ 3.640241] _raw_spin_lock_irqsave+0x70/0xa8 [ 3.640245] uart_add_one_port+0x388/0x4b8 [ 3.640248] pl011_register_port+0x70/0xf0 [ 3.640250] pl011_probe+0x184/0x1b8 [ 3.640254] amba_probe+0xdc/0x180 [ 3.640256] really_probe+0xe0/0x338 [ 3.640257] driver_probe_device+0x60/0xf8 [ 3.640259] __device_attach_driver+0x8c/0xd0 [ 3.640260] bus_for_each_drv+0x84/0xd8 [ 3.640261] __device_attach+0xe4/0x140 [ 3.640263] device_initial_probe+0x1c/0x28 [ 3.640265] bus_probe_device+0xa4/0xb0 [ 3.640266] deferred_probe_work_func+0x7c/0xb8 [ 3.640269] process_one_work+0x2c0/0x768 [ 3.640271] worker_thread+0x4c/0x498 [ 3.640272] kthread+0x14c/0x158 [ 3.640275] ret_from_fork+0x10/0x1c
Which seems to be due to the fact that after allocating the uap structure, nothing initializes the spinlock.
Its a little confusing, as uart_port_spin_lock_init() is one place where the lock is supposed to be initialized, but it has an exception for the case where the port is a console.
This makes it seem like a deeper fix is needed to properly register the console, but I'm not sure what that entails, and Andy suggested that this approach is less invasive.
Thus, this patch resolves the issue by initializing the spinlock in the driver, and resolves the resulting warning.
--- drivers/tty/serial/amba-pl011.c | 1 + 1 file changed, 1 insertion(+)
drivers/tty/serial/amba-pl011.c +1 -0
@@ -2585,6 +2585,7 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap, uap->port.fifosize = uap->fifosize; uap->port.flags =UPF_BOOT_AUTOCONF ; uap->port.line = index; +spin_lock_init (&uap->port.lock); amba_ports[index] = uap;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 124/266 PCI: rcar: Fix incorrect programming of OB windows
In reply to Sasha LevinFrom: Andrew Murray <[email protected]>
[ Upstream commit 2b9f217433e31d125fb697ca7974d3de3ecc3e92 ]
The outbound windows (PCIEPAUR(x), PCIEPALR(x)) describe a mapping between a CPU address (which is determined by the window number 'x') and a programmed PCI address - Thus allowing the controller to translate CPU accesses into PCI accesses.
However the existing code incorrectly writes the CPU address - lets fix this by writing the PCI address instead.
For memory transactions, existing DT users describe a 1:1 identity mapping and thus this change should have no effect. However the same isn't true for I/O.
--- drivers/pci/controller/pcie-rcar.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pci/controller/pcie-rcar.c +5 -4
@@ -335,11 +335,12 @@ static struct pci_ops rcar_pcie_ops = { };static void rcar_pcie_setup_window (int win,struct rcar_pcie *pcie, -struct resource *res) +struct resource_entry *window) {/* Setup PCIe address space mappings for each resource */ resource_size_t size;resource_size_t res_start; +struct resource *res = window->res;u32 mask;rcar_pci_write_reg (pcie,0x00000000 ,PCIEPTCTLR (win));
@@ -353,9 +354,9 @@ static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie,rcar_pci_write_reg (pcie, mask <<7 ,PCIEPAMR (win));if (res->flags &IORESOURCE_IO ) - res_start =pci_pio_to_address (res->start); + res_start =pci_pio_to_address (res->start) - window->offset;else - res_start = res->start; + res_start = res->start - window->offset;rcar_pci_write_reg (pcie,upper_32_bits (res_start),PCIEPAUR (win)); rcar_pci_write_reg(pcie, lower_32_bits(res_start) & ~0x7F,
@@ -384,7 +385,7 @@ static int rcar_pcie_setup(struct list_head *resource, struct rcar_pcie *pci)switch (resource_type (res)) {case IORESOURCE_IO :case IORESOURCE_MEM : -rcar_pcie_setup_window (i, pci, res); +rcar_pcie_setup_window (i, pci, win); i++;break ;case IORESOURCE_BUS :
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 120/266 PCI: v3-semi: Fix a memory leak in v3_pci_probe() error handling paths
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit bca718988b9008d0d5f504e2d318178fc84958c1 ]
If we fails somewhere in 'v3_pci_probe()', we need to free 'host'.
Use the managed version of 'pci_alloc_host_bridge()' to do that easily. The use of managed resources is already widely used in this driver.
--- drivers/pci/controller/pci-v3-semi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pci-v3-semi.c +1 -1
@@ -743,7 +743,7 @@ static int v3_pci_probe(struct platform_device *pdev)int ret;LIST_HEAD (res); - host =pci_alloc_host_bridge (sizeof (*v3)); + host =devm_pci_alloc_host_bridge (dev,sizeof (*v3));if (!host)return -ENOMEM ;
Signature · 1 line
2.25.1