drm/imx: ignore plane updates on disabled crtcs
Subsystems (17)
Sasha Levin
maintainerPATCH 1/52 drm/imx: ignore plane updates on disabled crtcs
From: Philipp Zabel <[email protected]>
[ Upstream commit 4fb873c9648e383206e0a91cef9b03aa54066aca ]
This patch fixes backtraces like the following when sending SIGKILL to a process with a currently pending plane update:
[drm:ipu_plane_atomic_check] CRTC should be enabled
[drm:drm_framebuffer_remove] *ERROR* failed to commit
------------[ cut here ]------------
WARNING: CPU: 3 PID: 63 at drivers/gpu/drm/drm_framebuffer.c:926 drm_framebuffer_remove+0x47c/0x498 atomic remove_fb failed with -22
--- drivers/gpu/drm/imx/ipuv3-plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/ipuv3-plane.c +2 -2
@@ -372,9 +372,9 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,if (ret)return ret; -/* CRTC should be enabled */ +/* nothing to check when disabling or disabled */ if (!crtc_state->enable) -return -EINVAL ; +return 0 ;switch (plane->type) {case DRM_PLANE_TYPE_PRIMARY :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 2/52 gpu: ipu-v3: Fix i.MX51 CSI control registers offset
From: Alexander Shiyan <[email protected]>
[ Upstream commit 2c0408dd0d8906b26fe8023889af7adf5e68b2c2 ]
The CSI0/CSI1 registers offset is at +0xe030000/+0xe038000 relative to the control module registers on IPUv3EX.
This patch fixes wrong values for i.MX51 CSI0/CSI1.
--- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/ipu-v3/ipu-common.c +2 -2
@@ -898,8 +898,8 @@ static struct ipu_devtype ipu_type_imx51 = { .cpmem_ofs = 0x1f000000, .srm_ofs = 0x1f040000, .tpm_ofs = 0x1f060000, - .csi0_ofs = 0x1f030000, - .csi1_ofs = 0x1f038000, + .csi0_ofs = 0x1e030000, + .csi1_ofs = 0x1e038000, .ic_ofs = 0x1e020000, .disp0_ofs = 0x1e040000, .disp1_ofs = 0x1e048000,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 3/52 drm/imx: imx-ldb: add missing of_node_puts
In reply to Sasha LevinFrom: Julia Lawall <[email protected]>
[ Upstream commit aa3312012f103f91f123600bbf768b11c8f431bc ]
The device node iterators perform an of_node_get on each iteration, so a jump out of the loop requires an of_node_put.
Move the initialization channel->child = child; down to just before the call to imx_ldb_register so that intervening failures don't need to clear it. Add a label at the end of the function to do all the of_node_puts.
The semantic patch that finds part of this problem is as follows
(http://coccinelle.lip6.fr):
// <smpl>
@@
expression root,e;
local idexpression child;
iterator name for_each_child_of_node;
@@
for_each_child_of_node(root, child) {
... when != of_node_put(child)
when != e = child
(
return child;
|
* return ...;
)
...
}
// </smpl>
--- drivers/gpu/drm/imx/imx-ldb.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/gpu/drm/imx/imx-ldb.c +17 -8
@@ -651,8 +651,10 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)int bus_format; ret =of_property_read_u32 (child,"reg" , &i); -if (ret || i <0 || i >1 ) -return -EINVAL ; +if (ret || i <0 || i >1 ) { + ret = -EINVAL ; + goto free_child; + }if (!of_device_is_available (child))continue ;
@@ -665,7 +667,6 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) channel = &imx_ldb->channel[i]; channel->ldb = imx_ldb; channel->chno = i; - channel->child = child;/* * The output port is port@4 with an external 4-port mux or
@@ -675,13 +676,13 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) imx_ldb->lvds_mux ?4 :2 ,0 , &channel->panel, &channel->bridge);if (ret && ret != -ENODEV ) -return ret; + goto free_child;/* panel ddc only if there is no bridge */ if (!channel->bridge) { ret =imx_ldb_panel_ddc (dev, channel, child);if (ret) -return ret; + goto free_child; } bus_format =of_get_bus_format (dev, child);
@@ -697,18 +698,26 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data)if (bus_format <0 ) {dev_err (dev,"could not determine data mapping: %d\n" , bus_format); -return bus_format; + ret = bus_format; + goto free_child; } channel->bus_format = bus_format; + channel->child = child; ret =imx_ldb_register (drm, channel); -if (ret) -return ret; +if (ret) { + channel->child =NULL ; + goto free_child; + } }dev_set_drvdata (dev, imx_ldb);return 0 ; + +free_child: +of_node_put (child); +return ret; } static void imx_ldb_unbind(struct device *dev, struct device *master,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 4/52 gpu: ipu-v3: Fix CSI offsets for imx53
In reply to Sasha LevinFrom: Steve Longerbeam <[email protected]>
[ Upstream commit bb867d219fda7fbaabea3314702474c4eac2b91d ]
The CSI offsets are wrong for both CSI0 and CSI1. They are at physical address 0x1e030000 and 0x1e038000 respectively.
--- drivers/gpu/ipu-v3/ipu-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/ipu-v3/ipu-common.c +2 -2
@@ -914,8 +914,8 @@ static struct ipu_devtype ipu_type_imx53 = { .cpmem_ofs = 0x07000000, .srm_ofs = 0x07040000, .tpm_ofs = 0x07060000, - .csi0_ofs = 0x07030000, - .csi1_ofs = 0x07038000, + .csi0_ofs = 0x06030000, + .csi1_ofs = 0x06038000, .ic_ofs = 0x06020000, .disp0_ofs = 0x06040000, .disp1_ofs = 0x06048000,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 5/52 ASoC: rt5682: Correct the setting while select ASRC clk for AD/DA filter
In reply to Sasha LevinFrom: Shuming Fan <[email protected]>
[ Upstream commit 8077ec011b1ea26abb7ca786f28ecccfb352717f ]
AD/DA ASRC function control two ASRC clock sources separately. Whether AD/DA filter select which clock source, we enable AD/DA ASRC function for all cases.
--- sound/soc/codecs/rt5682.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
@@ -1778,7 +1778,9 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = { {"ADC Stereo1 Filter", NULL, "ADC STO1 ASRC", is_using_asrc}, {"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc}, {"ADC STO1 ASRC", NULL, "AD ASRC"}, + {"ADC STO1 ASRC", NULL, "DA ASRC"}, {"ADC STO1 ASRC", NULL, "CLKDET"}, + {"DAC STO1 ASRC", NULL, "AD ASRC"}, {"DAC STO1 ASRC", NULL, "DA ASRC"}, {"DAC STO1 ASRC", NULL, "CLKDET"},
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 6/52 clocksource: timer-ti-dm: Fix pwm dmtimer usage of fck reparenting
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 983a5a43ec254cd5ddf3254db80ca96e8f8bb2a4 ]
Commit 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") moved some omap4 timers to probe with ti-sysc interconnect target module. Turns out this broke pwm-omap-dmtimer where we now try to reparent the clock to itself with the following:
omap_dm_timer_of_set_source: failed to set parent
With ti-sysc, we can now configure the clock sources in the dts with assigned-clocks and assigned-clock-parents. So we should be able to remove omap_dm_timer_of_set_source with clean-up patches later on. But for now, let's just fix it first by checking if parent and fck are the same and bail out of so.
--- drivers/clocksource/timer-ti-dm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clocksource/timer-ti-dm.c +4 -0
@@ -154,6 +154,10 @@ static int omap_dm_timer_of_set_source(struct omap_dm_timer *timer)if (IS_ERR (parent))return -ENODEV ; +/* Bail out if both clocks point to fck */ +if (clk_is_match (parent, timer->fclk)) +return 0 ; + ret =clk_set_parent (timer->fclk, parent);if (ret <0 )pr_err ("%s: failed to set parent\n" , __func__);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 7/52 KVM: arm/arm64: vgic: Make vgic_dist->lpi_list_lock a raw_spinlock
In reply to Sasha LevinFrom: Julien Thierry <[email protected]>
[ Upstream commit fc3bc475231e12e9c0142f60100cf84d077c79e1 ]
vgic_dist->lpi_list_lock must always be taken with interrupts disabled as it is used in interrupt context.
For configurations such as PREEMPT_RT_FULL, this means that it should be a raw_spinlock since RT spinlocks are interruptible.
--- include/kvm/arm_vgic.h | 2 +- virt/kvm/arm/vgic/vgic-init.c | 2 +- virt/kvm/arm/vgic/vgic-its.c | 8 ++++---- virt/kvm/arm/vgic/vgic.c | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-)
include/kvm/arm_vgic.h +1 -1
@@ -256,7 +256,7 @@ struct vgic_dist {u64 propbaser;/* Protects the lpi_list and the count value below. */ -spinlock_t lpi_list_lock; +raw_spinlock_t lpi_list_lock;struct list_head lpi_list_head;int lpi_list_count;
virt/kvm/arm/vgic/vgic-init.c +1 -1
@@ -64,7 +64,7 @@ void kvm_vgic_early_init(struct kvm *kvm)struct vgic_dist *dist = &kvm->arch.vgic;INIT_LIST_HEAD (&dist->lpi_list_head); -spin_lock_init (&dist->lpi_list_lock); +raw_spin_lock_init (&dist->lpi_list_lock); }/* CREATION */
virt/kvm/arm/vgic/vgic-its.c +4 -4
@@ -73,7 +73,7 @@ static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid, irq->target_vcpu = vcpu; irq->group =1 ; -spin_lock_irqsave (&dist->lpi_list_lock, flags); +raw_spin_lock_irqsave (&dist->lpi_list_lock, flags);/* * There could be a race with another vgic_add_lpi(), so we need to
@@ -101,7 +101,7 @@ static struct vgic_irq *vgic_add_lpi(struct kvm *kvm, u32 intid, dist->lpi_list_count++; out_unlock: -spin_unlock_irqrestore (&dist->lpi_list_lock, flags); +raw_spin_unlock_irqrestore (&dist->lpi_list_lock, flags);/* * We "cache" the configuration table entries in our struct vgic_irq's.
@@ -332,7 +332,7 @@ int vgic_copy_lpi_list(struct kvm *kvm, struct kvm_vcpu *vcpu, u32 **intid_ptr)if (!intids)return -ENOMEM ; -spin_lock_irqsave (&dist->lpi_list_lock, flags); +raw_spin_lock_irqsave (&dist->lpi_list_lock, flags);list_for_each_entry (irq, &dist->lpi_list_head, lpi_list) {if (i == irq_count)break ;
@@ -341,7 +341,7 @@ int vgic_copy_lpi_list(struct kvm *kvm, struct kvm_vcpu *vcpu, u32 **intid_ptr)continue ; intids[i++] = irq->intid; } -spin_unlock_irqrestore (&dist->lpi_list_lock, flags); +raw_spin_unlock_irqrestore (&dist->lpi_list_lock, flags); *intid_ptr = intids;return i;
virt/kvm/arm/vgic/vgic.c +5 -5
@@ -72,7 +72,7 @@ static struct vgic_irq *vgic_get_lpi(struct kvm *kvm, u32 intid)struct vgic_irq *irq =NULL ;unsigned long flags; -spin_lock_irqsave (&dist->lpi_list_lock, flags); +raw_spin_lock_irqsave (&dist->lpi_list_lock, flags);list_for_each_entry (irq, &dist->lpi_list_head, lpi_list) {if (irq->intid != intid)
@@ -88,7 +88,7 @@ static struct vgic_irq *vgic_get_lpi(struct kvm *kvm, u32 intid) irq =NULL ; out_unlock: -spin_unlock_irqrestore (&dist->lpi_list_lock, flags); +raw_spin_unlock_irqrestore (&dist->lpi_list_lock, flags);return irq; }
@@ -138,15 +138,15 @@ void vgic_put_irq(struct kvm *kvm, struct vgic_irq *irq)if (irq->intid <VGIC_MIN_LPI )return ; -spin_lock_irqsave (&dist->lpi_list_lock, flags); +raw_spin_lock_irqsave (&dist->lpi_list_lock, flags);if (!kref_put (&irq->refcount, vgic_irq_release)) { -spin_unlock_irqrestore (&dist->lpi_list_lock, flags); +raw_spin_unlock_irqrestore (&dist->lpi_list_lock, flags);return ; };list_del (&irq->lpi_list); dist->lpi_list_count--; -spin_unlock_irqrestore (&dist->lpi_list_lock, flags); +raw_spin_unlock_irqrestore (&dist->lpi_list_lock, flags);kfree (irq); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 8/52 arm64: dts: rockchip: fix graph_port warning on rk3399 bob kevin and excavator
In reply to Sasha LevinFrom: Enric Balletbo i Serra <enric.balletbo-ZGY8ohtN/[email protected]>
[ Upstream commit 26cd8657c7e745686a4c54a5cccf721ede208a25 ]
Ports are described by child 'port' nodes contained in the device node. 'ports' is optional and is used to group all 'port' nodes which is not the case here.
This patch fixes the following warnings:
arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts:25.9-29.5: Warning (graph_port): /edp-panel/ports: graph port node name should be 'port' arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts:46.9-50.5: Warningi (graph_port): /edp-panel/ports: graph port node name should be 'port' arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts:94.9-98.5: Warning (graph_port): /edp-panel/ports: graph port node name should be 'port'
--- arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts +1 -1
@@ -22,7 +22,7 @@ backlight = <&backlight>; power-supply = <&pp3300_disp>; - ports { + port { panel_in_edp: endpoint { remote-endpoint = <&edp_out_panel>; };
arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts +1 -1
@@ -43,7 +43,7 @@ backlight = <&backlight>; power-supply = <&pp3300_disp>; - ports { + port { panel_in_edp: endpoint { remote-endpoint = <&edp_out_panel>; };
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts +1 -1
@@ -50,7 +50,7 @@ pinctrl-0 = <&lcd_panel_reset>; power-supply = <&vcc3v3_s0>; - ports { + port { panel_in_edp: endpoint { remote-endpoint = <&edp_out_panel>; };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 9/52 hwmon: (nct6775) Fix fan6 detection for NCT6793D
In reply to Sasha LevinFrom: Guenter Roeck <[email protected]>
[ Upstream commit 2a2ec4aa0577ec0b7df2d1bde5c84ed39a8637cb ]
Commit 2d99925a15b6 ("hwmon: (nct6775) Separate fan/pwm configuration detection for NCT6793D") accidentally removed part of the code detecting if fan6 is enabled or not. As result, fan6 is no longer detected on Asus PRIME Z370-A. Restore the missing detection code.
--- drivers/hwmon/nct6775.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwmon/nct6775.c +2 -1
@@ -3594,7 +3594,8 @@ nct6775_check_fan_inputs(struct nct6775_data *data) fan5pin |= cr1b &BIT (5 ); fan5pin |= creb &BIT (5 ); - fan6pin = creb &BIT (3 ); + fan6pin = !dsw_en && (cr2d &BIT (1 )); + fan6pin |= creb &BIT (3 ); pwm5pin |= cr2d &BIT (7 ); pwm5pin |= (creb &BIT (4 )) && !(cr2a &BIT (0 ));
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 10/52 s390/dasd: fix using offset into zero size array error
In reply to Sasha LevinFrom: Stefan Haberland <[email protected]>
[ Upstream commit 4a8ef6999bce998fa5813023a9a6b56eea329dba ]
Dan Carpenter reported the following:
The patch 52898025cf7d: "[S390] dasd: security and PSF update patch for EMC CKD ioctl" from Mar 8, 2010, leads to the following static checker warning:
drivers/s390/block/dasd_eckd.c:4486 dasd_symm_io() error: using offset into zero size array 'psf_data[]'
drivers/s390/block/dasd_eckd.c
4458 /* Copy parms from caller */
4459 rc = -EFAULT;
4460 if (copy_from_user(&usrparm, argp, sizeof(usrparm)))
^^^^^^^The user can specify any "usrparm.psf_data_len". They choose zero by mistake.
4461 goto out;
4462 if (is_compat_task()) {
4463 /* Make sure pointers are sane even on 31 bit. */ 4464 rc = -EINVAL; 4465 if ((usrparm.psf_data >> 32) != 0) 4466 goto out; 4467 if ((usrparm.rssd_result >> 32) != 0) 4468 goto out; 4469 usrparm.psf_data &= 0x7fffffffULL; 4470 usrparm.rssd_result &= 0x7fffffffULL; 4471 } 4472 /* alloc I/O data area */ 4473 psf_data = kzalloc(usrparm.psf_data_len, GFP_KERNEL | GFP_DMA); 4474 rssd_result = kzalloc(usrparm.rssd_result_len, GFP_KERNEL | GFP_DMA);
4475 if (!psf_data || !rssd_result) {
kzalloc() returns a ZERO_SIZE_PTR (0x16).
4476 rc = -ENOMEM; 4477 goto out_free; 4478 } 4479 4480 /* get syscall header from user space */ 4481 rc = -EFAULT; 4482 if (copy_from_user(psf_data, 4483 (void __user *)(unsigned long) usrparm.psf_data, 4484 usrparm.psf_data_len))
That all works great.
4485 goto out_free; 4486 psf0 = psf_data[0]; 4487 psf1 = psf_data[1];
But now we're assuming that "->psf_data_len" was at least 2 bytes.
Fix this by checking the user specified length psf_data_len.
--- drivers/s390/block/dasd_eckd.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/s390/block/dasd_eckd.c +8 -0
@@ -4469,6 +4469,14 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp) usrparm.psf_data &=0x7fffffffULL ; usrparm.rssd_result &=0x7fffffffULL ; } +/* at least 2 bytes are accessed and should be allocated */ +if (usrparm.psf_data_len <2 ) { +DBF_DEV_EVENT (DBF_WARNING , device, +"Symmetrix ioctl invalid data length %d" , + usrparm.psf_data_len); + rc = -EINVAL ; + goto out; + }/* alloc I/O data area */ psf_data =kzalloc (usrparm.psf_data_len,GFP_KERNEL |GFP_DMA ); rssd_result =kzalloc (usrparm.rssd_result_len,GFP_KERNEL |GFP_DMA );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 11/52 Input: pwm-vibra - prevent unbalanced regulator
In reply to Sasha LevinFrom: Jonathan Bakker <[email protected]>
[ Upstream commit 3ca232df9921f083c3b37ba5fbc76f4d9046268b ]
pwm_vibrator_stop disables the regulator, but it can be called from multiple places, even when the regulator is already disabled. Fix this by using regulator_is_enabled check when starting and stopping device.
--- drivers/input/misc/pwm-vibra.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/input/misc/pwm-vibra.c +12 -5
@@ -34,6 +34,7 @@ struct pwm_vibrator {struct work_struct play_work;u16 level;u32 direction_duty_cycle; +bool vcc_on; };static int pwm_vibrator_start (struct pwm_vibrator *vibrator)
@@ -42,10 +43,13 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)struct pwm_state state;int err; - err =regulator_enable (vibrator->vcc); -if (err) { -dev_err (pdev,"failed to enable regulator: %d" , err); -return err; +if (!vibrator->vcc_on) { + err =regulator_enable (vibrator->vcc); +if (err) { +dev_err (pdev,"failed to enable regulator: %d" , err); +return err; + } + vibrator->vcc_on = true; }pwm_get_state (vibrator->pwm, &state);
@@ -76,7 +80,10 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)static void pwm_vibrator_stop (struct pwm_vibrator *vibrator) { -regulator_disable (vibrator->vcc); +if (vibrator->vcc_on) { +regulator_disable (vibrator->vcc); + vibrator->vcc_on = false; + }if (vibrator->pwm_dir)pwm_disable (vibrator->pwm_dir);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 12/52 Input: pwm-vibra - stop regulator after disabling pwm, not before
In reply to Sasha LevinFrom: Paweł Chmiel <[email protected]>
[ Upstream commit 94803aef3533676194c772383472636c453e3147 ]
This patch fixes order of disable calls in pwm_vibrator_stop. Currently when starting device, we first enable vcc regulator and then setup and enable pwm. When stopping, we should do this in oposite order, so first disable pwm and then disable regulator.
Previously order was the same as in start.
--- drivers/input/misc/pwm-vibra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/input/misc/pwm-vibra.c +4 -4
@@ -80,14 +80,14 @@ static int pwm_vibrator_start(struct pwm_vibrator *vibrator)static void pwm_vibrator_stop (struct pwm_vibrator *vibrator) { +if (vibrator->pwm_dir) +pwm_disable (vibrator->pwm_dir); +pwm_disable (vibrator->pwm); +if (vibrator->vcc_on) {regulator_disable (vibrator->vcc); vibrator->vcc_on = false; } - -if (vibrator->pwm_dir) -pwm_disable (vibrator->pwm_dir); -pwm_disable (vibrator->pwm); }static void pwm_vibrator_play_work (struct work_struct *work)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 13/52 ARM: dts: Configure clock parent for pwm vibra
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 0840242e887586268f665bf58d5e1a7d6ebf35ed ]
Commit 84badc5ec5fc ("ARM: dts: omap4: Move l4 child devices to probe them with ti-sysc") moved some omap4 timers to probe with ti-sysc interconnect target module. Turns out this broke pwm-omap-dmtimer for reparenting of the timer clock.
With ti-sysc, we can now configure the clock sources in the dts with assigned-clocks and assigned-clock-parents.
--- arch/arm/boot/dts/omap4-droid4-xt894.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/omap4-droid4-xt894.dts +11 -0
@@ -644,6 +644,17 @@ }; }; +/* Configure pwm clock source for timers 8 & 9 */ +&timer8 { + assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; + assigned-clock-parents = <&sys_clkin_ck>; +}; + +&timer9 { + assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; + assigned-clock-parents = <&sys_clkin_ck>; +}; + /* * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for * uart1 wakeirq.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 14/52 ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized
In reply to Sasha LevinFrom: Yizhuo <[email protected]>
[ Upstream commit dc30e70391376ba3987aeb856ae6d9c0706534f1 ]
In function omap4_dsi_mux_pads(), local variable "reg" could be uninitialized if function regmap_read() returns -EINVAL. However, it will be used directly in the later context, which is potentially unsafe.
--- arch/arm/mach-omap2/display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/display.c +6 -1
@@ -83,6 +83,7 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)u32 enable_mask, enable_shift;u32 pipd_mask, pipd_shift;u32 reg; +int ret;if (dsi_id ==0 ) { enable_mask =OMAP4_DSI1_LANEENABLE_MASK ;
@@ -98,7 +99,11 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)return -ENODEV ; } -regmap_read (omap4_dsi_mux_syscon,OMAP4_DSIPHY_SYSCON_OFFSET , ®); + ret =regmap_read (omap4_dsi_mux_syscon, +OMAP4_DSIPHY_SYSCON_OFFSET , + ®); +if (ret) +return ret; reg &= ~enable_mask; reg &= ~pipd_mask;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 15/52 ASoC: topology: fix oops/use-after-free case with dai driver
In reply to Sasha LevinFrom: Guennadi Liakhovetski <[email protected]>
[ Upstream commit 52abe6cc1866ac3d54612f5d80563e6608c0ddfc ]
rmmod/modprobe tests expose a kernel oops when accessing the dai driver pointer. This comes from the topology design which operates in multiple passes. Each object removal happens at a specific iteration, and the code checks for the iteration (order) number after the memory containing the order was freed.
Fix this be clearing a reference to the dai driver and check its validity to avoid dereferences.
--- sound/soc/soc-core.c | 2 +- sound/soc/soc-topology.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
sound/soc/soc-core.c +1 -1
@@ -951,7 +951,7 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order) {int err; -if (!dai || !dai->probed || +if (!dai || !dai->probed || !dai->driver || dai->driver->remove_order != order)return ;
sound/soc/soc-topology.c +5 -0
@@ -502,6 +502,7 @@ static void remove_dai(struct snd_soc_component *comp, {struct snd_soc_dai_driver *dai_drv = container_of(dobj, struct snd_soc_dai_driver, dobj); +struct snd_soc_dai *dai;if (pass !=SOC_TPLG_PASS_PCM_DAI )return ;
@@ -509,6 +510,10 @@ static void remove_dai(struct snd_soc_component *comp,if (dobj->ops && dobj->ops->dai_unload) dobj->ops->dai_unload (comp, dobj); +list_for_each_entry (dai, &comp->dai_list, list) +if (dai->driver == dai_drv) + dai->driver =NULL ; +kfree (dai_drv->name);list_del (&dobj->list);kfree (dai_drv);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 16/52 ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit c16e12010060c6c7a31f08b4a99513064cb53b7d ]
KASAN reports and additional traces point to out-of-bounds accesses to the dapm_up_seq and dapm_down_seq lookup tables. The indices used are larger than the array definition.
Fix by adding missing entries for the new widget types in these two lookup tables, and align them with PGA values.
Also the sequences for the following widgets were not defined. Since their values defaulted to zero, assign them explicitly
snd_soc_dapm_input
snd_soc_dapm_output
snd_soc_dapm_vmid
snd_soc_dapm_siggen
snd_soc_dapm_sink
--- sound/soc/soc-dapm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
sound/soc/soc-dapm.c +24 -0
@@ -70,12 +70,16 @@ static int dapm_up_seq[] = { [snd_soc_dapm_clock_supply] = 1, [snd_soc_dapm_supply] = 2, [snd_soc_dapm_micbias] = 3, + [snd_soc_dapm_vmid] = 3, [snd_soc_dapm_dai_link] = 2, [snd_soc_dapm_dai_in] = 4, [snd_soc_dapm_dai_out] = 4, [snd_soc_dapm_aif_in] = 4, [snd_soc_dapm_aif_out] = 4, [snd_soc_dapm_mic] = 5, + [snd_soc_dapm_siggen] = 5, + [snd_soc_dapm_input] = 5, + [snd_soc_dapm_output] = 5, [snd_soc_dapm_mux] = 6, [snd_soc_dapm_demux] = 6, [snd_soc_dapm_dac] = 7,
@@ -83,11 +87,19 @@ static int dapm_up_seq[] = { [snd_soc_dapm_mixer] = 8, [snd_soc_dapm_mixer_named_ctl] = 8, [snd_soc_dapm_pga] = 9, + [snd_soc_dapm_buffer] = 9, + [snd_soc_dapm_scheduler] = 9, + [snd_soc_dapm_effect] = 9, + [snd_soc_dapm_src] = 9, + [snd_soc_dapm_asrc] = 9, + [snd_soc_dapm_encoder] = 9, + [snd_soc_dapm_decoder] = 9, [snd_soc_dapm_adc] = 10, [snd_soc_dapm_out_drv] = 11, [snd_soc_dapm_hp] = 11, [snd_soc_dapm_spk] = 11, [snd_soc_dapm_line] = 11, + [snd_soc_dapm_sink] = 11, [snd_soc_dapm_kcontrol] = 12, [snd_soc_dapm_post] = 13, };
@@ -100,13 +112,25 @@ static int dapm_down_seq[] = { [snd_soc_dapm_spk] = 3, [snd_soc_dapm_line] = 3, [snd_soc_dapm_out_drv] = 3, + [snd_soc_dapm_sink] = 3, [snd_soc_dapm_pga] = 4, + [snd_soc_dapm_buffer] = 4, + [snd_soc_dapm_scheduler] = 4, + [snd_soc_dapm_effect] = 4, + [snd_soc_dapm_src] = 4, + [snd_soc_dapm_asrc] = 4, + [snd_soc_dapm_encoder] = 4, + [snd_soc_dapm_decoder] = 4, [snd_soc_dapm_switch] = 5, [snd_soc_dapm_mixer_named_ctl] = 5, [snd_soc_dapm_mixer] = 5, [snd_soc_dapm_dac] = 6, [snd_soc_dapm_mic] = 7, + [snd_soc_dapm_siggen] = 7, + [snd_soc_dapm_input] = 7, + [snd_soc_dapm_output] = 7, [snd_soc_dapm_micbias] = 8, + [snd_soc_dapm_vmid] = 8, [snd_soc_dapm_mux] = 9, [snd_soc_dapm_demux] = 9, [snd_soc_dapm_aif_in] = 10,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 17/52 ASoC: rsnd: fixup rsnd_ssi_master_clk_start() user count check
In reply to Sasha LevinFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit d9111d36024de07784f2e1ba2ccf70b16035f378 ]
commit 4d230d1271064 ("ASoC: rsnd: fixup not to call clk_get/set under non-atomic") added new rsnd_ssi_prepare() and moved rsnd_ssi_master_clk_start() to .prepare.
But, ssi user count (= ssi->usrcnt) is incremented at .init (= rsnd_ssi_init()).
Because of these timing exchange, ssi->usrcnt check at rsnd_ssi_master_clk_start() should be adjusted. Otherwise, 2nd master clock setup will be no check. This patch fixup this issue.
--- sound/soc/sh/rcar/ssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sh/rcar/ssi.c +1 -1
@@ -306,7 +306,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod,if (rsnd_ssi_is_multi_slave (mod, io))return 0 ; -if (ssi->usrcnt >1 ) { +if (ssi->usrcnt >0 ) {if (ssi->rate != rate) {dev_err (dev,"SSI parent/child should use same rate\n" );return -EINVAL ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 18/52 KVM: arm/arm64: Reset the VCPU without preemption and vcpu state loaded
In reply to Sasha LevinFrom: Christoffer Dall <[email protected]>
[ Upstream commit e761a927bc9a7ee6ceb7c4f63d5922dbced87f0d ]
We have two ways to reset a vcpu:
- either through VCPU_INIT
- or through a PSCI_ON call
The first one is easy to reason about. The second one is implemented in a more bizarre way, as it is the vcpu that handles PSCI_ON that resets the vcpu that is being powered-on. As we need to turn the logic around and have the target vcpu to reset itself, we must take some preliminary steps.
Resetting the VCPU state modifies the system register state in memory, but this may interact with vcpu_load/vcpu_put if running with preemption disabled, which in turn may lead to corrupted system register state.
Address this by disabling preemption and doing put/load if required around the reset logic.
--- arch/arm64/kvm/reset.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
arch/arm64/kvm/reset.c +24 -2
@@ -105,16 +105,33 @@ int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext)* This function finds the right table above and sets the registers on * the virtual CPU struct to their architecturally defined reset * values. +* +* Note: This function can be called from two paths: The KVM_ARM_VCPU_INIT +* ioctl or as part of handling a request issued by another VCPU in the PSCI +* handling code. In the first case, the VCPU will not be loaded, and in the +* second case the VCPU will be loaded. Because this function operates purely +* on the memory-backed valus of system registers, we want to do a full put if +* we were loaded (handling a request) and load the values back at the end of +* the function. Otherwise we leave the state alone. In both cases, we +* disable preemption around the vcpu reset as we would otherwise race with +* preempt notifiers which also call put/load. */ int kvm_reset_vcpu (struct kvm_vcpu *vcpu) {const struct kvm_regs *cpu_reset; +int ret = -EINVAL ; +bool loaded; + +preempt_disable (); + loaded = (vcpu->cpu !=-1 ); +if (loaded) +kvm_arch_vcpu_put (vcpu);switch (vcpu->arch.target) {default :if (test_bit (KVM_ARM_VCPU_EL1_32BIT , vcpu->arch.features)) {if (!cpu_has_32bit_el1 ()) -return -EINVAL ; + goto out; cpu_reset = &default_regs_reset32; }else { cpu_reset = &default_regs_reset;
@@ -137,7 +154,12 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) vcpu->arch.workaround_flags |=VCPU_WORKAROUND_2_FLAG ;/* Reset timer */ -return kvm_timer_vcpu_reset (vcpu); + ret =kvm_timer_vcpu_reset (vcpu); +out: +if (loaded) +kvm_arch_vcpu_load (vcpu,smp_processor_id ()); +preempt_enable (); +return ret; }void kvm_set_ipa_limit (void )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 19/52 arm/arm64: KVM: Allow a VCPU to fully reset itself
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 358b28f09f0ab074d781df72b8a671edb1547789 ]
The current kvm_psci_vcpu_on implementation will directly try to manipulate the state of the VCPU to reset it. However, since this is not done on the thread that runs the VCPU, we can end up in a strangely corrupted state when the source and target VCPUs are running at the same time.
Fix this by factoring out all reset logic from the PSCI implementation and forwarding the required information along with a request to the target VCPU.
--- arch/arm/include/asm/kvm_host.h | 10 +++++++++ arch/arm/kvm/reset.c | 24 +++++++++++++++++++++ arch/arm64/include/asm/kvm_host.h | 11 ++++++++++ arch/arm64/kvm/reset.c | 24 +++++++++++++++++++++ virt/kvm/arm/arm.c | 10 +++++++++ virt/kvm/arm/psci.c | 36 ++++++++++++++----------------- 6 files changed, 95 insertions(+), 20 deletions(-)
arch/arm/include/asm/kvm_host.h +10 -0
@@ -48,6 +48,7 @@#define KVM_REQ_SLEEP \ KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_IRQ_PENDING KVM_ARCH_REQ(1) +#define KVM_REQ_VCPU_RESET KVM_ARCH_REQ(2)DECLARE_STATIC_KEY_FALSE (userspace_irqchip_in_use);
@@ -147,6 +148,13 @@ struct kvm_cpu_context {typedef struct kvm_cpu_context kvm_cpu_context_t ; +struct vcpu_reset_state { +unsigned long pc; +unsigned long r0; +bool be; +bool reset; +}; +struct kvm_vcpu_arch {struct kvm_cpu_context ctxt;
@@ -186,6 +194,8 @@ struct kvm_vcpu_arch {/* Cache some mmu pages needed inside spinlock regions */ struct kvm_mmu_memory_cache mmu_page_cache; +struct vcpu_reset_state reset_state; +/* Detect first run of a vcpu */ bool has_run_once; };
arch/arm/kvm/reset.c +24 -0
@@ -26,6 +26,7 @@#include <asm/cputype.h> #include <asm/kvm_arm.h> #include <asm/kvm_coproc.h> +#include <asm/kvm_emulate.h> #include <kvm/arm_arch_timer.h>
@@ -69,6 +70,29 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)/* Reset CP15 registers */ kvm_reset_coprocs (vcpu); +/* +* Additional reset state handling that PSCI may have imposed on us. +* Must be done after all the sys_reg reset. +*/ +if (READ_ONCE (vcpu->arch.reset_state.reset)) { +unsigned long target_pc = vcpu->arch.reset_state.pc; + +/* Gracefully handle Thumb2 entry point */ +if (target_pc &1 ) { + target_pc &= ~1UL ; +vcpu_set_thumb (vcpu); + } + +/* Propagate caller endianness */ +if (vcpu->arch.reset_state.be) +kvm_vcpu_set_be (vcpu); + + *vcpu_pc (vcpu) = target_pc; +vcpu_set_reg (vcpu,0 , vcpu->arch.reset_state.r0); + + vcpu->arch.reset_state.reset = false; + } +/* Reset arch_timer context */ return kvm_timer_vcpu_reset (vcpu); }
arch/arm64/include/asm/kvm_host.h +11 -0
@@ -48,6 +48,7 @@#define KVM_REQ_SLEEP \ KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_IRQ_PENDING KVM_ARCH_REQ(1) +#define KVM_REQ_VCPU_RESET KVM_ARCH_REQ(2)DECLARE_STATIC_KEY_FALSE (userspace_irqchip_in_use);
@@ -208,6 +209,13 @@ struct kvm_cpu_context {typedef struct kvm_cpu_context kvm_cpu_context_t ; +struct vcpu_reset_state { +unsigned long pc; +unsigned long r0; +bool be; +bool reset; +}; +struct kvm_vcpu_arch {struct kvm_cpu_context ctxt;
@@ -297,6 +305,9 @@ struct kvm_vcpu_arch {/* Virtual SError ESR to restore when HCR_EL2.VSE is set */ u64 vsesr_el2; +/* Additional reset state */ +struct vcpu_reset_state reset_state; +/* True when deferrable sysregs are loaded on the physical CPU, * see kvm_vcpu_load_sysregs and kvm_vcpu_put_sysregs. */ bool sysregs_loaded_on_cpu;
arch/arm64/kvm/reset.c +24 -0
@@ -32,6 +32,7 @@#include <asm/kvm_arm.h> #include <asm/kvm_asm.h> #include <asm/kvm_coproc.h> +#include <asm/kvm_emulate.h> #include <asm/kvm_mmu.h> /* Maximum phys_shift supported for any VM on this host */
@@ -146,6 +147,29 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)/* Reset system registers */ kvm_reset_sys_regs (vcpu); +/* +* Additional reset state handling that PSCI may have imposed on us. +* Must be done after all the sys_reg reset. +*/ +if (vcpu->arch.reset_state.reset) { +unsigned long target_pc = vcpu->arch.reset_state.pc; + +/* Gracefully handle Thumb2 entry point */ +if (vcpu_mode_is_32bit (vcpu) && (target_pc &1 )) { + target_pc &= ~1UL ; +vcpu_set_thumb (vcpu); + } + +/* Propagate caller endianness */ +if (vcpu->arch.reset_state.be) +kvm_vcpu_set_be (vcpu); + + *vcpu_pc (vcpu) = target_pc; +vcpu_set_reg (vcpu,0 , vcpu->arch.reset_state.r0); + + vcpu->arch.reset_state.reset = false; + } +/* Reset PMU */ kvm_pmu_vcpu_reset (vcpu);
virt/kvm/arm/arm.c +10 -0
@@ -626,6 +626,13 @@ static void vcpu_req_sleep(struct kvm_vcpu *vcpu)/* Awaken to handle a signal, request we sleep again later. */ kvm_make_request (KVM_REQ_SLEEP , vcpu); } + +/* +* Make sure we will observe a potential reset request if we've +* observed a change to the power state. Pairs with the smp_wmb() in +* kvm_psci_vcpu_on(). +*/ +smp_rmb (); }static int kvm_vcpu_initialized (struct kvm_vcpu *vcpu)
@@ -639,6 +646,9 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu)if (kvm_check_request (KVM_REQ_SLEEP , vcpu))vcpu_req_sleep (vcpu); +if (kvm_check_request (KVM_REQ_VCPU_RESET , vcpu)) +kvm_reset_vcpu (vcpu); +/* * Clear IRQ_PENDING requests that were made to guarantee * that a VCPU sees new virtual interrupts.
virt/kvm/arm/psci.c +16 -20
@@ -104,12 +104,10 @@ static void kvm_psci_vcpu_off(struct kvm_vcpu *vcpu)static unsigned long kvm_psci_vcpu_on (struct kvm_vcpu *source_vcpu) { +struct vcpu_reset_state *reset_state;struct kvm *kvm = source_vcpu->kvm;struct kvm_vcpu *vcpu =NULL ; -struct swait_queue_head *wq;unsigned long cpu_id; -unsigned long context_id; -phys_addr_t target_pc; cpu_id =smccc_get_arg1 (source_vcpu) &MPIDR_HWID_BITMASK ;if (vcpu_mode_is_32bit (source_vcpu))
@@ -130,32 +128,30 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)return PSCI_RET_INVALID_PARAMS ; } - target_pc =smccc_get_arg2 (source_vcpu); - context_id =smccc_get_arg3 (source_vcpu); + reset_state = &vcpu->arch.reset_state; -kvm_reset_vcpu (vcpu); - -/* Gracefully handle Thumb2 entry point */ -if (vcpu_mode_is_32bit (vcpu) && (target_pc &1 )) { - target_pc &= ~((phys_addr_t )1 ); -vcpu_set_thumb (vcpu); - } + reset_state->pc =smccc_get_arg2 (source_vcpu);/* Propagate caller endianness */ -if (kvm_vcpu_is_be (source_vcpu)) -kvm_vcpu_set_be (vcpu); + reset_state->be =kvm_vcpu_is_be (source_vcpu); - *vcpu_pc (vcpu) = target_pc;/* * NOTE: We always update r0 (or x0) because for PSCI v0.1 * the general puspose registers are undefined upon CPU_ON. */ -smccc_set_retval (vcpu, context_id,0 ,0 ,0 ); - vcpu->arch.power_off = false; -smp_mb ();/* Make sure the above is visible */ + reset_state->r0 =smccc_get_arg3 (source_vcpu); + +WRITE_ONCE (reset_state->reset, true); +kvm_make_request (KVM_REQ_VCPU_RESET , vcpu); - wq =kvm_arch_vcpu_wq (vcpu); -swake_up_one (wq); +/* +* Make sure the reset request is observed if the change to +* power_state is observed. +*/ +smp_wmb (); + + vcpu->arch.power_off = false; +kvm_vcpu_wake_up (vcpu);return PSCI_RET_SUCCESS ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 20/52 arm/arm64: KVM: Don't panic on failure to properly reset system registers
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 20589c8cc47dce5854c8bf1b44a9fc63d798d26d ]
Failing to properly reset system registers is pretty bad. But not quite as bad as bringing the whole machine down... So warn loudly, but slightly more gracefully.
--- arch/arm/kvm/coproc.c | 4 ++-- arch/arm64/kvm/sys_regs.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/kvm/coproc.c +2 -2
@@ -1450,6 +1450,6 @@ void kvm_reset_coprocs(struct kvm_vcpu *vcpu)reset_coproc_regs (vcpu, table, num);for (num =1 ; num <NR_CP15_REGS ; num++) -if (vcpu_cp15 (vcpu, num) ==0x42424242 ) -panic ("Didn't reset vcpu_cp15(vcpu, %zi)" , num); +WARN (vcpu_cp15 (vcpu, num) ==0x42424242 , +"Didn't reset vcpu_cp15(vcpu, %zi)" , num); }
arch/arm64/kvm/sys_regs.c +5 -3
@@ -2586,7 +2586,9 @@ void kvm_reset_sys_regs(struct kvm_vcpu *vcpu) table =get_target_table (vcpu->arch.target, true, &num);reset_sys_reg_descs (vcpu, table, num); -for (num =1 ; num <NR_SYS_REGS ; num++) -if (__vcpu_sys_reg (vcpu, num) ==0x4242424242424242 ) -panic ("Didn't reset __vcpu_sys_reg(%zi)" , num); +for (num =1 ; num <NR_SYS_REGS ; num++) { +if (WARN (__vcpu_sys_reg (vcpu, num) ==0x4242424242424242 , +"Didn't reset __vcpu_sys_reg(%zi)\n" , num)) +break ; + } }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 21/52 KVM: arm/arm64: vgic: Always initialize the group of private IRQs
In reply to Sasha LevinFrom: Christoffer Dall <[email protected]>
[ Upstream commit ab2d5eb03dbb7b37a1c6356686fb48626ab0c93e ]
We currently initialize the group of private IRQs during kvm_vgic_vcpu_init, and the value of the group depends on the GIC model we are emulating. However, CPUs created before creating (and initializing) the VGIC might end up with the wrong group if the VGIC is created as GICv3 later.
Since we have no enforced ordering of creating the VGIC and creating VCPUs, we can end up with part the VCPUs being properly intialized and the remaining incorrectly initialized. That also means that we have no single place to do the per-cpu data structure initialization which depends on knowing the emulated GIC model (which is only the group field).
This patch removes the incorrect comment from kvm_vgic_vcpu_init and initializes the group of all previously created VCPUs's private interrupts in vgic_init in addition to the existing initialization in kvm_vgic_vcpu_init.
--- virt/kvm/arm/vgic/vgic-init.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
virt/kvm/arm/vgic/vgic-init.c +14 -8
@@ -231,13 +231,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu) irq->config =VGIC_CONFIG_LEVEL ; } -/* -* GICv3 can only be created via the KVM_DEVICE_CREATE API and -* so we always know the emulation type at this point as it's -* either explicitly configured as GICv3, or explicitly -* configured as GICv2, or not configured yet which also -* implies GICv2. -*/ if (dist->vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) irq->group =1 ;else
@@ -281,7 +274,7 @@ int vgic_init(struct kvm *kvm) {struct vgic_dist *dist = &kvm->arch.vgic;struct kvm_vcpu *vcpu; -int ret =0 , i; +int ret =0 , i, idx;if (vgic_initialized (kvm))return 0 ;
@@ -298,6 +291,19 @@ int vgic_init(struct kvm *kvm)if (ret) goto out; +/* Initialize groups on CPUs created before the VGIC type was known */ +kvm_for_each_vcpu (idx, vcpu, kvm) { +struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu; + +for (i =0 ; i <VGIC_NR_PRIVATE_IRQS ; i++) { +struct vgic_irq *irq = &vgic_cpu->private_irqs[i]; +if (dist->vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V3 ) + irq->group =1 ; +else + irq->group =0 ; + } + } +if (vgic_has_its (kvm)) { ret =vgic_v4_init (kvm);if (ret)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 22/52 KVM: arm64: Forbid kprobing of the VHE world-switch code
In reply to Sasha LevinFrom: James Morse <[email protected]>
[ Upstream commit 7d82602909ed9c73b34ad26f05d10db4850a4f8c ]
On systems with VHE the kernel and KVM's world-switch code run at the same exception level. Code that is only used on a VHE system does not need to be annotated as __hyp_text as it can reside anywhere in the kernel text.
__hyp_text was also used to prevent kprobes from patching breakpoint instructions into this region, as this code runs at a different exception level. While this is no longer true with VHE, KVM still switches VBAR_EL1, meaning a kprobe's breakpoint executed in the world-switch code will cause a hyp-panic.
echo "p:weasel sysreg_save_guest_state_vhe" > /sys/kernel/debug/tracing/kprobe_events echo 1 > /sys/kernel/debug/tracing/events/kprobes/weasel/enable
lkvm run -k /boot/Image --console serial -p "console=ttyS0 earlycon=uart,mmio,0x3f8"
# lkvm run -k /boot/Image -m 384 -c 3 --name guest-1474 Info: Placing fdt at 0x8fe00000 - 0x8fffffff Info: virtio-mmio.devices=0x200@0x10000:36
Info: virtio-mmio.devices=0x200@0x10200:37
Info: virtio-mmio.devices=0x200@0x10400:38
[ 614.178186] Kernel panic - not syncing: HYP panic: [ 614.178186] PS:404003c9 PC:ffff0000100d70e0 ESR:f2000004 [ 614.178186] FAR:0000000080080000 HPFAR:0000000000800800 PAR:1d00007edbadc0de [ 614.178186] VCPU:00000000f8de32f1 [ 614.178383] CPU: 2 PID: 1482 Comm: kvm-vcpu-0 Not tainted 5.0.0-rc2 #10799 [ 614.178446] Call trace: [ 614.178480] dump_backtrace+0x0/0x148 [ 614.178567] show_stack+0x24/0x30 [ 614.178658] dump_stack+0x90/0xb4 [ 614.178710] panic+0x13c/0x2d8 [ 614.178793] hyp_panic+0xac/0xd8 [ 614.178880] kvm_vcpu_run_vhe+0x9c/0xe0 [ 614.178958] kvm_arch_vcpu_ioctl_run+0x454/0x798 [ 614.179038] kvm_vcpu_ioctl+0x360/0x898 [ 614.179087] do_vfs_ioctl+0xc4/0x858 [ 614.179174] ksys_ioctl+0x84/0xb8 [ 614.179261] __arm64_sys_ioctl+0x28/0x38 [ 614.179348] el0_svc_common+0x94/0x108 [ 614.179401] el0_svc_handler+0x38/0x78 [ 614.179487] el0_svc+0x8/0xc [ 614.179558] SMP: stopping secondary CPUs [ 614.179661] Kernel Offset: disabled [ 614.179695] CPU features: 0x003,2a80aa38 [ 614.179758] Memory Limit: none [ 614.179858] ---[ end Kernel panic - not syncing: HYP panic: [ 614.179858] PS:404003c9 PC:ffff0000100d70e0 ESR:f2000004 [ 614.179858] FAR:0000000080080000 HPFAR:0000000000800800 PAR:1d00007edbadc0de [ 614.179858] VCPU:00000000f8de32f1 ]---
Annotate the VHE world-switch functions that aren't marked __hyp_text using NOKPROBE_SYMBOL().
--- arch/arm64/kvm/hyp/switch.c | 5 +++++ arch/arm64/kvm/hyp/sysreg-sr.c | 5 +++++ 2 files changed, 10 insertions(+)
arch/arm64/kvm/hyp/switch.c +5 -0
@@ -23,6 +23,7 @@#include <kvm/arm_psci.h> #include <asm/cpufeature.h> +#include <asm/kprobes.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> #include <asm/kvm_host.h>
@@ -107,6 +108,7 @@ static void activate_traps_vhe(struct kvm_vcpu *vcpu)write_sysreg (kvm_get_hyp_vector (), vbar_el1); } +NOKPROBE_SYMBOL (activate_traps_vhe); static void __hyp_text __activate_traps_nvhe(struct kvm_vcpu *vcpu) {
@@ -146,6 +148,7 @@ static void deactivate_traps_vhe(void)write_sysreg (CPACR_EL1_DEFAULT , cpacr_el1);write_sysreg (vectors, vbar_el1); } +NOKPROBE_SYMBOL (deactivate_traps_vhe); static void __hyp_text __deactivate_traps_nvhe(void) {
@@ -529,6 +532,7 @@ int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu)return exit_code; } +NOKPROBE_SYMBOL (kvm_vcpu_run_vhe);/* Switch to the guest for legacy non-VHE systems */ int __hyp_text __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu)
@@ -636,6 +640,7 @@ static void __hyp_call_panic_vhe(u64 spsr, u64 elr, u64 par,read_sysreg_el2 (esr),read_sysreg_el2 (far), read_sysreg(hpfar_el2), par, vcpu); } +NOKPROBE_SYMBOL (__hyp_call_panic_vhe); void __hyp_text __noreturn hyp_panic(struct kvm_cpu_context *host_ctxt) {
arch/arm64/kvm/hyp/sysreg-sr.c +5 -0
@@ -18,6 +18,7 @@#include <linux/compiler.h> #include <linux/kvm_host.h> +#include <asm/kprobes.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> #include <asm/kvm_hyp.h>
@@ -98,12 +99,14 @@ void sysreg_save_host_state_vhe(struct kvm_cpu_context *ctxt) {__sysreg_save_common_state (ctxt); } +NOKPROBE_SYMBOL (sysreg_save_host_state_vhe);void sysreg_save_guest_state_vhe (struct kvm_cpu_context *ctxt) {__sysreg_save_common_state (ctxt);__sysreg_save_el2_return_state (ctxt); } +NOKPROBE_SYMBOL (sysreg_save_guest_state_vhe); static void __hyp_text __sysreg_restore_common_state(struct kvm_cpu_context *ctxt) {
@@ -188,12 +191,14 @@ void sysreg_restore_host_state_vhe(struct kvm_cpu_context *ctxt) {__sysreg_restore_common_state (ctxt); } +NOKPROBE_SYMBOL (sysreg_restore_host_state_vhe);void sysreg_restore_guest_state_vhe (struct kvm_cpu_context *ctxt) {__sysreg_restore_common_state (ctxt);__sysreg_restore_el2_return_state (ctxt); } +NOKPROBE_SYMBOL (sysreg_restore_guest_state_vhe); void __hyp_text __sysreg32_save_state(struct kvm_vcpu *vcpu) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 23/52 ASoC: samsung: Prevent clk_get_rate() calls in atomic context
In reply to Sasha LevinFrom: Sylwester Nawrocki <[email protected]>
[ Upstream commit 860b454c2c0cbda6892954f5cdbbb48931b3c8db ]
This patch moves clk_get_rate() call from trigger() to hw_params() callback to avoid calling sleeping clk API from atomic context and prevent deadlock as indicated below.
Before this change clk_get_rate() was being called with same spinlock held as the one passed to the clk API when registering clocks exposed by the I2S driver.
[ 82.109780] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:908
[ 82.117009] in_atomic(): 1, irqs_disabled(): 128, pid: 1554, name: speaker-test
[ 82.124235] 3 locks held by speaker-test/1554:
[ 82.128653] #0: cc8c5328 (snd_pcm_link_rwlock){...-}, at: snd_pcm_stream_lock_irq+0x20/0x38
[ 82.137058] #1: ec9eda17 (&(&substream->self_group.lock)->rlock){..-.}, at: snd_pcm_ioctl+0x900/0x1268
[ 82.146417] #2: 6ac279bf (&(&pri_dai->spinlock)->rlock){..-.}, at: i2s_trigger+0x64/0x6d4
[ 82.154650] irq event stamp: 8144
[ 82.157949] hardirqs last enabled at (8143): [<c0a0f574>] _raw_read_unlock_irq+0x24/0x5c
[ 82.166089] hardirqs last disabled at (8144): [<c0a0f6a8>] _raw_read_lock_irq+0x18/0x58
[ 82.174063] softirqs last enabled at (8004): [<c01024e4>] __do_softirq+0x3a4/0x66c
[ 82.181688] softirqs last disabled at (7997): [<c012d730>] irq_exit+0x140/0x168
[ 82.188964] Preemption disabled at:
[ 82.188967] [<00000000>] (null)
[ 82.195728] CPU: 6 PID: 1554 Comm: speaker-test Not tainted 5.0.0-rc5-00192-ga6e6caca8f03 #191
[ 82.204302] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree)
[ 82.210376] [<c0111a54>] (unwind_backtrace) from [<c010d8f4>] (show_stack+0x10/0x14)
[ 82.218084] [<c010d8f4>] (show_stack) from [<c09ef004>] (dump_stack+0x90/0xc8)
[ 82.225278] [<c09ef004>] (dump_stack) from [<c0152980>] (___might_sleep+0x22c/0x2c8)
[ 82.232990] [<c0152980>] (___might_sleep) from [<c0a0a2e4>] (__mutex_lock+0x28/0xa3c)
[ 82.240788] [<c0a0a2e4>] (__mutex_lock) from [<c0a0ad80>] (mutex_lock_nested+0x1c/0x24)
[ 82.248763] [<c0a0ad80>] (mutex_lock_nested) from [<c04923dc>] (clk_prepare_lock+0x78/0xec)
[ 82.257079] [<c04923dc>] (clk_prepare_lock) from [<c049538c>] (clk_core_get_rate+0xc/0x5c)
[ 82.265309] [<c049538c>] (clk_core_get_rate) from [<c0766b18>] (i2s_trigger+0x490/0x6d4)
[ 82.273369] [<c0766b18>] (i2s_trigger) from [<c074fec4>] (soc_pcm_trigger+0x100/0x140)
[ 82.281254] [<c074fec4>] (soc_pcm_trigger) from [<c07378a0>] (snd_pcm_do_start+0x2c/0x30)
[ 82.289400] [<c07378a0>] (snd_pcm_do_start) from [<c07376cc>] (snd_pcm_action_single+0x38/0x78)
[ 82.298065] [<c07376cc>] (snd_pcm_action_single) from [<c073a450>] (snd_pcm_ioctl+0x910/0x1268)
[ 82.306734] [<c073a450>] (snd_pcm_ioctl) from [<c0292344>] (do_vfs_ioctl+0x90/0x9ec)
[ 82.314443] [<c0292344>] (do_vfs_ioctl) from [<c0292cd4>] (ksys_ioctl+0x34/0x60)
[ 82.321808] [<c0292cd4>] (ksys_ioctl) from [<c0101000>] (ret_fast_syscall+0x0/0x28)
[ 82.329431] Exception stack(0xeb875fa8 to 0xeb875ff0)
[ 82.334459] 5fa0: 00033c18 b6e31000 00000004 00004142 00033d80 00033d80
[ 82.342605] 5fc0: 00033c18 b6e31000 00008000 00000036 00008000 00000000 beea38a8 00008000
[ 82.350748] 5fe0: b6e3142c beea384c b6da9a30 b6c9212c
[ 82.355789]
[ 82.357245] ======================================================
[ 82.363397] WARNING: possible circular locking dependency detected
[ 82.369551] 5.0.0-rc5-00192-ga6e6caca8f03 #191 Tainted: G W
[ 82.376395] ------------------------------------------------------
[ 82.382548] speaker-test/1554 is trying to acquire lock:
[ 82.387834] 6d2007f4 (prepare_lock){+.+.}, at: clk_prepare_lock+0x78/0xec
[ 82.394593]
[ 82.394593] but task is already holding lock:
[ 82.400398] 6ac279bf (&(&pri_dai->spinlock)->rlock){..-.}, at: i2s_trigger+0x64/0x6d4
[ 82.408197]
[ 82.408197] which lock already depends on the new lock.
[ 82.416343]
[ 82.416343] the existing dependency chain (in reverse order) is:
[ 82.423795]
[ 82.423795] -> #1 (&(&pri_dai->spinlock)->rlock){..-.}:
[ 82.430472] clk_mux_set_parent+0x34/0xb8
[ 82.434975] clk_core_set_parent_nolock+0x1c4/0x52c
[ 82.440347] clk_set_parent+0x38/0x6c
[ 82.444509] of_clk_set_defaults+0xc8/0x308
[ 82.449186] of_clk_add_provider+0x84/0xd0
[ 82.453779] samsung_i2s_probe+0x408/0x5f8
[ 82.458376] platform_drv_probe+0x48/0x98
[ 82.462879] really_probe+0x224/0x3f4
[ 82.467037] driver_probe_device+0x70/0x1c4
[ 82.471716] bus_for_each_drv+0x44/0x8c
[ 82.476049] __device_attach+0xa0/0x138
[ 82.480382] bus_probe_device+0x88/0x90
[ 82.484715] deferred_probe_work_func+0x6c/0xbc
[ 82.489741] process_one_work+0x200/0x740
[ 82.494246] worker_thread+0x2c/0x4c8
[ 82.498408] kthread+0x128/0x164
[ 82.502131] ret_from_fork+0x14/0x20
[ 82.506204] (null)
[ 82.508976]
[ 82.508976] -> #0 (prepare_lock){+.+.}:
[ 82.514264] __mutex_lock+0x60/0xa3c
[ 82.518336] mutex_lock_nested+0x1c/0x24
[ 82.522756] clk_prepare_lock+0x78/0xec
[ 82.527088] clk_core_get_rate+0xc/0x5c
[ 82.531421] i2s_trigger+0x490/0x6d4
[ 82.535494] soc_pcm_trigger+0x100/0x140
[ 82.539913] snd_pcm_do_start+0x2c/0x30
[ 82.544246] snd_pcm_action_single+0x38/0x78
[ 82.549012] snd_pcm_ioctl+0x910/0x1268
[ 82.553345] do_vfs_ioctl+0x90/0x9ec
[ 82.557417] ksys_ioctl+0x34/0x60
[ 82.561229] ret_fast_syscall+0x0/0x28
[ 82.565477] 0xbeea384c
[ 82.568421]
[ 82.568421] other info that might help us debug this:
[ 82.568421]
[ 82.576394] Possible unsafe locking scenario:
[ 82.576394]
[ 82.582285] CPU0 CPU1
[ 82.586792] ---- ----
[ 82.591297] lock(&(&pri_dai->spinlock)->rlock);
[ 82.595977] lock(prepare_lock);
[ 82.601782] lock(&(&pri_dai->spinlock)->rlock);
[ 82.608975] lock(prepare_lock);
[ 82.612268]
[ 82.612268] *** DEADLOCK ***--- sound/soc/samsung/i2s.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/soc/samsung/i2s.c +5 -5
@@ -700,6 +700,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, {struct i2s_dai *i2s =to_info (dai);u32 mod, mask =0 , val =0 ; +struct clk *rclksrc;unsigned long flags;WARN_ON (!pm_runtime_active (dai->dev));
@@ -782,6 +783,10 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, i2s->frmclk =params_rate (params); + rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC ]; +if (rclksrc && !IS_ERR (rclksrc)) + i2s->rclk_srcrate =clk_get_rate (rclksrc); +return 0 ; }
@@ -886,11 +891,6 @@ static int config_setup(struct i2s_dai *i2s)return 0 ;if (!(i2s->quirks &QUIRK_NO_MUXPSR )) { -struct clk *rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC ]; - -if (rclksrc && !IS_ERR (rclksrc)) - i2s->rclk_srcrate =clk_get_rate (rclksrc); - psr = i2s->rclk_srcrate / i2s->frmclk / rfs;writel (((psr -1 ) <<8 ) |PSR_PSREN , i2s->addr +I2SPSR ); dev_dbg(&i2s->pdev->dev,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 24/52 ARM: OMAP2+: fix lack of timer interrupts on CPU1 after hotplug
In reply to Sasha LevinFrom: Russell King <[email protected]>
[ Upstream commit 50d6b3cf9403879911e06d69c7ef41e43f8f7b4b ]
If we have a kernel configured for periodic timer interrupts, and we have cpuidle enabled, then we end up with CPU1 losing timer interupts after a hotplug.
This can manifest itself in RCU stall warnings, or userspace becoming unresponsive.
The problem is that the kernel initially wants to use the TWD timer for interrupts, but the TWD loses context when we enter the C3 cpuidle state. Nothing reprograms the TWD after idle.
We have solved this in the past by switching to broadcast timer ticks, and cpuidle44xx switches to that mode at boot time. However, there is nothing to switch from periodic mode local timers after a hotplug operation.
We call tick_broadcast_enter() in omap_enter_idle_coupled(), which one would expect would take care of the issue, but internally this only deals with one-shot local timers - tick_broadcast_enable() on the other hand only deals with periodic local timers. So, we need to call both.
--- arch/arm/mach-omap2/cpuidle44xx.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
arch/arm/mach-omap2/cpuidle44xx.c +4 -12
@@ -152,6 +152,10 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, mpuss_can_lose_context = (cx->mpu_state ==PWRDM_POWER_RET ) && (cx->mpu_logic_state ==PWRDM_POWER_OFF ); +/* Enter broadcast mode for periodic timers */ +tick_broadcast_enable (); + +/* Enter broadcast mode for one-shot timers */ tick_broadcast_enter ();/*
@@ -218,15 +222,6 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,return index; } -/* -* For each cpu, setup the broadcast timer because local timers -* stops for the states above C1. -*/ -static void omap_setup_broadcast_timer (void *arg) -{ -tick_broadcast_enable (); -} -static struct cpuidle_driver omap4_idle_driver = { .name ="omap4_idle" , .owner =THIS_MODULE ,
@@ -319,8 +314,5 @@ int __init omap4_idle_init(void)if (!cpu_clkdm[0 ] || !cpu_clkdm[1 ])return -ENODEV ; -/* Configure the broadcast timer on each cpu */ -on_each_cpu (omap_setup_broadcast_timer,NULL ,1 ); -return cpuidle_register (idle_driver, cpu_online_mask); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 25/52 Input: cap11xx - switch to using set_brightness_blocking()
In reply to Sasha LevinFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 628442880af8c201d307a45f3862a7a17df8a189 ]
Updating LED state requires access to regmap and therefore we may sleep, so we could not do that directly form set_brightness() method. Historically we used private work to adjust the brightness, but with the introduction of set_brightness_blocking() we no longer need it.
As a bonus, not having our own work item means we do not have use-after-free issue as we neglected to cancel outstanding work on driver unbind.
--- drivers/input/keyboard/cap11xx.c | 35 ++++++++++---------------------- 1 file changed, 11 insertions(+), 24 deletions(-)
drivers/input/keyboard/cap11xx.c +11 -24
@@ -75,9 +75,7 @@struct cap11xx_led {struct cap11xx_priv *priv;struct led_classdev cdev; -struct work_struct work;u32 reg; -enum led_brightness new_brightness; };#endif
@@ -233,30 +231,21 @@ static void cap11xx_input_close(struct input_dev *idev) }#ifdef CONFIG_LEDS_CLASS -static void cap11xx_led_work (struct work_struct *work) +static int cap11xx_led_set (struct led_classdev *cdev, +enum led_brightness value) { - struct cap11xx_led *led = container_of(work, struct cap11xx_led, work); + struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev);struct cap11xx_priv *priv = led->priv; -int value = led->new_brightness;/* -* All LEDs share the same duty cycle as this is a HW limitation. -* Brightness levels per LED are either 0 (OFF) and 1 (ON). +* All LEDs share the same duty cycle as this is a HW +* limitation. Brightness levels per LED are either +* 0 (OFF) and 1 (ON). */ -regmap_update_bits (priv->regmap,CAP11XX_REG_LED_OUTPUT_CONTROL , -BIT (led->reg), value ?BIT (led->reg) :0 ); -} - -static void cap11xx_led_set (struct led_classdev *cdev, -enum led_brightness value) -{ - struct cap11xx_led *led = container_of(cdev, struct cap11xx_led, cdev); - -if (led->new_brightness == value) -return ; - - led->new_brightness = value; -schedule_work (&led->work); +return regmap_update_bits (priv->regmap, +CAP11XX_REG_LED_OUTPUT_CONTROL , +BIT (led->reg), + value ?BIT (led->reg) :0 ); } static int cap11xx_init_leds(struct device *dev,
@@ -299,7 +288,7 @@ static int cap11xx_init_leds(struct device *dev, led->cdev.default_trigger =of_get_property (child,"linux,default-trigger" ,NULL ); led->cdev.flags =0 ; - led->cdev.brightness_set = cap11xx_led_set; + led->cdev.brightness_set_blocking = cap11xx_led_set; led->cdev.max_brightness =1 ; led->cdev.brightness =LED_OFF ;
@@ -312,8 +301,6 @@ static int cap11xx_init_leds(struct device *dev, led->reg = reg; led->priv = priv; -INIT_WORK (&led->work, cap11xx_led_work); - error =devm_led_classdev_register (dev, &led->cdev);if (error) {of_node_put (child);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 26/52 Input: ps2-gpio - flush TX work when closing port
In reply to Sasha LevinFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit 33a841ce5cef4ca6c18ad333248b6d273f54c839 ]
To ensure that TX work is not running after serio port has been torn down, let's flush it when closing the port.
--- drivers/input/serio/ps2-gpio.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/serio/ps2-gpio.c +1 -0
@@ -76,6 +76,7 @@ static void ps2_gpio_close(struct serio *serio) {struct ps2_gpio_data *drvdata = serio->port_data; +flush_delayed_work (&drvdata->tx_work);disable_irq (drvdata->irq); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 27/52 Input: matrix_keypad - use flush_delayed_work()
In reply to Sasha LevinFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit a342083abe576db43594a32d458a61fa81f7cb32 ]
We should be using flush_delayed_work() instead of flush_work() in matrix_keypad_stop() to ensure that we are not missing work that is scheduled but not yet put in the workqueue (i.e. its delay timer has not expired yet).
--- drivers/input/keyboard/matrix_keypad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/keyboard/matrix_keypad.c +1 -1
@@ -222,7 +222,7 @@ static void matrix_keypad_stop(struct input_dev *dev) keypad->stopped = true;spin_unlock_irq (&keypad->lock); -flush_work (&keypad->work.work); +flush_delayed_work (&keypad->work);/* * matrix_keypad_scan() will leave IRQs enabled; * we should disable them now.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 28/52 mac80211: call drv_ibss_join() on restart
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit 4926b51bfaa6d36bd6f398fb7698679d3962e19d ]
If a driver does any significant activity in its ibss_join method, then it will very well expect that to be called during restart, before any stations are added. Do that.
--- net/mac80211/util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/mac80211/util.c +5 -1
@@ -5,7 +5,7 @@* Copyright 2007 Johannes Berg <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018-2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -2144,6 +2144,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)case NL80211_IFTYPE_AP_VLAN :case NL80211_IFTYPE_MONITOR :break ; +case NL80211_IFTYPE_ADHOC : +if (sdata->vif.bss_conf.ibss_joined) +WARN_ON (drv_join_ibss (local, sdata)); +/* fall through */ default :ieee80211_reconfig_stations (sdata);/* fall through */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 29/52 cfg80211: prevent speculation on cfg80211_classify8021d() return
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit 1fc9b7253382ce1a83d9a3e63e88d656eb63f263 ]
It's possible that the caller of cfg80211_classify8021d() uses the value to index an array, like mac80211 in ieee80211_downgrade_queue(). Prevent speculation on the return value.
--- net/wireless/util.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-)
net/wireless/util.c +24 -11
@@ -5,7 +5,7 @@* Copyright 2007-2009 Johannes Berg <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright 2017 Intel Deutschland GmbH -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018-2019 Intel Corporation */ #include <linux/export.h> #include <linux/bitops.h>
@@ -19,6 +19,7 @@#include <linux/mpls.h> #include <linux/gcd.h> #include <linux/bitfield.h> +#include <linux/nospec.h> #include "core.h" #include "rdev-ops.h"
@@ -715,20 +716,25 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb, {unsigned int dscp;unsigned char vlan_priority; +unsigned int ret;/* skb->priority values from 256->263 are magic values to * directly indicate a specific 802.1d priority. This is used * to allow 802.1d priority to be passed directly in from VLAN * tags, etc. */ -if (skb->priority >=256 && skb->priority <=263 ) -return skb->priority -256 ; +if (skb->priority >=256 && skb->priority <=263 ) { + ret = skb->priority -256 ; + goto out; + }if (skb_vlan_tag_present (skb)) { vlan_priority = (skb_vlan_tag_get (skb) &VLAN_PRIO_MASK ) >>VLAN_PRIO_SHIFT ; -if (vlan_priority >0 ) -return vlan_priority; +if (vlan_priority >0 ) { + ret = vlan_priority; + goto out; + } }switch (skb->protocol) {
@@ -747,8 +753,9 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb,if (!mpls)return 0 ; -return (ntohl (mpls->entry) &MPLS_LS_TC_MASK ) + ret = (ntohl (mpls->entry) &MPLS_LS_TC_MASK ) >>MPLS_LS_TC_SHIFT ; + goto out; }case htons (ETH_P_80221 ):/* 802.21 is always network control traffic */
@@ -761,18 +768,24 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb,unsigned int i, tmp_dscp = dscp >>2 ;for (i =0 ; i < qos_map->num_des; i++) { -if (tmp_dscp == qos_map->dscp_exception[i].dscp) -return qos_map->dscp_exception[i].up; +if (tmp_dscp == qos_map->dscp_exception[i].dscp) { + ret = qos_map->dscp_exception[i].up; + goto out; + } }for (i =0 ; i <8 ; i++) {if (tmp_dscp >= qos_map->up[i].low && - tmp_dscp <= qos_map->up[i].high) -return i; + tmp_dscp <= qos_map->up[i].high) { + ret = i; + goto out; + } } } -return dscp >>5 ; + ret = dscp >>5 ; +out: +return array_index_nospec (ret,IEEE80211_NUM_TIDS ); }EXPORT_SYMBOL (cfg80211_classify8021d);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 30/52 mac80211: Fix Tx aggregation session tear down with ITXQs
In reply to Sasha LevinFrom: Ilan Peer <[email protected]>
[ Upstream commit 6157ca0d6bfe437691b1e98a62e2efe12b6714da ]
When mac80211 requests the low level driver to stop an ongoing Tx aggregation, the low level driver is expected to call ieee80211_stop_tx_ba_cb_irqsafe() to indicate that it is ready to stop the session. The callback in turn schedules a worker to complete the session tear down, which in turn also handles the relevant state for the intermediate Tx queue.
However, as this flow in asynchronous, the intermediate queue should be stopped and not continue servicing frames, as in such a case frames that are dequeued would be marked as part of an aggregation, although the aggregation is already been stopped.
Fix this by stopping the intermediate Tx queue, before calling the low level driver to stop the Tx aggregation.
--- net/mac80211/agg-tx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/mac80211/agg-tx.c +3 -1
@@ -8,7 +8,7 @@* Copyright 2007, Michael Wu <[email protected]> * Copyright 2007-2010, Intel Corporation * Copyright(c) 2015-2017 Intel Deutschland GmbH -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018 - 2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -366,6 +366,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,set_bit (HT_AGG_STATE_STOPPING , &tid_tx->state); +ieee80211_agg_stop_txq (sta, tid); +spin_unlock_bh (&sta->lock); ht_dbg(sta->sdata, "Tx BA session stop requested for %pM tid %u\n",
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 31/52 netfilter: compat: initialize all fields in xt_init
In reply to Sasha LevinFrom: Francesco Ruggeri <[email protected]>
[ Upstream commit 8d29d16d21342a0c86405d46de0c4ac5daf1760f ]
If a non zero value happens to be in xt[NFPROTO_BRIDGE].cur at init time, the following panic can be caused by running
% ebtables -t broute -F BROUTING
from a 32-bit user level on a 64-bit kernel. This patch replaces kmalloc_array with kcalloc when allocating xt.
[ 474.680846] BUG: unable to handle kernel paging request at 0000000009600920 [ 474.687869] PGD 2037006067 P4D 2037006067 PUD 2038938067 PMD 0 [ 474.693838] Oops: 0000 [#1] SMP [ 474.697055] CPU: 9 PID: 4662 Comm: ebtables Kdump: loaded Not tainted 4.19.17-11302235.AroraKernelnext.fc18.x86_64 #1 [ 474.707721] Hardware name: Supermicro X9DRT/X9DRT, BIOS 3.0 06/28/2013 [ 474.714313] RIP: 0010:xt_compat_calc_jump+0x2f/0x63 [x_tables] [ 474.720201] Code: 40 0f b6 ff 55 31 c0 48 6b ff 70 48 03 3d dc 45 00 00 48 89 e5 8b 4f 6c 4c 8b 47 60 ff c9 39 c8 7f 2f 8d 14 08 d1 fa 48 63 fa <41> 39 34 f8 4c 8d 0c fd 00 00 00 00 73 05 8d 42 01 eb e1 76 05 8d [ 474.739023] RSP: 0018:ffffc9000943fc58 EFLAGS: 00010207 [ 474.744296] RAX: 0000000000000000 RBX: ffffc90006465000 RCX: 0000000002580249 [ 474.751485] RDX: 00000000012c0124 RSI: fffffffff7be17e9 RDI: 00000000012c0124 [ 474.758670] RBP: ffffc9000943fc58 R08: 0000000000000000 R09: ffffffff8117cf8f [ 474.765855] R10: ffffc90006477000 R11: 0000000000000000 R12: 0000000000000001 [ 474.773048] R13: 0000000000000000 R14: ffffc9000943fcb8 R15: ffffc9000943fcb8 [ 474.780234] FS: 0000000000000000(0000) GS:ffff88a03f840000(0063) knlGS:00000000f7ac7700 [ 474.788612] CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 [ 474.794632] CR2: 0000000009600920 CR3: 0000002037422006 CR4: 00000000000606e0 [ 474.802052] Call Trace: [ 474.804789] compat_do_replace+0x1fb/0x2a3 [ebtables] [ 474.810105] compat_do_ebt_set_ctl+0x69/0xe6 [ebtables] [ 474.815605] ? try_module_get+0x37/0x42 [ 474.819716] compat_nf_setsockopt+0x4f/0x6d [ 474.824172] compat_ip_setsockopt+0x7e/0x8c [ 474.828641] compat_raw_setsockopt+0x16/0x3a [ 474.833220] compat_sock_common_setsockopt+0x1d/0x24 [ 474.838458] __compat_sys_setsockopt+0x17e/0x1b1 [ 474.843343] ? __check_object_size+0x76/0x19a [ 474.847960] __ia32_compat_sys_socketcall+0x1cb/0x25b [ 474.853276] do_fast_syscall_32+0xaf/0xf6 [ 474.857548] entry_SYSENTER_compat+0x6b/0x7a
--- net/netfilter/x_tables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/x_tables.c +1 -1
@@ -1899,7 +1899,7 @@ static int __init xt_init(void)seqcount_init (&per_cpu (xt_recseq, i)); } - xt =kmalloc_array (NFPROTO_NUMPROTO ,sizeof (struct xt_af ),GFP_KERNEL ); + xt =kcalloc (NFPROTO_NUMPROTO ,sizeof (struct xt_af ),GFP_KERNEL );if (!xt)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 32/52 blk-mq: insert rq with DONTPREP to hctx dispatch list when requeue
In reply to Sasha LevinFrom: Jianchao Wang <[email protected]>
[ Upstream commit aef1897cd36dcf5e296f1d2bae7e0d268561b685 ]
When requeue, if RQF_DONTPREP, rq has contained some driver specific data, so insert it to hctx dispatch list to avoid any merge. Take scsi as example, here is the trace event log (no io scheduler, because RQF_STARTED would prevent merging),
kworker/0:1H-339 [000] ...1 2037.209289: block_rq_insert: 8,0 R 4096 () 32768 + 8 [kworker/0:1H] scsi_inert_test-1987 [000] .... 2037.220465: block_bio_queue: 8,0 R 32776 + 8 [scsi_inert_test] scsi_inert_test-1987 [000] ...2 2037.220466: block_bio_backmerge: 8,0 R 32776 + 8 [scsi_inert_test] kworker/0:1H-339 [000] .... 2047.220913: block_rq_issue: 8,0 R 8192 () 32768 + 16 [kworker/0:1H] scsi_inert_test-1996 [000] ..s1 2047.221007: block_rq_complete: 8,0 R () 32768 + 8 [0] scsi_inert_test-1996 [000] .Ns1 2047.221045: block_rq_requeue: 8,0 R () 32776 + 8 [0] kworker/0:1H-339 [000] ...1 2047.221054: block_rq_insert: 8,0 R 4096 () 32776 + 8 [kworker/0:1H] kworker/0:1H-339 [000] ...1 2047.221056: block_rq_issue: 8,0 R 4096 () 32776 + 8 [kworker/0:1H] scsi_inert_test-1986 [000] ..s1 2047.221119: block_rq_complete: 8,0 R () 32776 + 8 [0]
(32768 + 8) was requeued by scsi_queue_insert and had RQF_DONTPREP. Then it was merged with (32776 + 8) and issued. Due to RQF_DONTPREP, the sdb only contained the part of (32768 + 8), then only that part was completed. The lucky thing was that scsi_io_completion detected it and requeued the remaining part. So we didn't get corrupted data. However, the requeue of (32776 + 8) is not expected.
--- block/blk-mq.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
block/blk-mq.c +10 -2
@@ -718,12 +718,20 @@ static void blk_mq_requeue_work(struct work_struct *work)spin_unlock_irq (&q->requeue_lock);list_for_each_entry_safe (rq, next, &rq_list, queuelist) { -if (!(rq->rq_flags &RQF_SOFTBARRIER )) +if (!(rq->rq_flags & (RQF_SOFTBARRIER |RQF_DONTPREP )))continue ; rq->rq_flags &= ~RQF_SOFTBARRIER ;list_del_init (&rq->queuelist); -blk_mq_sched_insert_request (rq, true, false, false); +/* +* If RQF_DONTPREP, rq has contained some driver specific +* data, so insert it to hctx dispatch list to avoid any +* merge. +*/ +if (rq->rq_flags &RQF_DONTPREP ) +blk_mq_request_bypass_insert (rq, false); +else +blk_mq_sched_insert_request (rq, true, false, false); }while (!list_empty (&rq_list)) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 33/52 ipvs: fix dependency on nf_defrag_ipv6
In reply to Sasha LevinFrom: Andrea Claudi <[email protected]>
[ Upstream commit 098e13f5b21d3398065fce8780f07a3ef62f4812 ]
ipvs relies on nf_defrag_ipv6 module to manage IPv6 fragmentation, but lacks proper Kconfig dependencies and does not explicitly request defrag features.
As a result, if netfilter hooks are not loaded, when IPv6 fragmented packet are handled by ipvs only the first fragment makes through.
Fix it properly declaring the dependency on Kconfig and registering netfilter hooks on ip_vs_add_service() and ip_vs_new_dest().
--- net/netfilter/ipvs/Kconfig | 1 + net/netfilter/ipvs/ip_vs_core.c | 10 ++++------ net/netfilter/ipvs/ip_vs_ctl.c | 10 ++++++++++ 3 files changed, 15 insertions(+), 6 deletions(-)
net/netfilter/ipvs/Kconfig +1 -0
@@ -29,6 +29,7 @@ config IP_VS_IPV6 bool "IPv6 support for IPVS" depends on IPV6 = y || IP_VS = IPV6 select IP6_NF_IPTABLES + select NF_DEFRAG_IPV6 ---help--- Add IPv6 support to IPVS.
net/netfilter/ipvs/ip_vs_core.c +4 -6
@@ -1536,14 +1536,12 @@ ip_vs_try_to_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,/* sorry, all this trouble for a no-hit :) */ IP_VS_DBG_PKT (12 , af, pp, skb, iph->off,"ip_vs_in: packet continues traversal as normal" ); -if (iph->fragoffs) { -/* Fragment that couldn't be mapped to a conn entry -* is missing module nf_defrag_ipv6 -*/ -IP_VS_DBG_RL ("Unhandled frag, load nf_defrag_ipv6\n" ); + +/* Fragment couldn't be mapped to a conn entry */ +if (iph->fragoffs)IP_VS_DBG_PKT (7 , af, pp, skb, iph->off,"unhandled fragment" ); - } + *verdict =NF_ACCEPT ;return 0 ; }
net/netfilter/ipvs/ip_vs_ctl.c +10 -0
@@ -43,6 +43,7 @@#ifdef CONFIG_IP_VS_IPV6 #include <net/ipv6.h> #include <net/ip6_route.h> +#include <net/netfilter/ipv6/nf_defrag_ipv6.h> #endif #include <net/route.h> #include <net/sock.h>
@@ -895,6 +896,7 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, {struct ip_vs_dest *dest;unsigned int atype, i; +int ret =0 ;EnterFunction (2 );
@@ -905,6 +907,10 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, atype & IPV6_ADDR_LINKLOCAL) && !__ip_vs_addr_is_local_v6(svc->ipvs->net, &udest->addr.in6)) return -EINVAL; + + ret =nf_defrag_ipv6_enable (svc->ipvs->net); +if (ret) +return ret; } else#endif {
@@ -1228,6 +1234,10 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u, ret = -EINVAL ; goto out_err; } + + ret =nf_defrag_ipv6_enable (ipvs->net); +if (ret) + goto out_err; }#endif
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 34/52 floppy: check_events callback should not return a negative number
In reply to Sasha LevinFrom: Yufen Yu <[email protected]>
[ Upstream commit 96d7cb932e826219ec41ac02e5af037ffae6098c ]
floppy_check_events() is supposed to return bit flags to say which events occured. We should return zero to say that no event flags are set. Only BIT(0) and BIT(1) are used in the caller. And .check_events interface also expect to return an unsigned int value.
However, after commit a0c80efe5956, it may return -EINTR (-4u). Here, both BIT(0) and BIT(1) are cleared. So this patch shouldn't affect runtime, but it obviously is still worth fixing.
--- drivers/block/floppy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/floppy.c +1 -1
@@ -4081,7 +4081,7 @@ static unsigned int floppy_check_events(struct gendisk *disk,if (time_after (jiffies,UDRS ->last_checked +UDP ->checkfreq)) {if (lock_fdc (drive)) -return -EINTR ; +return 0 ;poll_drive (false,0 );process_fd_request (); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 35/52 xprtrdma: Make sure Send CQ is allocated on an existing compvec
In reply to Sasha LevinFrom: Nicolas Morey-Chaisemartin <[email protected]>
[ Upstream commit a4cb5bdb754afe21f3e9e7164213e8600cf69427 ]
Make sure the device has at least 2 completion vectors before allocating to compvec#1
--- net/sunrpc/xprtrdma/verbs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sunrpc/xprtrdma/verbs.c +2 -1
@@ -583,7 +583,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, sendcq =ib_alloc_cq (ia->ri_device,NULL , ep->rep_attr.cap.max_send_wr +1 , -1 ,IB_POLL_WORKQUEUE ); + ia->ri_device->num_comp_vectors >1 ?1 :0 , +IB_POLL_WORKQUEUE );if (IS_ERR (sendcq)) { rc =PTR_ERR (sendcq); dprintk("RPC: %s: failed to create send CQ: %i\n",
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 36/52 NFS: Don't use page_file_mapping after removing the page
In reply to Sasha LevinFrom: Benjamin Coddington <[email protected]>
[ Upstream commit d2ceb7e57086750ea6198a31fd942d98099a0786 ]
If nfs_page_async_flush() removes the page from the mapping, then we can't use page_file_mapping() on it as nfs_updatepate() is wont to do when receiving an error. Instead, push the mapping to the stack before the page is possibly truncated.
--- fs/nfs/write.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/nfs/write.c +6 -5
@@ -238,9 +238,9 @@ static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int c }/* A writeback failed: mark the page as bad, and invalidate the page cache */ -static void nfs_set_pageerror (struct page *page) +static void nfs_set_pageerror (struct address_space *mapping) { -nfs_zap_mapping (page_file_mapping (page)->host,page_file_mapping (page)); +nfs_zap_mapping (mapping->host, mapping); }/*
@@ -994,7 +994,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)nfs_list_remove_request (req);if (test_bit (NFS_IOHDR_ERROR , &hdr->flags) && (hdr->good_bytes < bytes)) { -nfs_set_pageerror (req->wb_page); +nfs_set_pageerror (page_file_mapping (req->wb_page));nfs_context_set_write_error (req->wb_context, hdr->error); goto remove_req; }
@@ -1330,7 +1330,8 @@ int nfs_updatepage(struct file *file, struct page *page, unsigned int offset, unsigned int count) {struct nfs_open_context *ctx =nfs_file_open_context (file); -struct inode *inode =page_file_mapping (page)->host; +struct address_space *mapping =page_file_mapping (page); +struct inode *inode = mapping->host;int status =0 ;nfs_inc_stats (inode,NFSIOS_VFSUPDATEPAGE );
@@ -1348,7 +1349,7 @@ int nfs_updatepage(struct file *file, struct page *page, status =nfs_writepage_setup (ctx, page, offset, count);if (status <0 ) -nfs_set_pageerror (page); +nfs_set_pageerror (mapping);else __set_page_dirty_nobuffers (page); out:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 37/52 mm/gup: fix gup_pmd_range() for dax
In reply to Sasha LevinFrom: Yu Zhao <[email protected]>
[ Upstream commit 414fd080d125408cb15d04ff4907e1dd8145c8c7 ]
For dax pmd, pmd_trans_huge() returns false but pmd_huge() returns true on x86. So the function works as long as hugetlb is configured. However, dax doesn't depend on hugetlb.
--- mm/gup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/gup.c +2 -1
@@ -1674,7 +1674,8 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end,if (!pmd_present (pmd))return 0 ; -if (unlikely (pmd_trans_huge (pmd) ||pmd_huge (pmd))) { +if (unlikely (pmd_trans_huge (pmd) ||pmd_huge (pmd) || +pmd_devmap (pmd))) {/* * NUMA hinting faults need to be handled in the GUP * slowpath for accounting purposes and so that they
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 38/52 Revert "mm: use early_pfn_to_nid in page_ext_init"
In reply to Sasha LevinFrom: Qian Cai <[email protected]>
[ Upstream commit 2f1ee0913ce58efe7f18fbd518bd54c598559b89 ]
This reverts commit fe53ca54270a ("mm: use early_pfn_to_nid in page_ext_init").
When booting a system with "page_owner=on",
start_kernel
page_ext_init
invoke_init_callbacks
init_section_page_ext
init_page_owner
init_early_allocated_pages
init_zones_in_node
init_pages_in_zone
lookup_page_ext
page_to_nid
The issue here is that page_to_nid() will not work since some page flags have no node information until later in page_alloc_init_late() due to DEFERRED_STRUCT_PAGE_INIT. Hence, it could trigger an out-of-bounds access with an invalid nid.
UBSAN: Undefined behaviour in ./include/linux/mm.h:1104:50 index 7 is out of range for type 'zone [5]'
Also, kernel will panic since flags were poisoned earlier with,
CONFIG_DEBUG_VM_PGFLAGS=yCONFIG_NODE_NOT_IN_PAGE_FLAGS=n
start_kernel
setup_arch
pagetable_init
paging_init
sparse_init
sparse_init_nid
memblock_alloc_try_nid_raw
It did not handle it well in init_pages_in_zone() which ends up calling page_to_nid().
page:ffffea0004200000 is uninitialized and poisoned
raw: ffffffffffffffff ffffffffffffffff ffffffffffffffff ffffffffffffffff raw: ffffffffffffffff ffffffffffffffff ffffffffffffffff ffffffffffffffff page dumped because: VM_BUG_ON_PAGE(PagePoisoned(p)) page_owner info is not active (free page?) kernel BUG at include/linux/mm.h:990! RIP: 0010:init_page_owner+0x486/0x520
This means that assumptions behind commit fe53ca54270a ("mm: use early_pfn_to_nid in page_ext_init") are incomplete. Therefore, revert the commit for now. A proper way to move the page_owner initialization to sooner is to hook into memmap initialization.
--- init/main.c | 3 ++- mm/page_ext.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-)
init/main.c +2 -1
@@ -695,7 +695,6 @@ asmlinkage __visible void __init start_kernel(void) initrd_start = 0; }#endif -page_ext_init ();kmemleak_init ();debug_objects_mem_init ();setup_per_cpu_pageset ();
@@ -1147,6 +1146,8 @@ static noinline void __init kernel_init_freeable(void)sched_init_smp ();page_alloc_init_late (); +/* Initialize page ext after all struct pages are initialized. */ +page_ext_init ();do_basic_setup ();
mm/page_ext.c +1 -3
@@ -398,10 +398,8 @@ void __init page_ext_init(void)* We know some arch can have a nodes layout such as * -------------pfn--------------> * N0 | N1 | N2 | N0 | N1 | N2|.... -* -* Take into account DEFERRED_STRUCT_PAGE_INIT. */ -if (early_pfn_to_nid (pfn) != nid) +if (pfn_to_nid (pfn) != nid)continue ;if (init_section_page_ext (pfn, nid)) goto oom;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 39/52 csky: Fixup _PAGE_GLOBAL bit for 610 tlb entry
In reply to Sasha LevinFrom: Guo Ren <[email protected]>
[ Upstream commit 62eebea655d4be5a20fd563abfd7656724cdcd00 ]
C-SKY CPU 8xx's _PAGE_GLOBAL is BIT(0), but 610's _PAGE_GLOBAL is BIT(6). Use _PAGE_GLOBAL macro instead of bad magic number.
--- arch/csky/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/csky/include/asm/pgtable.h +2 -2
@@ -45,8 +45,8 @@ ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset_t(address))#define pmd_page (pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))#define pte_clear (mm, addr, ptep) set_pte((ptep), \ - (((unsigned int)addr&0x80000000)?__pte(1):__pte(0))) -#define pte_none (pte) (!(pte_val(pte)&0xfffffffe)) + (((unsigned int) addr & PAGE_OFFSET) ? __pte(_PAGE_GLOBAL) : __pte(0))) +#define pte_none (pte) (!(pte_val(pte) & ~_PAGE_GLOBAL))#define pte_present (pte) (pte_val(pte) & _PAGE_PRESENT)#define pte_pfn (x) ((unsigned long)((x).pte_low >> PAGE_SHIFT))#define pfn_pte (pfn, prot) __pte(((unsigned long long)(pfn) << PAGE_SHIFT) \
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 40/52 csky: Fixup wrong pt_regs size
In reply to Sasha LevinFrom: Guo Ren <[email protected]>
[ Upstream commit 9216cd7231c12a8c391bb2c904d13695398d3453 ]
The bug is from commit 2054f4af1957 ("csky: bugfix gdb coredump error.")
We change the ELF_NGREG to ELF_NGREG - 2 to fit gdb&gcc define, but forgot modify ptrace regset.
Now coredump use ELF_NRGEG to parse GPRs and ptrace use pt_regs_regset, so there are two different reg_sets for userspace.
--- arch/csky/kernel/ptrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/csky/kernel/ptrace.c +2 -1
@@ -8,6 +8,7 @@#include <linux/ptrace.h> #include <linux/regset.h> #include <linux/sched.h> +#include <linux/sched/task_stack.h> #include <linux/signal.h> #include <linux/smp.h> #include <linux/uaccess.h>
@@ -161,7 +162,7 @@ static int fpr_set(struct task_struct *target,static const struct user_regset csky_regsets[] = { [REGSET_GPR ] = { .core_note_type =NT_PRSTATUS , - .n =ELF_NGREG , + .n =sizeof (struct pt_regs ) /sizeof (u32), .size =sizeof (u32), .align =sizeof (u32), .get = &gpr_get,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 41/52 csky: Fixup io-range page attribute for mmap("/dev/mem")
In reply to Sasha LevinFrom: Guo Ren <[email protected]>
[ Upstream commit 76d21d186a65523b08ea5f70302e2c29ee8f6a8d ]
Some user space drivers need accessing IO address and IO remap need SO(strong order) page-attribute to make IO operation correct. So we need add SO-page-attr for all non-memory address.
--- arch/csky/include/asm/pgtable.h | 5 +++++ arch/csky/mm/ioremap.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+)
arch/csky/include/asm/pgtable.h +5 -0
@@ -241,6 +241,11 @@ static inline pte_t pte_mkyoung(pte_t pte)#define pgd_index (address) ((address) >> PGDIR_SHIFT) +#define __HAVE_PHYS_MEM_ACCESS_PROT +struct file ; +extern pgprot_t phys_mem_access_prot (struct file *file,unsigned long pfn, +unsigned long size,pgprot_t vma_prot); +/* * Macro to make mark a page protection value as "uncacheable". Note * that "protection" is really a misnomer here as the protection value
arch/csky/mm/ioremap.c +14 -0
@@ -46,3 +46,17 @@ void iounmap(void __iomem *addr)vunmap ((void *)((unsigned long )addr &PAGE_MASK )); }EXPORT_SYMBOL (iounmap); + +pgprot_t phys_mem_access_prot (struct file *file,unsigned long pfn, +unsigned long size,pgprot_t vma_prot) +{ +if (!pfn_valid (pfn)) { + vma_prot.pgprot |= _PAGE_SO; +return pgprot_noncached (vma_prot); + }else if (file->f_flags &O_SYNC ) { +return pgprot_noncached (vma_prot); + } + +return vma_prot; +} +EXPORT_SYMBOL (phys_mem_access_prot);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 42/52 csky: Fixup dead loop in show_stack
In reply to Sasha LevinFrom: Guo Ren <[email protected]>
[ Upstream commit 131aee8b9807bc98379fa5a0270389dbc7dcec90 ]
When STACKTRACE is enabled, we must pass fp as stack for unwind, otherwise random value in stack will casue a dead loop.
--- arch/csky/kernel/dumpstack.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/csky/kernel/dumpstack.c +4 -0
@@ -47,7 +47,11 @@ void show_stack(struct task_struct *task, unsigned long *stack)if (task) stack = (unsigned long *)task->thread.esp0; else +#ifdef CONFIG_STACKTRACE + asmvolatile ("mov %0, r8\n" :"=r" (stack)::"memory" ); +#else stack = (unsigned long *)&stack; +#endif } endstack = (unsigned long *) (((unsigned long )stack +THREAD_SIZE -1 ) & -THREAD_SIZE );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 43/52 scsi: qla2xxx: Fix panic from use after free in qla2x00_async_tm_cmd
In reply to Sasha LevinFrom: Bill Kuzeja <[email protected]>
[ Upstream commit 388a49959ee4e4e99f160241d9599efa62cd4299 ]
In qla2x00_async_tm_cmd, we reference off sp after it has been freed. This caused a panic on a system running a slub debug kernel. Since fcport is passed in anyways, just use that instead.
--- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -2
@@ -1787,13 +1787,13 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun,/* Issue Marker IOCB */ qla2x00_marker (vha, vha->hw->req_q_map[0 ], - vha->hw->rsp_q_map[0 ], sp->fcport->loop_id, lun, + vha->hw->rsp_q_map[0 ], fcport->loop_id, lun, flags ==TCF_LUN_RESET ?MK_SYNC_ID_LUN :MK_SYNC_ID ); } done_free_sp: sp->free (sp); - sp->fcport->flags &= ~FCF_ASYNC_SENT ; + fcport->flags &= ~FCF_ASYNC_SENT ; done:return rval; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 44/52 net: dsa: bcm_sf2: potential array overflow in bcm_sf2_sw_suspend()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 8d6ea932856c7087ce8c3d0e79494b7d5386f962 ]
The value of ->num_ports comes from bcm_sf2_sw_probe() and it is less than or equal to DSA_MAX_PORTS. The ds->ports[] array is used inside the dsa_is_user_port() and dsa_is_cpu_port() functions. The ds->ports[] array is allocated in dsa_switch_alloc() and it has ds->num_ports elements so this leads to a static checker warning about a potential out of bounds read.
--- drivers/net/dsa/bcm_sf2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/bcm_sf2.c +1 -1
@@ -691,7 +691,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds)* port, the other ones have already been disabled during * bcm_sf2_sw_setup */ -for (port =0 ; port <DSA_MAX_PORTS ; port++) { +for (port =0 ; port < ds->num_ports; port++) {if (dsa_is_user_port (ds, port) ||dsa_is_cpu_port (ds, port))bcm_sf2_port_disable (ds, port,NULL ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 45/52 x86/CPU: Add Icelake model number
In reply to Sasha LevinFrom: Rajneesh Bhardwaj <[email protected]>
[ Upstream commit 8cd8f0ce0d6aafe661cb3d6781c8b82bc696c04d ]
Add the CPUID model number of Icelake (ICL) mobile processors to the Intel family list. Icelake U/Y series uses model number 0x7E.
--- arch/x86/include/asm/intel-family.h | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/include/asm/intel-family.h +2 -0
@@ -52,6 +52,8 @@#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66 +#define INTEL_FAM6_ICELAKE_MOBILE 0x7E +/* "Small Core" Processors (Atom) */ #define INTEL_FAM6_ATOM_BONNELL 0x1C/* Diamondville, Pineview */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 46/52 mm: page_alloc: fix ref bias in page_frag_alloc() for 1-byte allocs
In reply to Sasha LevinFrom: Jann Horn <[email protected]>
[ Upstream commit 2c2ade81741c66082f8211f0b96cf509cc4c0218 ]
The basic idea behind ->pagecnt_bias is: If we pre-allocate the maximum number of references that we might need to create in the fastpath later, the bump-allocation fastpath only has to modify the non-atomic bias value that tracks the number of extra references we hold instead of the atomic refcount. The maximum number of allocations we can serve (under the assumption that no allocation is made with size 0) is nc->size, so that's the bias used.
However, even when all memory in the allocation has been given away, a reference to the page is still held; and in the offset < 0 slowpath, the page may be reused if everyone else has dropped their references. This means that the necessary number of references is actually nc->size+1.
Luckily, from a quick grep, it looks like the only path that can call page_frag_alloc(fragsz=1) is TAP with the IFF_NAPI_FRAGS flag, which requires CAP_NET_ADMIN in the init namespace and is only intended to be used for kernel testing and fuzzing.
To test for this issue, put a WARN_ON(page_ref_count(page) == 0) in the offset < 0 path, below the virt_to_page() call, and then repeatedly call writev() on a TAP device with IFF_TAP|IFF_NO_PI|IFF_NAPI_FRAGS|IFF_NAPI, with a vector consisting of 15 elements containing 1 byte each.
--- mm/page_alloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/page_alloc.c +4 -4
@@ -4537,11 +4537,11 @@ void *page_frag_alloc(struct page_frag_cache *nc,/* Even if we own the page, we do not use atomic_set(). * This would break get_page_unless_zero() users. */ -page_ref_add (page, size -1 ); +page_ref_add (page, size);/* reset page count bias and offset to start of new frag */ nc->pfmemalloc =page_is_pfmemalloc (page); - nc->pagecnt_bias = size; + nc->pagecnt_bias = size +1 ; nc->offset = size; }
@@ -4557,10 +4557,10 @@ void *page_frag_alloc(struct page_frag_cache *nc, size = nc->size;#endif /* OK, page count is 0, we can safely set it */ -set_page_count (page, size); +set_page_count (page, size +1 );/* reset page count bias and offset to start of new frag */ - nc->pagecnt_bias = size; + nc->pagecnt_bias = size +1 ; offset = size - fragsz; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 47/52 net: hns: Fix object reference leaks in hns_dsaf_roce_reset()
In reply to Sasha LevinFrom: Huang Zijiang <[email protected]>
[ Upstream commit c969c6e7ab8cb42b5c787c567615474fdbad9d6a ]
The of_find_device_by_node() takes a reference to the underlying device structure, we should release that reference.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +2 -0
@@ -3081,6 +3081,7 @@ int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset) dsaf_dev =dev_get_drvdata (&pdev->dev);if (!dsaf_dev) {dev_err (&pdev->dev,"dsaf_dev is NULL\n" ); +put_device (&pdev->dev);return -ENODEV ; }
@@ -3088,6 +3089,7 @@ int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)if (AE_IS_VER1 (dsaf_dev->dsaf_ver)) {dev_err (dsaf_dev->dev,"%s v1 chip doesn't support RoCE!\n" , dsaf_dev->ae_dev.name); +put_device (&pdev->dev);return -ENODEV ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 48/52 i2c: cadence: Fix the hold bit setting
In reply to Sasha LevinFrom: Shubhrajyoti Datta <[email protected]>
[ Upstream commit d358def706880defa4c9e87381c5bf086a97d5f9 ]
In case the hold bit is not needed we are carrying the old values. Fix the same by resetting the bit when not needed.
Fixes the sporadic i2c bus lockups on National Instruments Zynq-based devices.
--- drivers/i2c/busses/i2c-cadence.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-cadence.c +7 -2
@@ -382,8 +382,10 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id)* Check for the message size against FIFO depth and set the * 'hold bus' bit if it is greater than FIFO depth. */ -if (id->recv_count >CDNS_I2C_FIFO_DEPTH ) +if ((id->recv_count >CDNS_I2C_FIFO_DEPTH ) || id->bus_hold_flag) ctrl_reg |=CDNS_I2C_CR_HOLD ; +else + ctrl_reg = ctrl_reg & ~CDNS_I2C_CR_HOLD ;cdns_i2c_writereg (ctrl_reg,CDNS_I2C_CR_OFFSET );
@@ -440,8 +442,11 @@ static void cdns_i2c_msend(struct cdns_i2c *id)* Check for the message size against FIFO depth and set the * 'hold bus' bit if it is greater than FIFO depth. */ -if (id->send_count >CDNS_I2C_FIFO_DEPTH ) +if ((id->send_count >CDNS_I2C_FIFO_DEPTH ) || id->bus_hold_flag) ctrl_reg |=CDNS_I2C_CR_HOLD ; +else + ctrl_reg = ctrl_reg & ~CDNS_I2C_CR_HOLD ; +cdns_i2c_writereg (ctrl_reg,CDNS_I2C_CR_OFFSET );/* Clear the interrupts in interrupt status register. */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 49/52 i2c: bcm2835: Clear current buffer pointers and counts after a transfer
In reply to Sasha LevinFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit f275a4659484716259cc46268d9043424e51cf0f ]
The driver's interrupt handler checks whether a message is currently being handled with the curr_msg pointer. When it is NULL, the interrupt is considered to be unexpected. Similarly, the i2c_start_transfer routine checks for the remaining number of messages to handle in num_msgs.
However, these values are never cleared and always keep the message and number relevant to the latest transfer (which might be done already and the underlying message memory might have been freed).
When an unexpected interrupt hits with the DONE bit set, the isr will then try to access the flags field of the curr_msg structure, leading to a fatal page fault.
The msg_buf and msg_buf_remaining fields are also never cleared at the end of the transfer, which can lead to similar pitfalls.
Fix these issues by introducing a cleanup function and always calling it after a transfer is finished.
--- drivers/i2c/busses/i2c-bcm2835.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/i2c/busses/i2c-bcm2835.c +12 -0
@@ -191,6 +191,15 @@ static void bcm2835_i2c_start_transfer(struct bcm2835_i2c_dev *i2c_dev)bcm2835_i2c_writel (i2c_dev,BCM2835_I2C_C , c); } +static void bcm2835_i2c_finish_transfer (struct bcm2835_i2c_dev *i2c_dev) +{ + i2c_dev->curr_msg =NULL ; + i2c_dev->num_msgs =0 ; + + i2c_dev->msg_buf =NULL ; + i2c_dev->msg_buf_remaining =0 ; +} +/* * Note about I2C_C_CLEAR on error: * The I2C_C_CLEAR on errors will take some time to resolve -- if you were in
@@ -291,6 +300,9 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], time_left =wait_for_completion_timeout (&i2c_dev->completion, adap->timeout); + +bcm2835_i2c_finish_transfer (i2c_dev); +if (!time_left) {bcm2835_i2c_writel (i2c_dev,BCM2835_I2C_C ,BCM2835_I2C_C_CLEAR );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 50/52 auxdisplay: ht16k33: fix potential user-after-free on module unload
In reply to Sasha LevinFrom: Miguel Ojeda <[email protected]>
[ Upstream commit 69ef9bc54715fb1cb7786ada15774e469e822209 ]
On module unload/remove, we need to ensure that work does not run after we have freed resources. Concretely, cancel_delayed_work() may return while the callback function is still running.
From kernel/workqueue.c:
The work callback function may still be running on return, unless it returns true and the work doesn't re-arm itself. Explicitly flush or use cancel_delayed_work_sync() to wait on it.
--- drivers/auxdisplay/ht16k33.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/auxdisplay/ht16k33.c +1 -1
@@ -509,7 +509,7 @@ static int ht16k33_remove(struct i2c_client *client)struct ht16k33_priv *priv =i2c_get_clientdata (client);struct ht16k33_fbdev *fbdev = &priv->fbdev; -cancel_delayed_work (&fbdev->work); +cancel_delayed_work_sync (&fbdev->work);unregister_framebuffer (fbdev->info);framebuffer_release (fbdev->info);free_page ((unsigned long ) fbdev->buffer);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 51/52 lib/crc32.c: mark crc32_le_base/__crc32c_le_base aliases as __pure
In reply to Sasha LevinFrom: Miguel Ojeda <[email protected]>
[ Upstream commit ff98e20ef2081b8620dada28fc2d4fb24ca0abf2 ]
The upcoming GCC 9 release extends the -Wmissing-attributes warnings (enabled by -Wall) to C and aliases: it warns when particular function attributes are missing in the aliases but not in their target.
In particular, it triggers here because crc32_le_base/__crc32c_le_base aren't __pure while their target crc32_le/__crc32c_le are.
These aliases are used by architectures as a fallback in accelerated versions of CRC32. See commit 9784d82db3eb ("lib/crc32: make core crc32() routines weak so they can be overridden").
Therefore, being fallbacks, it is likely that even if the aliases were called from C, there wouldn't be any optimizations possible. Currently, the only user is arm64, which calls this from asm.
Still, marking the aliases as __pure makes sense and is a good idea for documentation purposes and possible future optimizations, which also silences the warning.
--- lib/crc32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/crc32.c +2 -2
@@ -206,8 +206,8 @@ u32 __pure __weak __crc32c_le(u32 crc, unsigned char const *p, size_t len)EXPORT_SYMBOL (crc32_le);EXPORT_SYMBOL (__crc32c_le); -u32 crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le); -u32 __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le); +u32 __pure crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le); +u32 __pure __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le);/* * This multiplies the polynomials x and y modulo the given modulus.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 52/52 Input: st-keyscan - fix potential zalloc NULL dereference
In reply to Sasha LevinFrom: Gabriel Fernandez <[email protected]>
[ Upstream commit 2439d37e1bf8a34d437573c086572abe0f3f1b15 ]
This patch fixes the following static checker warning:
drivers/input/keyboard/st-keyscan.c:156 keyscan_probe()
error: potential zalloc NULL dereference: 'keypad_data->input_dev'
--- drivers/input/keyboard/st-keyscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/keyboard/st-keyscan.c +2 -2
@@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev) input_dev->id.bustype =BUS_HOST ; + keypad_data->input_dev = input_dev; + error =keypad_matrix_key_parse_dt (keypad_data);if (error)return error;
@@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev)input_set_drvdata (input_dev, keypad_data); - keypad_data->input_dev = input_dev; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); keypad_data->base =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (keypad_data->base))
Signature · 1 line
2.19.1