5.15.17-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 117/846 media: aspeed: fix mode-detect always time out at 2nd run
In reply to Greg Kroah-HartmanFrom: Jammy Huang <[email protected]>
[ Upstream commit 62cea52ad4bead0ae4be2cfe1142eb0aae0e9fbd ]
aspeed_video_get_resolution() will try to do res-detect again if the timing got in last try is invalid. But it will always time out because VE_SEQ_CTRL_TRIG_MODE_DET is only cleared after 1st mode-detect.
To fix the problem, just clear VE_SEQ_CTRL_TRIG_MODE_DET before setting it in aspeed_video_enable_mode_detect().
--- drivers/media/platform/aspeed-video.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/platform/aspeed-video.c +4 -4
@@ -500,6 +500,10 @@ static void aspeed_video_enable_mode_detect(struct aspeed_video *video)aspeed_video_update (video,VE_INTERRUPT_CTRL ,0 ,VE_INTERRUPT_MODE_DETECT ); +/* Disable mode detect in order to re-trigger */ +aspeed_video_update (video,VE_SEQ_CTRL , +VE_SEQ_CTRL_TRIG_MODE_DET ,0 ); +/* Trigger mode detect */ aspeed_video_update (video,VE_SEQ_CTRL ,0 ,VE_SEQ_CTRL_TRIG_MODE_DET ); }
@@ -786,10 +790,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)return ; } -/* Disable mode detect in order to re-trigger */ -aspeed_video_update (video,VE_SEQ_CTRL , -VE_SEQ_CTRL_TRIG_MODE_DET ,0 ); -aspeed_video_check_and_set_polarity (video);aspeed_video_enable_mode_detect (video);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 118/846 media: em28xx: fix memory leak in em28xx_init_dev
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 22be5a10d0b24eec9e45decd15d7e6112b25f080 ]
In the em28xx_init_rev, if em28xx_audio_setup fails, this function fails to deallocate the media_dev allocated in the em28xx_media_device_init.
Fix this by adding em28xx_unregister_media_device to free media_dev.
BTW, this patch is tested in my local syzkaller instance, and it can prevent the memory leak from occurring again.
--- drivers/media/usb/em28xx/em28xx-cards.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/media/usb/em28xx/em28xx-cards.c +12 -6
@@ -3625,8 +3625,10 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,if (dev->is_audio_only) { retval =em28xx_audio_setup (dev); -if (retval) -return -ENODEV ; +if (retval) { + retval = -ENODEV ; + goto err_deinit_media; + }em28xx_init_extension (dev);return 0 ;
@@ -3645,7 +3647,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,dev_err (&dev->intf->dev,"%s: em28xx_i2c_register bus 0 - error [%d]!\n" , __func__, retval); -return retval; + goto err_deinit_media; }/* register i2c bus 1 */
@@ -3661,9 +3663,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,"%s: em28xx_i2c_register bus 1 - error [%d]!\n" , __func__, retval); -em28xx_i2c_unregister (dev,0 ); - -return retval; + goto err_unreg_i2c; } }
@@ -3671,6 +3671,12 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,em28xx_card_setup (dev);return 0 ; + +err_unreg_i2c: +em28xx_i2c_unregister (dev,0 ); +err_deinit_media: +em28xx_unregister_media_device (dev); +return retval; }static int em28xx_duplicate_dev (struct em28xx *dev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 119/846 media: aspeed: Update signal status immediately to ensure sane hw state
In reply to Greg Kroah-HartmanFrom: Jammy Huang <[email protected]>
[ Upstream commit af6d1bde395cac174ee71adcd3fa43f6435c7206 ]
If res-chg, VE_INTERRUPT_MODE_DETECT_WD irq will be raised. But v4l2_input_status won't be updated to no-signal immediately until aspeed_video_get_resolution() in aspeed_video_resolution_work().
During the period of time, aspeed_video_start_frame() could be called because it doesn't know signal becomes unstable now. If it goes with aspeed_video_init_regs() of aspeed_video_irq_res_change() simultaneously, it will mess up hw state.
To fix this problem, v4l2_input_status is updated to no-signal immediately for VE_INTERRUPT_MODE_DETECT_WD irq.
--- drivers/media/platform/aspeed-video.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/aspeed-video.c +3 -3
@@ -556,6 +556,8 @@ static void aspeed_video_irq_res_change(struct aspeed_video *video, ulong delay)set_bit (VIDEO_RES_CHANGE , &video->flags);clear_bit (VIDEO_FRAME_INPRG , &video->flags); + video->v4l2_input_status =V4L2_IN_ST_NO_SIGNAL ; +aspeed_video_off (video);aspeed_video_bufs_done (video,VB2_BUF_STATE_ERROR );
@@ -1337,7 +1339,6 @@ static void aspeed_video_resolution_work(struct work_struct *work)struct delayed_work *dwork =to_delayed_work (work); struct aspeed_video *video = container_of(dwork, struct aspeed_video, res_work); -u32 input_status = video->v4l2_input_status;aspeed_video_on (video);
@@ -1350,8 +1351,7 @@ static void aspeed_video_resolution_work(struct work_struct *work)aspeed_video_get_resolution (video);if (video->detected_timings.width != video->active_timings.width || - video->detected_timings.height != video->active_timings.height || - input_status != video->v4l2_input_status) { + video->detected_timings.height != video->active_timings.height) {static const struct v4l2_event ev = { .type =V4L2_EVENT_SOURCE_CHANGE , .u.src_change.changes =V4L2_EVENT_SRC_CH_RESOLUTION ,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 120/846 arm64: dts: amlogic: meson-g12: Fix GPU operating point table node name
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit bb98a6fd0b0e227cefb2ba91cea2b55455f203b7 ]
Starting with commit 94274f20f6bf ("dt-bindings: opp: Convert to DT schema") the opp node name has a mandatory pattern. This change fixes the dtbs_check warning:
gpu-opp-table: $nodename:0: 'gpu-opp-table' does not match '^opp-table(-[a-z0-9]+)?$'
Put the 'gpu' part at the end to match the pattern.
--- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +1 -1
@@ -58,7 +58,7 @@ secure-monitor = <&sm>; }; - gpu_opp_table: gpu-opp-table { + gpu_opp_table: opp-table-gpu { compatible = "operating-points-v2"; opp-124999998 {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 121/846 arm64: dts: amlogic: Fix SPI NOR flash node name for ODROID N2/N2+
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit 95d35256b564aca33fb661eac77dc94bfcffc8df ]
Fix the schema warning: "spi-flash@0: $nodename:0: 'spi-flash@0' does
not match '^flash(@.*)?$'" from jedec,spi-nor.yaml
--- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +1 -1
@@ -607,7 +607,7 @@ pinctrl-0 = <&nor_pins>; pinctrl-names = "default"; - mx25u64: spi-flash@0 { + mx25u64: flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "mxicy,mx25u6435f", "jedec,spi-nor";
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 122/846 arm64: dts: meson-gxbb-wetek: fix HDMI in early boot
In reply to Greg Kroah-HartmanFrom: Christian Hewitt <[email protected]>
[ Upstream commit 8182a35868db5f053111d5d9d4da8fcb3f99259d ]
Mark the VDDIO_AO18 regulator always-on and set hdmi-supply for the hdmi_tx node to ensure HDMI is powered in the early stages of boot.
--- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi +2 -0
@@ -64,6 +64,7 @@ regulator-name = "VDDIO_AO18"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; }; vcc_3v3: regulator-vcc_3v3 {
@@ -161,6 +162,7 @@ status = "okay"; pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; pinctrl-names = "default"; + hdmi-supply = <&vddio_ao18>; }; &hdmi_tx_tmds_port {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 123/846 arm64: dts: meson-gxbb-wetek: fix missing GPIO binding
In reply to Greg Kroah-HartmanFrom: Christian Hewitt <[email protected]>
[ Upstream commit c019abb2feba3cbbd7cf7178f8e6499c4fa6fced ]
The absence of this binding appears to be harmless in Linux but it breaks Ethernet support in mainline u-boot. So add the binding (which is present in all other u-boot supported GXBB device-trees).
--- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi +1 -0
@@ -6,6 +6,7 @@ */ #include "meson-gxbb.dtsi" +#include <dt-bindings/gpio/gpio.h> / { aliases {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 124/846 fs: dlm: dont call kernel_getpeername() in error_report()
In reply to Greg Kroah-HartmanFrom: Alexander Aring <[email protected]>
[ Upstream commit 4c3d90570bcc2b338f70f61f01110268e281ca3c ]
In some cases kernel_getpeername() will held the socket lock which is already held when the socket layer calls error_report() callback. Since commit 9dfc685e0262 ("inet: remove races in inet{6}_getname()") this problem becomes more likely because the socket lock will be held always. You will see something like:
bob9-u5 login: [ 562.316860] BUG: spinlock recursion on CPU#7, swapper/7/0
[ 562.318562] lock: 0xffff8f2284720088, .magic: dead4ead, .owner: swapper/7/0, .owner_cpu: 7 [ 562.319522] CPU: 7 PID: 0 Comm: swapper/7 Not tainted 5.15.0+ #135 [ 562.320346] Hardware name: Red Hat KVM/RHEL-AV, BIOS 1.13.0-2.module+el8.3.0+7353+9de0a3cc 04/01/2014 [ 562.321277] Call Trace: [ 562.321529] <IRQ> [ 562.321734] dump_stack_lvl+0x33/0x42 [ 562.322282] do_raw_spin_lock+0x8b/0xc0 [ 562.322674] lock_sock_nested+0x1e/0x50 [ 562.323057] inet_getname+0x39/0x110 [ 562.323425] ? sock_def_readable+0x80/0x80 [ 562.323838] lowcomms_error_report+0x63/0x260 [dlm] [ 562.324338] ? wait_for_completion_interruptible_timeout+0xd2/0x120 [ 562.324949] ? lock_timer_base+0x67/0x80 [ 562.325330] ? do_raw_spin_unlock+0x49/0xc0 [ 562.325735] ? _raw_spin_unlock_irqrestore+0x1e/0x40 [ 562.326218] ? del_timer+0x54/0x80 [ 562.326549] sk_error_report+0x12/0x70 [ 562.326919] tcp_validate_incoming+0x3c8/0x530 [ 562.327347] ? kvm_clock_read+0x14/0x30 [ 562.327718] ? ktime_get+0x3b/0xa0 [ 562.328055] tcp_rcv_established+0x121/0x660 [ 562.328466] tcp_v4_do_rcv+0x132/0x260 [ 562.328835] tcp_v4_rcv+0xcea/0xe20 [ 562.329173] ip_protocol_deliver_rcu+0x35/0x1f0 [ 562.329615] ip_local_deliver_finish+0x54/0x60 [ 562.330050] ip_local_deliver+0xf7/0x110 [ 562.330431] ? inet_rtm_getroute+0x211/0x840 [ 562.330848] ? ip_protocol_deliver_rcu+0x1f0/0x1f0 [ 562.331310] ip_rcv+0xe1/0xf0 [ 562.331603] ? ip_local_deliver+0x110/0x110 [ 562.332011] __netif_receive_skb_core+0x46a/0x1040 [ 562.332476] ? inet_gro_receive+0x263/0x2e0 [ 562.332885] __netif_receive_skb_list_core+0x13b/0x2c0 [ 562.333383] netif_receive_skb_list_internal+0x1c8/0x2f0 [ 562.333896] ? update_load_avg+0x7e/0x5e0 [ 562.334285] gro_normal_list.part.149+0x19/0x40 [ 562.334722] napi_complete_done+0x67/0x160 [ 562.335134] virtnet_poll+0x2ad/0x408 [virtio_net] [ 562.335644] __napi_poll+0x28/0x140 [ 562.336012] net_rx_action+0x23d/0x300 [ 562.336414] __do_softirq+0xf2/0x2ea [ 562.336803] irq_exit_rcu+0xc1/0xf0 [ 562.337173] common_interrupt+0xb9/0xd0
It is and was always forbidden to call kernel_getpeername() in context of error_report(). To get rid of the problem we access the destination address for the peer over the socket structure. While on it we fix to print out the destination port of the inet socket.
--- fs/dlm/lowcomms.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-)
fs/dlm/lowcomms.c +20 -22
@@ -592,8 +592,8 @@ int dlm_lowcomms_nodes_set_mark(int nodeid, unsigned int mark)static void lowcomms_error_report (struct sock *sk) {struct connection *con; -struct sockaddr_storage saddr;void (*orig_report)(struct sock *) =NULL ; +struct inet_sock *inet;read_lock_bh (&sk->sk_callback_lock); con =sock2con (sk);
@@ -601,33 +601,31 @@ static void lowcomms_error_report(struct sock *sk) goto out; orig_report = listen_sock.sk_error_report; -if (kernel_getpeername (sk->sk_socket, (struct sockaddr *)&saddr) <0 ) { -printk_ratelimited (KERN_ERR "dlm: node %d: socket error " -"sending to node %d, port %d, " -"sk_err=%d/%d\n" ,dlm_our_nodeid (), - con->nodeid, dlm_config.ci_tcp_port, - sk->sk_err, sk->sk_err_soft); - }else if (saddr.ss_family ==AF_INET ) { -struct sockaddr_in *sin4 = (struct sockaddr_in *)&saddr; + inet =inet_sk (sk); +switch (sk->sk_family) { +case AF_INET :printk_ratelimited (KERN_ERR "dlm: node %d: socket error " -"sending to node %d at %pI4, port %d, " +"sending to node %d at %pI4, dport %d, " "sk_err=%d/%d\n" ,dlm_our_nodeid (), - con->nodeid, &sin4->sin_addr.s_addr, - dlm_config.ci_tcp_port, sk->sk_err, + con->nodeid, &inet->inet_daddr, +ntohs (inet->inet_dport), sk->sk_err, sk->sk_err_soft); - }else { -struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&saddr; - +break ; +case AF_INET6 :printk_ratelimited (KERN_ERR "dlm: node %d: socket error " -"sending to node %d at %u.%u.%u.%u, " -"port %d, sk_err=%d/%d\n" ,dlm_our_nodeid (), - con->nodeid, sin6->sin6_addr.s6_addr32[0 ], - sin6->sin6_addr.s6_addr32[1 ], - sin6->sin6_addr.s6_addr32[2 ], - sin6->sin6_addr.s6_addr32[3 ], - dlm_config.ci_tcp_port, sk->sk_err, +"sending to node %d at %pI6c, " +"dport %d, sk_err=%d/%d\n" ,dlm_our_nodeid (), + con->nodeid, &sk->sk_v6_daddr, +ntohs (inet->inet_dport), sk->sk_err, sk->sk_err_soft); +break ; +default : +printk_ratelimited (KERN_ERR "dlm: node %d: socket error " +"invalid socket family %d set, " +"sk_err=%d/%d\n" ,dlm_our_nodeid (), + sk->sk_family, sk->sk_err, sk->sk_err_soft); + goto out; }/* below sendcon only handling */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 125/846 memory: renesas-rpc-if: Return error in case devm_ioremap_resource() fails
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 818fdfa89baac77a8df5a2c30f4fb798cc937aa0 ]
Make sure we return error in case devm_ioremap_resource() fails for dirmap resource.
--- drivers/memory/renesas-rpc-if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memory/renesas-rpc-if.c +1 -1
@@ -244,7 +244,7 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev) res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dirmap" ); rpc->dirmap =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (rpc->dirmap)) - rpc->dirmap =NULL ; +return PTR_ERR (rpc->dirmap); rpc->size =resource_size (res); rpc->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 126/846 Bluetooth: stop proccessing malicious adv data
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 3a56ef719f0b9682afb8a86d64b2399e36faa4e6 ]
Syzbot reported slab-out-of-bounds read in hci_le_adv_report_evt(). The problem was in missing validaion check.
We should check if data is not malicious and we can read next data block. If we won't check ptr validness, code can read a way beyond skb->end and it can cause problems, of course.
--- net/bluetooth/hci_event.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/bluetooth/hci_event.c +7 -1
@@ -5780,7 +5780,8 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)struct hci_ev_le_advertising_info *ev = ptr;s8 rssi; -if (ev->length <=HCI_MAX_AD_LENGTH ) { +if (ev->length <=HCI_MAX_AD_LENGTH && + ev->data + ev->length <=skb_tail_pointer (skb)) { rssi = ev->data[ev->length]; process_adv_report(hdev, ev->evt_type, &ev->bdaddr, ev->bdaddr_type, NULL, 0, rssi,
@@ -5790,6 +5791,11 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb) } ptr +=sizeof (*ev) + ev->length +1 ; + +if (ptr > (void *)skb_tail_pointer (skb) -sizeof (*ev)) { +bt_dev_err (hdev,"Malicious advertising data. Stopping processing" ); +break ; + } }hci_dev_unlock (hdev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 127/846 ath11k: Fix ETSI regd with weather radar overlap
In reply to Greg Kroah-HartmanFrom: Sven Eckelmann <[email protected]>
[ Upstream commit 086c921a354089f209318501038d43c98d3f409f ]
Some ETSI countries have a small overlap in the wireless-regdb with an ETSI channel (5590-5650). A good example is Australia:
country AU: DFS-ETSI
(2400 - 2483.5 @ 40), (36)
(5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW (5250 - 5350 @ 80), (20), NO-OUTDOOR, AUTO-BW, DFS (5470 - 5600 @ 80), (27), DFS
(5650 - 5730 @ 80), (27), DFS
(5730 - 5850 @ 80), (36)
(57000 - 66000 @ 2160), (43), NO-OUTDOOR
If the firmware (or the BDF) is shipped with these rules then there is only a 10 MHz overlap with the weather radar:
* below: 5470 - 5590
* weather radar: 5590 - 5600
* above: (none for the rule "5470 - 5600 @ 80")
There are several wrong assumption in the ath11k code:
* there is always a valid range below the weather radar (actually: there could be no range below the weather radar range OR range could be smaller than 20 MHz)
* intersected range in the weather radar range is valid (actually: the range could be smaller than 20 MHz)
* range above weather radar is either empty or valid
(actually: the range could be smaller than 20 MHz)
These wrong assumption will lead in this example to a rule
(5590 - 5600 @ 20), (N/A, 27), (600000 ms), DFS, AUTO-BW
which is invalid according to is_valid_reg_rule() because the freq_diff is only 10 MHz but the max_bandwidth is set to 20 MHz. Which results in a rejection like:
WARNING: at backports-20210222_001-4.4.60-b157d2276/net/wireless/reg.c:3984 [...] Call trace: [<ffffffbffc3d2e50>] reg_get_max_bandwidth+0x300/0x3a8 [cfg80211] [<ffffffbffc3d3d0c>] regulatory_set_wiphy_regd_sync+0x3c/0x98 [cfg80211] [<ffffffbffc651598>] ath11k_regd_update+0x1a8/0x210 [ath11k] [<ffffffbffc652108>] ath11k_regd_update_work+0x18/0x20 [ath11k] [<ffffffc0000a93e0>] process_one_work+0x1f8/0x340 [<ffffffc0000a9784>] worker_thread+0x25c/0x448 [<ffffffc0000aedc8>] kthread+0xd0/0xd8 [<ffffffc000085550>] ret_from_fork+0x10/0x40 ath11k c000000.wifi: failed to perform regd update : -22 Invalid regulatory domain detected
To avoid this, the algorithm has to be changed slightly. Instead of splitting a rule which overlaps with the weather radar range into 3 pieces and accepting the first two parts blindly, it must actually be checked for each piece whether it is a valid range. And only if it is valid, add it to the output array.
When these checks are in place, the processed rules for AU would end up as
country AU: DFS-ETSI
(2400 - 2483 @ 40), (N/A, 36), (N/A)
(5150 - 5250 @ 80), (6, 23), (N/A), NO-OUTDOOR, AUTO-BW
(5250 - 5350 @ 80), (6, 20), (0 ms), NO-OUTDOOR, DFS, AUTO-BW
(5470 - 5590 @ 80), (6, 27), (0 ms), DFS, AUTO-BW
(5650 - 5730 @ 80), (6, 27), (0 ms), DFS, AUTO-BW
(5730 - 5850 @ 80), (6, 36), (N/A), AUTO-BWand will be accepted by the wireless regulatory code.
--- drivers/net/wireless/ath/ath11k/reg.c | 103 ++++++++++++++------------ 1 file changed, 56 insertions(+), 47 deletions(-)
drivers/net/wireless/ath/ath11k/reg.c +56 -47
@@ -459,6 +459,9 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw) {u16 bw; +if (end_freq <= start_freq) +return 0 ; + bw = end_freq - start_freq; bw =min_t (u16, bw, max_bw);
@@ -466,8 +469,10 @@ ath11k_reg_adjust_bw(u16 start_freq, u16 end_freq, u16 max_bw) bw =80 ; else if (bw >= 40 && bw < 80) bw =40 ; - else if (bw < 40) + else if (bw >= 20 && bw < 40) bw =20 ; + else + bw =0 ;return bw; }
@@ -491,73 +496,77 @@ ath11k_reg_update_weather_radar_band(struct ath11k_base *ab,struct cur_reg_rule *reg_rule, u8 *rule_idx, u32 flags, u16 max_bw) { + u32 start_freq;u32 end_freq;u16 bw;u8 i; i = *rule_idx; +/* there might be situations when even the input rule must be dropped */ + i--; + +/* frequencies below weather radar */ bw =ath11k_reg_adjust_bw (reg_rule->start_freq,ETSI_WEATHER_RADAR_BAND_LOW , max_bw); +if (bw >0 ) { + i++; -ath11k_reg_update_rule (regd->reg_rules + i, reg_rule->start_freq, -ETSI_WEATHER_RADAR_BAND_LOW , bw, - reg_rule->ant_gain, reg_rule->reg_power, - flags); +ath11k_reg_update_rule (regd->reg_rules + i, + reg_rule->start_freq, +ETSI_WEATHER_RADAR_BAND_LOW , bw, + reg_rule->ant_gain, reg_rule->reg_power, + flags); -ath11k_dbg (ab,ATH11K_DBG_REG , -"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n" , - i +1 , reg_rule->start_freq,ETSI_WEATHER_RADAR_BAND_LOW , - bw, reg_rule->ant_gain, reg_rule->reg_power, - regd->reg_rules[i].dfs_cac_ms, - flags); - -if (reg_rule->end_freq >ETSI_WEATHER_RADAR_BAND_HIGH ) - end_freq =ETSI_WEATHER_RADAR_BAND_HIGH ; -else - end_freq = reg_rule->end_freq; +ath11k_dbg (ab,ATH11K_DBG_REG , +"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n" , + i +1 , reg_rule->start_freq, +ETSI_WEATHER_RADAR_BAND_LOW , bw, reg_rule->ant_gain, + reg_rule->reg_power, regd->reg_rules[i].dfs_cac_ms, + flags); + } - bw =ath11k_reg_adjust_bw (ETSI_WEATHER_RADAR_BAND_LOW , end_freq, - max_bw); +/* weather radar frequencies */ + start_freq =max_t (u32, reg_rule->start_freq, +ETSI_WEATHER_RADAR_BAND_LOW ); + end_freq =min_t (u32, reg_rule->end_freq,ETSI_WEATHER_RADAR_BAND_HIGH ); - i++; + bw =ath11k_reg_adjust_bw (start_freq, end_freq, max_bw); +if (bw >0 ) { + i++; -ath11k_reg_update_rule (regd->reg_rules + i, -ETSI_WEATHER_RADAR_BAND_LOW , end_freq, bw, - reg_rule->ant_gain, reg_rule->reg_power, - flags); +ath11k_reg_update_rule (regd->reg_rules + i, start_freq, + end_freq, bw, reg_rule->ant_gain, + reg_rule->reg_power, flags); - regd->reg_rules[i].dfs_cac_ms =ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT ; + regd->reg_rules[i].dfs_cac_ms =ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT ; -ath11k_dbg (ab,ATH11K_DBG_REG , -"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n" , - i +1 ,ETSI_WEATHER_RADAR_BAND_LOW , end_freq, - bw, reg_rule->ant_gain, reg_rule->reg_power, - regd->reg_rules[i].dfs_cac_ms, - flags); - -if (end_freq == reg_rule->end_freq) { - regd->n_reg_rules--; - *rule_idx = i; -return ; +ath11k_dbg (ab,ATH11K_DBG_REG , +"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n" , + i +1 , start_freq, end_freq, bw, + reg_rule->ant_gain, reg_rule->reg_power, + regd->reg_rules[i].dfs_cac_ms, flags); } +/* frequencies above weather radar */ bw =ath11k_reg_adjust_bw (ETSI_WEATHER_RADAR_BAND_HIGH , reg_rule->end_freq, max_bw); +if (bw >0 ) { + i++; - i++; - -ath11k_reg_update_rule (regd->reg_rules + i,ETSI_WEATHER_RADAR_BAND_HIGH , - reg_rule->end_freq, bw, - reg_rule->ant_gain, reg_rule->reg_power, - flags); +ath11k_reg_update_rule (regd->reg_rules + i, +ETSI_WEATHER_RADAR_BAND_HIGH , + reg_rule->end_freq, bw, + reg_rule->ant_gain, reg_rule->reg_power, + flags); -ath11k_dbg (ab,ATH11K_DBG_REG , -"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n" , - i +1 ,ETSI_WEATHER_RADAR_BAND_HIGH , reg_rule->end_freq, - bw, reg_rule->ant_gain, reg_rule->reg_power, - regd->reg_rules[i].dfs_cac_ms, - flags); +ath11k_dbg (ab,ATH11K_DBG_REG , +"\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n" , + i +1 ,ETSI_WEATHER_RADAR_BAND_HIGH , + reg_rule->end_freq, bw, reg_rule->ant_gain, + reg_rule->reg_power, regd->reg_rules[i].dfs_cac_ms, + flags); + } *rule_idx = i; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 128/846 ath11k: clear the keys properly via DISABLE_KEY
In reply to Greg Kroah-HartmanFrom: Karthikeyan Kathirvel <[email protected]>
[ Upstream commit 436a4e88659842a7cf634d7cc088c8f2cc94ebf5 ]
DISABLE_KEY sets the key_len to 0, firmware will not delete the keys if key_len is 0. Changing from security mode to open mode will cause mcast to be still encrypted without vdev restart.
Set the proper key_len for DISABLE_KEY cmd to clear the keys in firmware.
Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/mac.c | 4 +--- drivers/net/wireless/ath/ath11k/wmi.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -3
@@ -2655,9 +2655,7 @@ static int ath11k_install_key(struct ath11k_vif *arvif,return 0 ;if (cmd ==DISABLE_KEY ) { -/* TODO: Check if FW expects value other than NONE for del */ -/* arg.key_cipher = WMI_CIPHER_NONE; */ - arg.key_len =0 ; + arg.key_cipher =WMI_CIPHER_NONE ; arg.key_data =NULL ; goto install; }
drivers/net/wireless/ath/ath11k/wmi.c +2 -1
@@ -1671,7 +1671,8 @@ int ath11k_wmi_vdev_install_key(struct ath11k *ar, tlv = (struct wmi_tlv *)(skb->data +sizeof (*cmd)); tlv->header =FIELD_PREP (WMI_TLV_TAG ,WMI_TAG_ARRAY_BYTE ) |FIELD_PREP (WMI_TLV_LEN , key_len_aligned); -memcpy (tlv->value, (u8 *)arg->key_data, key_len_aligned); +if (arg->key_data) +memcpy (tlv->value, (u8 *)arg->key_data, key_len_aligned); ret =ath11k_wmi_cmd_send (wmi, skb,WMI_VDEV_INSTALL_KEY_CMDID );if (ret) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 129/846 ath11k: reset RSN/WPA present state for open BSS
In reply to Greg Kroah-HartmanFrom: Karthikeyan Kathirvel <[email protected]>
[ Upstream commit 64bc3aa02ae78b1fcb1b850e0eb1f0622002bfaa ]
The ath11k driver is caching the information about RSN/WPA IE in the configured beacon template. The cached information is used during associations to figure out whether 4-way PKT/2-way GTK peer flags need to be set or not.
But the code never cleared the state when no such IE was found. This can for example happen when moving from an WPA/RSN to an open setup. The (seemingly connected) peer was then not able to communicate over the link because the firmware assumed a different (encryption enabled) state for the peer.
Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/mac.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath11k/mac.c +4 -0
@@ -767,11 +767,15 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)if (cfg80211_find_ie (WLAN_EID_RSN , ies, (skb_tail_pointer (bcn) - ies))) arvif->rsnie_present = true; +else + arvif->rsnie_present = false;if (cfg80211_find_vendor_ie (WLAN_OUI_MICROSOFT ,WLAN_OUI_TYPE_MICROSOFT_WPA , ies, (skb_tail_pointer (bcn) - ies))) arvif->wpaie_present = true; +else + arvif->wpaie_present = false; ret =ath11k_wmi_bcn_tmpl (ar, arvif->vdev_id, &offs, bcn);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 130/846 spi: hisi-kunpeng: Fix the debugfs directory name incorrect
In reply to Greg Kroah-HartmanFrom: oujiefeng <[email protected]>
[ Upstream commit 40fafc8eca3f0d41b9dade5c10afb2dad723aad7 ]
Change the debugfs directory name from hisi_spi65535 to hisi_spi0.
--- drivers/spi/spi-hisi-kunpeng.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/spi/spi-hisi-kunpeng.c +8 -7
@@ -127,7 +127,6 @@ struct hisi_spi {void __iomem *regs;int irq;u32 fifo_len;/* depth of the FIFO buffer */ -u16 bus_num;/* Current message transfer state info */ const void *tx;
@@ -165,7 +164,10 @@ static int hisi_spi_debugfs_init(struct hisi_spi *hs) {char name[32 ]; -snprintf (name,32 ,"hisi_spi%d" , hs->bus_num); +struct spi_controller *master; + + master = container_of(hs->dev, struct spi_controller, dev); +snprintf (name,32 ,"hisi_spi%d" , master->bus_num); hs->debugfs =debugfs_create_dir (name,NULL );if (!hs->debugfs)return -ENOMEM ;
@@ -467,7 +469,6 @@ static int hisi_spi_probe(struct platform_device *pdev) hs =spi_controller_get_devdata (master); hs->dev = dev; hs->irq = irq; - hs->bus_num = pdev->id; hs->regs =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (hs->regs))
@@ -490,7 +491,7 @@ static int hisi_spi_probe(struct platform_device *pdev) master->use_gpio_descriptors = true; master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH |SPI_LOOP ; master->bits_per_word_mask =SPI_BPW_RANGE_MASK (4 ,32 ); - master->bus_num = hs->bus_num; + master->bus_num = pdev->id; master->setup = hisi_spi_setup; master->cleanup = hisi_spi_cleanup; master->transfer_one = hisi_spi_transfer_one;
@@ -506,15 +507,15 @@ static int hisi_spi_probe(struct platform_device *pdev)return ret; } -if (hisi_spi_debugfs_init (hs)) -dev_info (dev,"failed to create debugfs dir\n" ); - ret =spi_register_controller (master);if (ret) {dev_err (dev,"failed to register spi master, ret=%d\n" , ret);return ret; } +if (hisi_spi_debugfs_init (hs)) +dev_info (dev,"failed to create debugfs dir\n" ); +dev_info (dev,"hw version:0x%x max-freq:%u kHz\n" ,readl (hs->regs +HISI_SPI_VERSION ), master->max_speed_hz /1000 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 131/846 tee: fix put order in teedev_close_context()
In reply to Greg Kroah-HartmanFrom: Jens Wiklander <[email protected]>
[ Upstream commit f18397ab3ae23e8e43bba9986e66af6d4497f2ad ]
Prior to this patch was teedev_close_context() calling tee_device_put() before teedev_ctx_put() leading to teedev_ctx_release() accessing ctx->teedev just after the reference counter was decreased on the teedev. Fix this by calling teedev_ctx_put() before tee_device_put().
--- drivers/tee/tee_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/tee/tee_core.c +3 -1
@@ -98,8 +98,10 @@ void teedev_ctx_put(struct tee_context *ctx)static void teedev_close_context (struct tee_context *ctx) { -tee_device_put (ctx->teedev); +struct tee_device *teedev = ctx->teedev; +teedev_ctx_put (ctx); +tee_device_put (teedev); }static int tee_open (struct inode *inode,struct file *filp)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 132/846 fs: dlm: fix build with CONFIG_IPV6 disabled
In reply to Greg Kroah-HartmanFrom: Alexander Aring <[email protected]>
[ Upstream commit 1b9beda83e27a0c2cd75d1cb743c297c7b36c844 ]
This patch will surround the AF_INET6 case in sk_error_report() of dlm with a #if IS_ENABLED(CONFIG_IPV6). The field sk->sk_v6_daddr is not defined when CONFIG_IPV6 is disabled. If CONFIG_IPV6 is disabled, the socket creation with AF_INET6 should already fail because a runtime check if AF_INET6 is registered. However if there is the possibility that AF_INET6 is set as sk_family the sk_error_report() callback will print then an invalid family type error.
--- fs/dlm/lowcomms.c | 2 ++ 1 file changed, 2 insertions(+)
fs/dlm/lowcomms.c +2 -0
@@ -612,6 +612,7 @@ static void lowcomms_error_report(struct sock *sk)ntohs (inet->inet_dport), sk->sk_err, sk->sk_err_soft);break ; +#if IS_ENABLED (CONFIG_IPV6 )case AF_INET6 :printk_ratelimited (KERN_ERR "dlm: node %d: socket error " "sending to node %d at %pI6c, "
@@ -620,6 +621,7 @@ static void lowcomms_error_report(struct sock *sk)ntohs (inet->inet_dport), sk->sk_err, sk->sk_err_soft);break ; +#endif default :printk_ratelimited (KERN_ERR "dlm: node %d: socket error " "invalid socket family %d set, "
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 133/846 drm/dp: Dont read back backlight mode in drm_edp_backlight_enable()
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
[ Upstream commit 646596485e1ed2182adf293dfd5aec4a96c46330 ]
As it turns out, apparently some machines will actually leave additional backlight functionality like dynamic backlight control on before the OS loads. Currently we don't take care to disable unsupported features when writing back the backlight mode, which can lead to some rather strange looking behavior when adjusting the backlight.
So, let's fix this by just not reading back the current backlight mode on initial enable. I don't think there should really be any downsides to this, and this will ensure we don't leave any unsupported functionality enabled.
This should fix at least one (but not all) of the issues seen with DPCD backlight support on fi-bdw-samus
v5:
* Just avoid reading back DPCD register - Doug Anderson
--- drivers/gpu/drm/drm_dp_helper.c | 40 ++++++++++----------------------- 1 file changed, 12 insertions(+), 28 deletions(-)
drivers/gpu/drm/drm_dp_helper.c +12 -28
@@ -3214,27 +3214,13 @@ int drm_edp_backlight_enable(struct drm_dp_aux *aux, const struct drm_edp_backli const u16 level) {int ret; -u8 dpcd_buf, new_dpcd_buf; +u8 dpcd_buf =DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD ; - ret =drm_dp_dpcd_readb (aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , &dpcd_buf); -if (ret !=1 ) { -drm_dbg_kms (aux->drm_dev, -"%s: Failed to read backlight mode: %d\n" , aux->name, ret); -return ret <0 ? ret : -EIO ; - } - - new_dpcd_buf = dpcd_buf; - -if ((dpcd_buf &DP_EDP_BACKLIGHT_CONTROL_MODE_MASK ) !=DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD ) { - new_dpcd_buf &= ~DP_EDP_BACKLIGHT_CONTROL_MODE_MASK ; - new_dpcd_buf |=DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD ; - -if (bl->pwmgen_bit_count) { - ret =drm_dp_dpcd_writeb (aux,DP_EDP_PWMGEN_BIT_COUNT , bl->pwmgen_bit_count); -if (ret !=1 ) -drm_dbg_kms (aux->drm_dev,"%s: Failed to write aux pwmgen bit count: %d\n" , - aux->name, ret); - } +if (bl->pwmgen_bit_count) { + ret =drm_dp_dpcd_writeb (aux,DP_EDP_PWMGEN_BIT_COUNT , bl->pwmgen_bit_count); +if (ret !=1 ) +drm_dbg_kms (aux->drm_dev,"%s: Failed to write aux pwmgen bit count: %d\n" , + aux->name, ret); }if (bl->pwm_freq_pre_divider) {
@@ -3244,16 +3230,14 @@ int drm_edp_backlight_enable(struct drm_dp_aux *aux, const struct drm_edp_backli"%s: Failed to write aux backlight frequency: %d\n" , aux->name, ret); else - new_dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE; + dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE; } -if (new_dpcd_buf != dpcd_buf) { - ret =drm_dp_dpcd_writeb (aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , new_dpcd_buf); -if (ret !=1 ) { -drm_dbg_kms (aux->drm_dev,"%s: Failed to write aux backlight mode: %d\n" , - aux->name, ret); -return ret <0 ? ret : -EIO ; - } + ret =drm_dp_dpcd_writeb (aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , dpcd_buf); +if (ret !=1 ) { +drm_dbg_kms (aux->drm_dev,"%s: Failed to write aux backlight mode: %d\n" , + aux->name, ret); +return ret <0 ? ret : -EIO ; } ret =drm_edp_backlight_set_level (aux, bl, level);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 134/846 drm/vboxvideo: fix a NULL vs IS_ERR() check
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit cebbb5c46d0cb0615fd0c62dea9b44273d0a9780 ]
The devm_gen_pool_create() function never returns NULL, it returns error pointers.
--- drivers/gpu/drm/vboxvideo/vbox_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vboxvideo/vbox_main.c +2 -2
@@ -127,8 +127,8 @@ int vbox_hw_init(struct vbox_private *vbox)/* Create guest-heap mem-pool use 2^4 = 16 byte chunks */ vbox->guest_pool =devm_gen_pool_create (vbox->ddev.dev,4 ,-1 ,"vboxvideo-accel" ); -if (!vbox->guest_pool) -return -ENOMEM ; +if (IS_ERR (vbox->guest_pool)) +return PTR_ERR (vbox->guest_pool); ret = gen_pool_add_virt(vbox->guest_pool, (unsigned long)vbox->guest_heap,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 135/846 arm64: dts: renesas: cat875: Add rx/tx delays
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
[ Upstream commit e1a9faddffe7e555304dc2e3284c84fbee0679ee ]
The CAT875 sub board from Silicon Linux uses a Realtek PHY.
The phy driver commit bbc4d71d63549bcd003 ("net: phy: realtek: fix rtl8211e rx/tx delay config") introduced NFS mount failures. Now it needs both rx/tx delays for the NFS mount to work.
This patch fixes the NFS mount failure issue by adding "rgmii-id" mode to the avb device node.
--- arch/arm64/boot/dts/renesas/cat875.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/renesas/cat875.dtsi +1 -0
@@ -18,6 +18,7 @@ pinctrl-names = "default"; renesas,no-ether-link; phy-handle = <&phy0>; + phy-mode = "rgmii-id"; status = "okay"; phy0: ethernet-phy@0 {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 136/846 media: dmxdev: fix UAF when dvb_register_device() fails
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit ab599eb11882f834951c436cc080c3455ba32b9b ]
I got a use-after-free report:
dvbdev: dvb_register_device: failed to create device dvb1.dvr0 (-12)
...
==================================================================
BUG: KASAN: use-after-free in dvb_dmxdev_release+0xce/0x2f0 ... Call Trace: dump_stack_lvl+0x6c/0x8b print_address_description.constprop.0+0x48/0x70 kasan_report.cold+0x82/0xdb __asan_load4+0x6b/0x90 dvb_dmxdev_release+0xce/0x2f0 ... Allocated by task 7666: kasan_save_stack+0x23/0x50 __kasan_kmalloc+0x83/0xa0 kmem_cache_alloc_trace+0x22e/0x470 dvb_register_device+0x12f/0x980 dvb_dmxdev_init+0x1f3/0x230 ... Freed by task 7666: kasan_save_stack+0x23/0x50 kasan_set_track+0x20/0x30 kasan_set_free_info+0x24/0x40 __kasan_slab_free+0xf2/0x130 kfree+0xd1/0x5c0 dvb_register_device.cold+0x1ac/0x1fa dvb_dmxdev_init+0x1f3/0x230
...
When dvb_register_device() in dvb_dmxdev_init() fails, dvb_dmxdev_init() does not return a failure, and the memory pointed to by dvbdev or dvr_dvbdev is invalid at this point. If they are used subsequently, it will result in UFA or null-ptr-deref.
If dvb_register_device() in dvb_dmxdev_init() fails, fix the bug by making dvb_dmxdev_init() return an error as well.
--- drivers/media/dvb-core/dmxdev.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/media/dvb-core/dmxdev.c +15 -3
@@ -1413,7 +1413,7 @@ static const struct dvb_device dvbdev_dvr = { };int dvb_dmxdev_init (struct dmxdev *dmxdev,struct dvb_adapter *dvb_adapter) { -int i; +int i, ret;if (dmxdev->demux->open (dmxdev->demux) <0 )return -EUSERS ;
@@ -1432,14 +1432,26 @@ int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter) DMXDEV_STATE_FREE); } -dvb_register_device (dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev, + ret =dvb_register_device (dvb_adapter, &dmxdev->dvbdev, &dvbdev_demux, dmxdev,DVB_DEVICE_DEMUX , dmxdev->filternum); -dvb_register_device (dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr, +if (ret <0 ) + goto err_register_dvbdev; + + ret =dvb_register_device (dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr, dmxdev,DVB_DEVICE_DVR , dmxdev->filternum); +if (ret <0 ) + goto err_register_dvr_dvbdev;dvb_ringbuffer_init (&dmxdev->dvr_buffer,NULL ,8192 );return 0 ; + +err_register_dvr_dvbdev: +dvb_unregister_device (dmxdev->dvbdev); +err_register_dvbdev: +vfree (dmxdev->filter); + dmxdev->filter =NULL ; +return ret; }EXPORT_SYMBOL (dvb_dmxdev_init);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 137/846 crypto: atmel-aes - Reestablish the correct tfm context at dequeue
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
[ Upstream commit 6d48de655917a9d782953eba65de4e3db593ddf0 ]
In case there were more requests from different tfms in the crypto queue, only the context of the last initialized tfm was considered.
--- drivers/crypto/atmel-aes.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/crypto/atmel-aes.c +1 -5
@@ -960,6 +960,7 @@ static int atmel_aes_handle_queue(struct atmel_aes_dev *dd, ctx =crypto_tfm_ctx (areq->tfm); dd->areq = areq; + dd->ctx = ctx; start_async = (areq != new_areq); dd->is_async = start_async;
@@ -1274,7 +1275,6 @@ static int atmel_aes_init_tfm(struct crypto_skcipher *tfm)crypto_skcipher_set_reqsize (tfm,sizeof (struct atmel_aes_reqctx )); ctx->base.dd = dd; - ctx->base.dd->ctx = &ctx->base; ctx->base.start = atmel_aes_start;return 0 ;
@@ -1291,7 +1291,6 @@ static int atmel_aes_ctr_init_tfm(struct crypto_skcipher *tfm)crypto_skcipher_set_reqsize (tfm,sizeof (struct atmel_aes_reqctx )); ctx->base.dd = dd; - ctx->base.dd->ctx = &ctx->base; ctx->base.start = atmel_aes_ctr_start;return 0 ;
@@ -1783,7 +1782,6 @@ static int atmel_aes_gcm_init(struct crypto_aead *tfm)crypto_aead_set_reqsize (tfm,sizeof (struct atmel_aes_reqctx )); ctx->base.dd = dd; - ctx->base.dd->ctx = &ctx->base; ctx->base.start = atmel_aes_gcm_start;return 0 ;
@@ -1927,7 +1925,6 @@ static int atmel_aes_xts_init_tfm(struct crypto_skcipher *tfm)crypto_skcipher_set_reqsize (tfm,sizeof (struct atmel_aes_reqctx ) +crypto_skcipher_reqsize (ctx->fallback_tfm)); ctx->base.dd = dd; - ctx->base.dd->ctx = &ctx->base; ctx->base.start = atmel_aes_xts_start;return 0 ;
@@ -2154,7 +2151,6 @@ static int atmel_aes_authenc_init_tfm(struct crypto_aead *tfm,crypto_aead_set_reqsize (tfm, (sizeof (struct atmel_aes_authenc_reqctx ) + auth_reqsize)); ctx->base.dd = dd; - ctx->base.dd->ctx = &ctx->base; ctx->base.start = atmel_aes_authenc_start;return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 138/846 crypto: qce - fix uaf on qce_aead_register_one
In reply to Greg Kroah-HartmanFrom: Chengfeng Ye <[email protected]>
[ Upstream commit 4a9dbd021970ffe1b92521328377b699acba7c52 ]
Pointer alg points to sub field of tmpl, it
is dereferenced after tmpl is freed. Fix
this by accessing alg before free tmpl.
--- drivers/crypto/qce/aead.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/qce/aead.c +1 -1
@@ -802,8 +802,8 @@ static int qce_aead_register_one(const struct qce_aead_def *def, struct qce_devi ret =crypto_register_aead (alg);if (ret) { -kfree (tmpl);dev_err (qce->dev,"%s registration failed\n" , alg->base.cra_name); +kfree (tmpl);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 139/846 crypto: qce - fix uaf on qce_ahash_register_one
In reply to Greg Kroah-HartmanFrom: Chengfeng Ye <[email protected]>
[ Upstream commit b4cb4d31631912842eb7dce02b4350cbb7562d5e ]
Pointer base points to sub field of tmpl, it
is dereferenced after tmpl is freed. Fix
this by accessing base before free tmpl.
--- drivers/crypto/qce/sha.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/qce/sha.c +1 -1
@@ -498,8 +498,8 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def, ret =crypto_register_ahash (alg);if (ret) { -kfree (tmpl);dev_err (qce->dev,"%s registration failed\n" , base->cra_name); +kfree (tmpl);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 140/846 crypto: qce - fix uaf on qce_skcipher_register_one
In reply to Greg Kroah-HartmanFrom: Chengfeng Ye <[email protected]>
[ Upstream commit e9c195aaeed1b45c9012adbe29dedb6031e85aa8 ]
Pointer alg points to sub field of tmpl, it
is dereferenced after tmpl is freed. Fix
this by accessing alg before free tmpl.
--- drivers/crypto/qce/skcipher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/qce/skcipher.c +1 -1
@@ -484,8 +484,8 @@ static int qce_skcipher_register_one(const struct qce_skcipher_def *def, ret =crypto_register_skcipher (alg);if (ret) { -kfree (tmpl);dev_err (qce->dev,"%s registration failed\n" , alg->base.cra_name); +kfree (tmpl);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 141/846 arm64: dts: qcom: sc7280: Fix incorrect clock name
In reply to Greg Kroah-HartmanFrom: Prasad Malisetty <[email protected]>
[ Upstream commit fa09b2248714c64644576d8064e9bd292a504a0e ]
Replace pcie_1_pipe-clk clock name with pcie_1_pipe_clk To match with dt binding.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -1
@@ -429,7 +429,7 @@ <&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>, <0>, <0>, <0>, <0>, <0>, <0>; clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk", - "pcie_0_pipe_clk", "pcie_1_pipe-clk", + "pcie_0_pipe_clk", "pcie_1_pipe_clk", "ufs_phy_rx_symbol_0_clk", "ufs_phy_rx_symbol_1_clk", "ufs_phy_tx_symbol_0_clk", "usb3_phy_wrapper_gcc_usb30_pipe_clk";
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 142/846 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove
In reply to Greg Kroah-HartmanFrom: George G. Davis <[email protected]>
[ Upstream commit baaf965f94308301d2dc554d72a87d7432cd5ce6 ]
The following KASAN BUG is observed when testing the rpc-if driver on rcar-gen3:
root@rcar-gen3:~# modprobe -r rpc-if [ 101.930146] ================================================================== [ 101.937408] BUG: KASAN: slab-out-of-bounds in __lock_acquire+0x518/0x25d0 [ 101.944240] Read of size 8 at addr ffff0004c5be2750 by task modprobe/664 [ 101.950959] [ 101.952466] CPU: 2 PID: 664 Comm: modprobe Not tainted 5.14.0-rc1-00342-g1a1464d7aa31 #1 [ 101.960578] Hardware name: Renesas H3ULCB board based on r8a77951 (DT) [ 101.967120] Call trace: [ 101.969580] dump_backtrace+0x0/0x2c0 [ 101.973275] show_stack+0x1c/0x30 [ 101.976616] dump_stack_lvl+0x9c/0xd8 [ 101.980301] print_address_description.constprop.0+0x74/0x2b8 [ 101.986071] kasan_report+0x1f4/0x26c [ 101.989757] __asan_load8+0x98/0xd4 [ 101.993266] __lock_acquire+0x518/0x25d0 [ 101.997215] lock_acquire.part.0+0x18c/0x360 [ 102.001506] lock_acquire+0x74/0x90 [ 102.005013] _raw_spin_lock_irq+0x98/0x130 [ 102.009131] __pm_runtime_disable+0x30/0x210 [ 102.013427] rpcif_hb_remove+0x5c/0x70 [rpc_if] [ 102.018001] platform_remove+0x40/0x80 [ 102.021771] __device_release_driver+0x234/0x350 [ 102.026412] driver_detach+0x158/0x20c [ 102.030179] bus_remove_driver+0xa0/0x140 [ 102.034212] driver_unregister+0x48/0x80 [ 102.038153] platform_driver_unregister+0x18/0x24 [ 102.042879] rpcif_platform_driver_exit+0x1c/0x34 [rpc_if] [ 102.048400] __arm64_sys_delete_module+0x210/0x310 [ 102.053212] invoke_syscall+0x60/0x190 [ 102.056986] el0_svc_common+0x12c/0x144 [ 102.060844] do_el0_svc+0x88/0xac [ 102.064181] el0_svc+0x24/0x3c [ 102.067257] el0t_64_sync_handler+0x1a8/0x1b0 [ 102.071634] el0t_64_sync+0x198/0x19c [ 102.075315] [ 102.076815] Allocated by task 628: [ 102.080781] [ 102.082280] Last potentially related work creation: [ 102.087524] [ 102.089022] The buggy address belongs to the object at ffff0004c5be2000 [ 102.089022] which belongs to the cache kmalloc-2k of size 2048 [ 102.101555] The buggy address is located 1872 bytes inside of [ 102.101555] 2048-byte region [ffff0004c5be2000, ffff0004c5be2800) [ 102.113486] The buggy address belongs to the page: [ 102.118409] [ 102.119908] Memory state around the buggy address: [ 102.124711] ffff0004c5be2600: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 102.131947] ffff0004c5be2680: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 102.139181] >ffff0004c5be2700: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 102.146412] ^ [ 102.152257] ffff0004c5be2780: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 102.159491] ffff0004c5be2800: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 102.166723] ==================================================================
The above bug is caused by use of the wrong pointer in the rpcif_disable_rpm() call. Fix the bug by using the correct pointer.
--- drivers/mtd/hyperbus/rpc-if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/hyperbus/rpc-if.c +2 -2
@@ -152,9 +152,9 @@ static int rpcif_hb_remove(struct platform_device *pdev) {struct rpcif_hyperbus *hyperbus =platform_get_drvdata (pdev);int error =hyperbus_unregister_device (&hyperbus->hbdev); -struct rpcif *rpc =dev_get_drvdata (pdev->dev.parent); -rpcif_disable_rpm (rpc); +rpcif_disable_rpm (&hyperbus->rpc); +return error; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 143/846 cpufreq: qcom-cpufreq-hw: Update offline CPUs per-cpu thermal pressure
In reply to Greg Kroah-HartmanFrom: Lukasz Luba <[email protected]>
[ Upstream commit 93d9e6f93e1586fcc97498c764be2e8c8401f4bd ]
The thermal pressure signal gives information to the scheduler about reduced CPU capacity due to thermal. It is based on a value stored in a per-cpu 'thermal_pressure' variable. The online CPUs will get the new value there, while the offline won't. Unfortunately, when the CPU is back online, the value read from per-cpu variable might be wrong (stale data). This might affect the scheduler decisions, since it sees the CPU capacity differently than what is actually available.
Fix it by making sure that all online+offline CPUs would get the proper value in their per-cpu variable when there is throttling or throttling is removed.
--- drivers/cpufreq/qcom-cpufreq-hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/cpufreq/qcom-cpufreq-hw.c +2 -1
@@ -304,7 +304,8 @@ static void qcom_lmh_dcvs_notify(struct qcom_cpufreq_data *data)if (capacity > max_capacity) capacity = max_capacity; -arch_set_thermal_pressure (policy->cpus, max_capacity - capacity); +arch_set_thermal_pressure (policy->related_cpus, + max_capacity - capacity);/* * In the unlikely case policy is unregistered do not enable
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 144/846 cpufreq: qcom-hw: Fix probable nested interrupt handling
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit e0e27c3d4e20dab861566f1c348ae44e4b498630 ]
Re-enabling an interrupt from its own interrupt handler may cause an interrupt storm, if there is a pending interrupt and because its handling is disabled due to already done entrance into the handler above in the stack.
Also, apparently it is improper to lock a mutex in an interrupt contex.
--- drivers/cpufreq/qcom-cpufreq-hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/cpufreq/qcom-cpufreq-hw.c +2 -2
@@ -343,9 +343,9 @@ static irqreturn_t qcom_lmh_dcvs_handle_irq(int irq, void *data)/* Disable interrupt and enable polling */ disable_irq_nosync (c_data->throttle_irq); -qcom_lmh_dcvs_notify (c_data); +schedule_delayed_work (&c_data->throttle_work,0 ); -return 0 ; +return IRQ_HANDLED ; }static const struct qcom_cpufreq_soc_data qcom_soc_data = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 145/846 ARM: dts: stm32: fix dtbs_check warning on ili9341 dts binding on stm32f429 disco
In reply to Greg Kroah-HartmanFrom: Dillon Min <[email protected]>
[ Upstream commit b046049e59dca5e5830dc75ed16acf7657a95161 ]
Since the compatible string defined from ilitek,ili9341.yaml is "st,sf-tc240t-9370-t", "ilitek,ili9341"
so, append "ilitek,ili9341" to avoid the below dtbs_check warning.
arch/arm/boot/dts/stm32f429-disco.dt.yaml: display@1: compatible:
['st,sf-tc240t-9370-t'] is too short
--- arch/arm/boot/dts/stm32f429-disco.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32f429-disco.dts +1 -1
@@ -192,7 +192,7 @@ display: display@1{ /* Connect panel-ilitek-9341 to ltdc */ - compatible = "st,sf-tc240t-9370-t"; + compatible = "st,sf-tc240t-9370-t", "ilitek,ili9341"; reg = <1>; spi-3wire; spi-max-frequency = <10000000>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 146/846 libbpf: Fix potential misaligned memory access in btf_ext__new()
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 401891a9debaf0a684502f2aaecf53448cee9414 ]
Perform a memory copy before we do the sanity checks of btf_ext_hdr. This prevents misaligned memory access if raw btf_ext data is not 4-byte aligned ([0]).
While at it, also add missing const qualifier.
[0] Closes: https://github.com/libbpf/libbpf/issues/391
--- tools/lib/bpf/btf.c | 10 +++++----- tools/lib/bpf/btf.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
tools/lib/bpf/btf.c +5 -5
@@ -2626,15 +2626,11 @@ void btf_ext__free(struct btf_ext *btf_ext)free (btf_ext); } -struct btf_ext *btf_ext__new (__u8 *data,__u32 size) +struct btf_ext *btf_ext__new (const __u8 *data,__u32 size) {struct btf_ext *btf_ext;int err; - err =btf_ext_parse_hdr (data, size); -if (err) -return libbpf_err_ptr (err); - btf_ext =calloc (1 ,sizeof (struct btf_ext ));if (!btf_ext)return libbpf_err_ptr (-ENOMEM );
@@ -2647,6 +2643,10 @@ struct btf_ext *btf_ext__new(__u8 *data, __u32 size) }memcpy (btf_ext->data, data, size); + err =btf_ext_parse_hdr (btf_ext->data, size); +if (err) + goto done; + if (btf_ext->hdr->hdr_len < offsetofend(struct btf_ext_header, line_info_len)) { err = -EINVAL ; goto done;
tools/lib/bpf/btf.h +1 -1
@@ -80,7 +80,7 @@ LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, const char *map_name,__u32 expected_value_size, __u32 *key_type_id, __u32 *value_type_id); -LIBBPF_API struct btf_ext *btf_ext__new(__u8 *data, __u32 size); +LIBBPF_API struct btf_ext *btf_ext__new(const __u8 *data, __u32 size); LIBBPF_API void btf_ext__free(struct btf_ext *btf_ext); LIBBPF_API const void *btf_ext__get_raw_data(const struct btf_ext *btf_ext,__u32 *size);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 147/846 libbpf: Fix glob_syms memory leak in bpf_linker
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 8cb125566c40b7141d8842c534f0ea5820ee3d5c ]
glob_syms array wasn't freed on bpf_link__free(). Fix that.
--- tools/lib/bpf/linker.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/linker.c +1 -0
@@ -211,6 +211,7 @@ void bpf_linker__free(struct bpf_linker *linker) }free (linker->secs); +free (linker->glob_syms);free (linker); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 148/846 libbpf: Fix using invalidated memory in bpf_linker
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 593835377f24ca1bb98008ec1dc3baefe491ad6e ]
add_dst_sec() can invalidate bpf_linker's section index making dst_symtab pointer pointing into unallocated memory. Reinitialize dst_symtab pointer on each iteration to make sure it's always valid.
--- tools/lib/bpf/linker.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/lib/bpf/linker.c +4 -1
@@ -2001,7 +2001,7 @@ add_sym:static int linker_append_elf_relos (struct bpf_linker *linker,struct src_obj *obj) {struct src_sec *src_symtab = &obj->secs[obj->symtab_sec_idx]; -struct dst_sec *dst_symtab = &linker->secs[linker->symtab_sec_idx]; +struct dst_sec *dst_symtab;int i, err;for (i =1 ; i < obj->sec_cnt; i++) {
@@ -2034,6 +2034,9 @@ static int linker_append_elf_relos(struct bpf_linker *linker, struct src_obj *obreturn -1 ; } +/* add_dst_sec() above could have invalidated linker->secs */ + dst_symtab = &linker->secs[linker->symtab_sec_idx]; +/* shdr->sh_link points to SYMTAB */ dst_sec->shdr->sh_link = linker->symtab_sec_idx;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 149/846 crypto: qat - remove unnecessary collision prevention step in PFVF
In reply to Greg Kroah-HartmanFrom: Marco Chiappero <[email protected]>
[ Upstream commit e17f49bb244a281fe39bfdad0306a38b3a02e7bf ]
The initial version of the PFVF protocol included an initial "carrier sensing" to get ownership of the channel.
Collisions can happen anyway, the extra wait and test does not prevent collisions, it instead slows the communication down, so remove it.
--- drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/crypto/qat/qat_common/adf_pf2vf_msg.c +1 -19
@@ -126,28 +126,10 @@ static int __adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr) goto out; } -/* Attempt to get ownership of PF2VF CSR */ msg &= ~local_in_use_mask; msg |= local_in_use_pattern; -ADF_CSR_WR (pmisc_bar_addr, pf2vf_offset, msg); -/* Wait in case remote func also attempting to get ownership */ -msleep (ADF_IOV_MSG_COLLISION_DETECT_DELAY ); - - val =ADF_CSR_RD (pmisc_bar_addr, pf2vf_offset); -if ((val & local_in_use_mask) != local_in_use_pattern) { -dev_dbg (&GET_DEV (accel_dev), -"PF2VF CSR in use by remote - collision detected\n" ); - ret = -EBUSY ; - goto out; - } - -/* -* This function now owns the PV2VF CSR. The IN_USE_BY pattern must -* remain in the PF2VF CSR for all writes including ACK from remote -* until this local function relinquishes the CSR. Send the message -* by interrupting the remote. -*/ +/* Attempt to get ownership of the PF2VF CSR */ ADF_CSR_WR (pmisc_bar_addr, pf2vf_offset, msg | int_bit);/* Wait for confirmation from remote func it received the message */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 150/846 crypto: qat - make pfvf send message direction agnostic
In reply to Greg Kroah-HartmanFrom: Marco Chiappero <[email protected]>
[ Upstream commit 6e680f94bc31d0fd0ff01123c964d895ea8040fa ]
The functions adf_iov_putmsg() and __adf_iov_putmsg() are shared by both PF and VF. Any logging or documentation should not refer to any specific direction.
Make comments and log messages direction agnostic by replacing PF2VF with PFVF. Also fix the wording for some related comments.
--- drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/crypto/qat/qat_common/adf_pf2vf_msg.c +8 -7
@@ -117,11 +117,11 @@ static int __adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr)mutex_lock (lock); -/* Check if PF2VF CSR is in use by remote function */ +/* Check if the PFVF CSR is in use by remote function */ val =ADF_CSR_RD (pmisc_bar_addr, pf2vf_offset);if ((val & remote_in_use_mask) == remote_in_use_pattern) {dev_dbg (&GET_DEV (accel_dev), -"PF2VF CSR in use by remote function\n" ); +"PFVF CSR in use by remote function\n" ); ret = -EBUSY ; goto out; }
@@ -129,7 +129,7 @@ static int __adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr) msg &= ~local_in_use_mask; msg |= local_in_use_pattern; -/* Attempt to get ownership of the PF2VF CSR */ +/* Attempt to get ownership of the PFVF CSR */ ADF_CSR_WR (pmisc_bar_addr, pf2vf_offset, msg | int_bit);/* Wait for confirmation from remote func it received the message */
@@ -151,7 +151,7 @@ static int __adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr) ret = -EIO ; } -/* Finished with PF2VF CSR; relinquish it and leave msg in CSR */ +/* Finished with the PFVF CSR; relinquish it and leave msg in CSR */ ADF_CSR_WR (pmisc_bar_addr, pf2vf_offset, val & ~local_in_use_mask); out:mutex_unlock (lock);
@@ -159,12 +159,13 @@ out: }/** -* adf_iov_putmsg() - send PF2VF message +* adf_iov_putmsg() - send PFVF message * @accel_dev: Pointer to acceleration device. * @msg: Message to send -* @vf_nr: VF number to which the message will be sent +* @vf_nr: VF number to which the message will be sent if on PF, ignored +* otherwise * -* Function sends a message from the PF to a VF +* Function sends a message through the PFVF channel * * Return: 0 on success, error code otherwise. */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 151/846 crypto: qat - fix undetected PFVF timeout in ACK loop
In reply to Greg Kroah-HartmanFrom: Giovanni Cabiddu <[email protected]>
[ Upstream commit 5002200b4fedd7e90e4fbc2e5c42a4b3351df814 ]
If the remote function did not ACK the reception of a message, the function __adf_iov_putmsg() could detect it as a collision.
This was due to the fact that the collision and the timeout checks after the ACK loop were in the wrong order. The timeout must be checked at the end of the loop, so fix by swapping the order of the two checks.
--- drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/crypto/qat/qat_common/adf_pf2vf_msg.c +6 -6
@@ -138,6 +138,12 @@ static int __adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr) val =ADF_CSR_RD (pmisc_bar_addr, pf2vf_offset); }while ((val & int_bit) && (count++ <ADF_IOV_MSG_ACK_MAX_RETRY )); +if (val & int_bit) { +dev_dbg (&GET_DEV (accel_dev),"ACK not received from remote\n" ); + val &= ~int_bit; + ret = -EIO ; + } +if (val != msg) {dev_dbg (&GET_DEV (accel_dev),"Collision - PFVF CSR overwritten by remote function\n" );
@@ -145,12 +151,6 @@ static int __adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr) goto out; } -if (val & int_bit) { -dev_dbg (&GET_DEV (accel_dev),"ACK not received from remote\n" ); - val &= ~int_bit; - ret = -EIO ; - } -/* Finished with the PFVF CSR; relinquish it and leave msg in CSR */ ADF_CSR_WR (pmisc_bar_addr, pf2vf_offset, val & ~local_in_use_mask); out:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 152/846 ath11k: Use host CE parameters for CE interrupts configuration
In reply to Greg Kroah-HartmanFrom: Anilkumar Kolli <[email protected]>
[ Upstream commit b689f091aafd1a874b2f88137934276ab0fca480 ]
CE interrupt configuration uses host ce parameters to assign/free interrupts. Use host ce parameters to enable/disable interrupts. This patch fixes below BUG,
BUG: KASAN: global-out-of-bounds in 0xffffffbffdfb035c at addr ffffffbffde6eeac Read of size 4 by task kworker/u8:2/132 Address belongs to variable ath11k_core_qmi_firmware_ready+0x1b0/0x5bc [ath11k]
OOB is due to ath11k_ahb_ce_irqs_enable() iterates ce_count(which is 12) times and accessing 12th element in target_ce_config
(which has only 11 elements) from ath11k_ahb_ce_irq_enable().
With this change host ce configs are used to enable/disable interrupts.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-00471-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/ahb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath11k/ahb.c +8 -8
@@ -206,13 +206,13 @@ static void ath11k_ahb_clearbit32(struct ath11k_base *ab, u8 bit, u32 offset)static void ath11k_ahb_ce_irq_enable (struct ath11k_base *ab,u16 ce_id) { -const struct ce_pipe_config *ce_config; +const struct ce_attr *ce_attr; - ce_config = &ab->hw_params.target_ce_config[ce_id]; -if (__le32_to_cpu (ce_config->pipedir) &PIPEDIR_OUT ) + ce_attr = &ab->hw_params.host_ce_config[ce_id]; +if (ce_attr->src_nentries)ath11k_ahb_setbit32 (ab, ce_id,CE_HOST_IE_ADDRESS ); -if (__le32_to_cpu (ce_config->pipedir) &PIPEDIR_IN ) { +if (ce_attr->dest_nentries) {ath11k_ahb_setbit32 (ab, ce_id,CE_HOST_IE_2_ADDRESS );ath11k_ahb_setbit32 (ab, ce_id +CE_HOST_IE_3_SHIFT ,CE_HOST_IE_3_ADDRESS );
@@ -221,13 +221,13 @@ static void ath11k_ahb_ce_irq_enable(struct ath11k_base *ab, u16 ce_id)static void ath11k_ahb_ce_irq_disable (struct ath11k_base *ab,u16 ce_id) { -const struct ce_pipe_config *ce_config; +const struct ce_attr *ce_attr; - ce_config = &ab->hw_params.target_ce_config[ce_id]; -if (__le32_to_cpu (ce_config->pipedir) &PIPEDIR_OUT ) + ce_attr = &ab->hw_params.host_ce_config[ce_id]; +if (ce_attr->src_nentries)ath11k_ahb_clearbit32 (ab, ce_id,CE_HOST_IE_ADDRESS ); -if (__le32_to_cpu (ce_config->pipedir) &PIPEDIR_IN ) { +if (ce_attr->dest_nentries) {ath11k_ahb_clearbit32 (ab, ce_id,CE_HOST_IE_2_ADDRESS );ath11k_ahb_clearbit32 (ab, ce_id +CE_HOST_IE_3_SHIFT ,CE_HOST_IE_3_ADDRESS );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 153/846 arm64: dts: ti: k3-j721e: correct cache-sets info
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 7a0df1f969c14939f60a7f9a6af72adcc314675f ]
A72 Cluster has 48KB Icache, 32KB Dcache and 1MB L2 Cache
- ICache is 3-way set-associative
- Dcache is 2-way set-associative
- Line size are 64bytes
So correct the cache-sets info.
--- arch/arm64/boot/dts/ti/k3-j721e.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e.dtsi +2 -2
@@ -61,7 +61,7 @@ i-cache-sets = <256>; d-cache-size = <0x8000>; d-cache-line-size = <64>; - d-cache-sets = <128>; + d-cache-sets = <256>; next-level-cache = <&L2_0>; };
@@ -75,7 +75,7 @@ i-cache-sets = <256>; d-cache-size = <0x8000>; d-cache-line-size = <64>; - d-cache-sets = <128>; + d-cache-sets = <256>; next-level-cache = <&L2_0>; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 154/846 tty: serial: atmel: Check return code of dmaengine_submit()
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
[ Upstream commit 1e67bd2b8cb90b66e89562598e9c2046246832d3 ]
The tx_submit() method of struct dma_async_tx_descriptor is entitled to do sanity checks and return errors if encountered. It's not the case for the DMA controller drivers that this client is using (at_h/xdmac), because they currently don't do sanity checks and always return a positive cookie at tx_submit() method. In case the controller drivers will implement sanity checks and return errors, print a message so that the client will be informed that something went wrong at tx_submit() level.
--- drivers/tty/serial/atmel_serial.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/tty/serial/atmel_serial.c +10 -0
@@ -1004,6 +1004,11 @@ static void atmel_tx_dma(struct uart_port *port) desc->callback = atmel_complete_tx_dma; desc->callback_param = atmel_port; atmel_port->cookie_tx =dmaengine_submit (desc); +if (dma_submit_error (atmel_port->cookie_tx)) { +dev_err (port->dev,"dma_submit_error %d\n" , + atmel_port->cookie_tx); +return ; + } }if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )
@@ -1258,6 +1263,11 @@ static int atmel_prepare_rx_dma(struct uart_port *port) desc->callback_param = port; atmel_port->desc_rx = desc; atmel_port->cookie_rx =dmaengine_submit (desc); +if (dma_submit_error (atmel_port->cookie_rx)) { +dev_err (port->dev,"dma_submit_error %d\n" , + atmel_port->cookie_rx); + goto chan_err; + }return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 155/846 tty: serial: atmel: Call dma_async_issue_pending()
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
[ Upstream commit 4f4b9b5895614eb2e2b5f4cab7858f44bd113e1b ]
The driver wrongly assummed that tx_submit() will start the transfer, which is not the case, now that the at_xdmac driver is fixed. tx_submit is supposed to push the current transaction descriptor to a pending queue, waiting for issue_pending to be called. issue_pending must start the transfer, not tx_submit.
--- drivers/tty/serial/atmel_serial.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/atmel_serial.c +4 -0
@@ -1009,6 +1009,8 @@ static void atmel_tx_dma(struct uart_port *port) atmel_port->cookie_tx);return ; } + +dma_async_issue_pending (chan); }if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )
@@ -1269,6 +1271,8 @@ static int atmel_prepare_rx_dma(struct uart_port *port) goto chan_err; } +dma_async_issue_pending (atmel_port->chan_rx); +return 0 ; chan_err:
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 156/846 mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 8c0fad75dcaa650e3f3145a2c35847bc6a65cb7f ]
Remove compilation flag and use __maybe_unused and pm_ptr instead.
--- drivers/mfd/atmel-flexcom.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mfd/atmel-flexcom.c +2 -4
@@ -87,8 +87,7 @@ static const struct of_device_id atmel_flexcom_of_match[] = { };MODULE_DEVICE_TABLE (of, atmel_flexcom_of_match); -#ifdef CONFIG_PM_SLEEP -static int atmel_flexcom_resume (struct device *dev) +static int __maybe_unused atmel_flexcom_resume (struct device *dev) {struct atmel_flexcom *ddata =dev_get_drvdata (dev);int err;
@@ -105,7 +104,6 @@ static int atmel_flexcom_resume(struct device *dev)return 0 ; } -#endif static SIMPLE_DEV_PM_OPS(atmel_flexcom_pm_ops, NULL, atmel_flexcom_resume);
@@ -114,7 +112,7 @@ static struct platform_driver atmel_flexcom_driver = { .probe = atmel_flexcom_probe, .driver = { .name = "atmel_flexcom", - .pm = &atmel_flexcom_pm_ops, + .pm = pm_ptr(&atmel_flexcom_pm_ops), .of_match_table = atmel_flexcom_of_match, }, };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 157/846 mfd: atmel-flexcom: Use .resume_noirq
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 5d051cf94fd5834a1513aa77e542c49fd973988a ]
Flexcom IP embeds 3 other IPs: usart, i2c, spi and selects the operation mode (usart, i2c, spi) via mode register (FLEX_MR). On i2c bus there might be connected critical devices (like PMIC) which on suspend/resume should be suspended/resumed at the end/beginning. i2c uses .suspend_noirq/.resume_noirq for this kind of purposes. Align flexcom to use .resume_noirq as it should be resumed before the embedded IPs. Otherwise the embedded devices might behave badly.
--- drivers/mfd/atmel-flexcom.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mfd/atmel-flexcom.c +4 -3
@@ -87,7 +87,7 @@ static const struct of_device_id atmel_flexcom_of_match[] = { };MODULE_DEVICE_TABLE (of, atmel_flexcom_of_match); -static int __maybe_unused atmel_flexcom_resume (struct device *dev) +static int __maybe_unused atmel_flexcom_resume_noirq (struct device *dev) {struct atmel_flexcom *ddata =dev_get_drvdata (dev);int err;
@@ -105,8 +105,9 @@ static int __maybe_unused atmel_flexcom_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(atmel_flexcom_pm_ops, NULL, - atmel_flexcom_resume); +static const struct dev_pm_ops atmel_flexcom_pm_ops = { + .resume_noirq = atmel_flexcom_resume_noirq, +};static struct platform_driver atmel_flexcom_driver = { .probe = atmel_flexcom_probe,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 158/846 bfq: Do not let waker requests skip proper accounting
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit c65e6fd460b4df796ecd6ea22e132076ed1f2820 ]
Commit 7cc4ffc55564 ("block, bfq: put reqs of waker and woken in dispatch list") added a condition to bfq_insert_request() which added waker's requests directly to dispatch list. The rationale was that completing waker's IO is needed to get more IO for the current queue. Although this rationale is valid, there is a hole in it. The waker does not necessarily serve the IO only for the current queue and maybe it's current IO is not needed for current queue to make progress. Furthermore injecting IO like this completely bypasses any service accounting within bfq and thus we do not properly track how much service is waker's queue getting or that the waker is actually doing any IO. Depending on the conditions this can result in the waker getting too much or too few service.
Consider for example the following job file:
[global]
directory=/mnt/repro/
rw=write
size=8gtime_based
runtime=30
ramp_time=10
blocksize=1m
direct=0
ioengine=sync
[slowwriter]
numjobs=1
prioclass=2
prio=7
fsync=200
[fastwriter]
numjobs=1
prioclass=2
prio=0
fsync=200
Despite processes have very different IO priorities, they get the same about of service. The reason is that bfq identifies these processes as having waker-wakee relationship and once that happens, IO from fastwriter gets injected during slowwriter's time slice. As a result bfq is not aware that fastwriter has any IO to do and constantly schedules only slowwriter's queue. Thus fastwriter is forced to compete with slowwriter's IO all the time instead of getting its share of time based on IO priority.
Drop the special injection condition from bfq_insert_request(). As a result, requests will be tracked and queued in a normal way and on next dispatch bfq_select_queue() can decide whether the waker's inserted requests should be injected during the current queue's timeslice or not.
--- block/bfq-iosched.c | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-)
block/bfq-iosched.c +1 -43
@@ -5991,48 +5991,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,spin_lock_irq (&bfqd->lock); bfqq =bfq_init_rq (rq); - -/* -* Reqs with at_head or passthrough flags set are to be put -* directly into dispatch list. Additional case for putting rq -* directly into the dispatch queue: the only active -* bfq_queues are bfqq and either its waker bfq_queue or one -* of its woken bfq_queues. The rationale behind this -* additional condition is as follows: -* - consider a bfq_queue, say Q1, detected as a waker of -* another bfq_queue, say Q2 -* - by definition of a waker, Q1 blocks the I/O of Q2, i.e., -* some I/O of Q1 needs to be completed for new I/O of Q2 -* to arrive. A notable example of waker is journald -* - so, Q1 and Q2 are in any respect the queues of two -* cooperating processes (or of two cooperating sets of -* processes): the goal of Q1's I/O is doing what needs to -* be done so that new Q2's I/O can finally be -* issued. Therefore, if the service of Q1's I/O is delayed, -* then Q2's I/O is delayed too. Conversely, if Q2's I/O is -* delayed, the goal of Q1's I/O is hindered. -* - as a consequence, if some I/O of Q1/Q2 arrives while -* Q2/Q1 is the only queue in service, there is absolutely -* no point in delaying the service of such an I/O. The -* only possible result is a throughput loss -* - so, when the above condition holds, the best option is to -* have the new I/O dispatched as soon as possible -* - the most effective and efficient way to attain the above -* goal is to put the new I/O directly in the dispatch -* list -* - as an additional restriction, Q1 and Q2 must be the only -* busy queues for this commit to put the I/O of Q2/Q1 in -* the dispatch list. This is necessary, because, if also -* other queues are waiting for service, then putting new -* I/O directly in the dispatch list may evidently cause a -* violation of service guarantees for the other queues -*/ -if (!bfqq || - (bfqq != bfqd->in_service_queue && - bfqd->in_service_queue !=NULL && -bfq_tot_busy_queues (bfqd) ==1 +bfq_bfqq_busy (bfqq) && - (bfqq->waker_bfqq == bfqd->in_service_queue || - bfqd->in_service_queue->waker_bfqq == bfqq)) || at_head) { +if (!bfqq || at_head) {if (at_head)list_add (&rq->queuelist, &bfqd->dispatch);else
@@ -6059,7 +6018,6 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,* merge). */ cmd_flags = rq->cmd_flags; -spin_unlock_irq (&bfqd->lock); bfq_update_insert_stats(q, bfqq, idle_timer_disabled,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 159/846 libbpf: Silence uninitialized warning/error in btf_dump_dump_type_data
In reply to Greg Kroah-HartmanFrom: Alan Maguire <[email protected]>
[ Upstream commit 43174f0d4597325cb91f1f1f55263eb6e6101036 ]
When compiling libbpf with gcc 4.8.5, we see:
CC staticobjs/btf_dump.obtf_dump.c: In function ‘btf_dump_dump_type_data.isra.24’:
btf_dump.c:2296:5: error: ‘err’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (err < 0)
^
cc1: all warnings being treated as errors
make: *** [staticobjs/btf_dump.o] Error 1
While gcc 4.8.5 is too old to build the upstream kernel, it's possible it could be used to build standalone libbpf which suffers from the same problem. Silence the error by initializing 'err' to 0. The warning/error seems to be a false positive since err is set early in the function. Regardless we shouldn't prevent libbpf from building for this.
--- tools/lib/bpf/btf_dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/btf_dump.c +1 -1
@@ -2186,7 +2186,7 @@ static int btf_dump_dump_type_data(struct btf_dump *d,__u8 bits_offset, __u8 bit_sz) { - int size, err; + int size, err = 0; size =btf_dump_type_data_check_overflow (d, t, id, data, bits_offset);if (size <0 )
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 160/846 media: i2c: imx274: fix s_frame_interval runtime resume not requested
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit da653498c20ba5b185214d8ae43b4e8e9594f520 ]
pm_runtime_resume_and_get should be called when the s_frame_interval is called.
The driver will try to access device registers to configure VMAX, coarse time and exposure.
Currently if the runtime is not resumed, this fails:
# media-ctl -d /dev/media0 --set-v4l2 '"IMX274 1-001a":0[fmt:SRGGB10_1X10/3840x2 160@1/10]'
IMX274 1-001a: imx274_binning_goodness: ask 3840x2160, size 3840x2160, goodness 0 IMX274 1-001a: imx274_binning_goodness: ask 3840x2160, size 1920x1080, goodness -3000 IMX274 1-001a: imx274_binning_goodness: ask 3840x2160, size 1280x720, goodness -4000 IMX274 1-001a: imx274_binning_goodness: ask 3840x2160, size 1280x540, goodness -4180 IMX274 1-001a: __imx274_change_compose: selected 1x1 binning
IMX274 1-001a: imx274_set_frame_interval: input frame interval = 1 / 10 IMX274 1-001a: imx274_read_mbreg : addr 0x300e, val=0x1 (2 bytes) IMX274 1-001a: imx274_set_frame_interval : register SVR = 1
IMX274 1-001a: imx274_read_mbreg : addr 0x30f6, val=0x6a8 (2 bytes) IMX274 1-001a: imx274_set_frame_interval : register HMAX = 1704
IMX274 1-001a: imx274_set_frame_length : input length = 2112
IMX274 1-001a: imx274_write_mbreg : i2c bulk write failed, 30f8 = 884 (3 bytes) IMX274 1-001a: imx274_set_frame_length error = -121
IMX274 1-001a: imx274_set_frame_interval error = -121
Unable to setup formats: Remote I/O error (121)
The device is not resumed thus the remote I/O error.
Setting the frame interval works at streaming time, because pm_runtime_resume_and_get is called at s_stream time before sensor setup. The failure happens when only the s_frame_interval is called separately independently on streaming time.
--- drivers/media/i2c/imx274.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/imx274.c +5 -0
@@ -1367,6 +1367,10 @@ static int imx274_s_frame_interval(struct v4l2_subdev *sd,int min, max, def;int ret; + ret =pm_runtime_resume_and_get (&imx274->client->dev); +if (ret <0 ) +return ret; +mutex_lock (&imx274->lock); ret =imx274_set_frame_interval (imx274, fi->interval);
@@ -1398,6 +1402,7 @@ static int imx274_s_frame_interval(struct v4l2_subdev *sd, unlock:mutex_unlock (&imx274->lock); +pm_runtime_put (&imx274->client->dev);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 161/846 media: i2c: Re-order runtime pm initialisation
In reply to Greg Kroah-HartmanFrom: Daniel Scally <[email protected]>
[ Upstream commit d2484fbf780762f6f9cc3abb7a07ee42dca2eaa3 ]
The kerneldoc for pm_runtime_set_suspended() says:
"It is not valid to call this function for devices with runtime PM enabled"
To satisfy that requirement, re-order the calls so that pm_runtime_enable() is the last one.
--- drivers/media/i2c/ov8865.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov8865.c +1 -1
@@ -2899,8 +2899,8 @@ static int ov8865_probe(struct i2c_clien/* Runtime PM */ -pm_runtime_enable (sensor->dev);pm_runtime_set_suspended (sensor->dev); +pm_runtime_enable (sensor->dev);/* V4L2 subdev register */
Greg Kroah-Hartman
maintainerPATCH 162/846 media: i2c: ov8865: Fix lockdep error
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 6e1c9bc9ae96e57bcd8807174f2c0f44f9ef7938 ]
ov8865_state_init() calls ov8865_state_mipi_configure() which uses __v4l2_ctrl_s_ctrl[_int64](). This means that sensor->mutex (which is also sensor->ctrls.handler.lock) must be locked before calling ov8865_state_init().
Note ov8865_state_mipi_configure() is also used in other places where the lock is already held so it cannot be changed itself.
This fixes the following lockdep kernel WARN:
[ 13.233421] WARNING: CPU: 0 PID: 8 at drivers/media/v4l2-core/v4l2-ctrls-api.c:833 __v4l2_ctrl_s_ctrl+0x4d/0x60 [videodev] ... [ 13.234063] Call Trace: [ 13.234074] ov8865_state_configure+0x98b/0xc00 [ov8865] [ 13.234095] ov8865_probe+0x4b1/0x54c [ov8865] [ 13.234117] i2c_device_probe+0x13c/0x2d0
--- drivers/media/i2c/ov8865.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/i2c/ov8865.c +2 -0
@@ -2893,7 +2893,9 @@ static int ov8865_probe(struct i2c_clienif (ret) goto error_mutex; +mutex_lock (&sensor->mutex); ret =ov8865_state_init (sensor); +mutex_unlock (&sensor->mutex);if (ret) goto error_ctrls;
Greg Kroah-Hartman
maintainerPATCH 163/846 media: rcar-csi2: Correct the selection of hsfreqrange
In reply to Greg Kroah-HartmanFrom: Suresh Udipi <[email protected]>
[ Upstream commit cee44d4fbacbbdfe62697ec94e76c6e4f726c5df ]
hsfreqrange should be chosen based on the calculated mbps which is closer to the default bit rate and within the range as per table[1]. But current calculation always selects first value which is greater than or equal to the calculated mbps which may lead to chosing a wrong range in some cases.
For example for 360 mbps for H3/M3N
Existing logic selects
Calculated value 360Mbps : Default 400Mbps Range [368.125 -433.125 mbps]
This hsfreqrange is out of range.
The logic is changed to get the default value which is closest to the calculated value [1]
Calculated value 360Mbps : Default 350Mbps Range [320.625 -380.625 mpbs]
[1] specs r19uh0105ej0200-r-car-3rd-generation.pdf [Table 25.9]
Please note that According to Renesas in Table 25.9 the range for 220 default value is corrected as below
|Range (Mbps) | Default Bit rate (Mbps) |
-----------------------------------------------
| 197.125-244.125 | 220 |
-----------------------------------------------
--- drivers/media/platform/rcar-vin/rcar-csi2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/media/platform/rcar-vin/rcar-csi2.c +8 -1
@@ -445,16 +445,23 @@ static int rcsi2_wait_phy_start(struct rcar_csi2 *priv,static int rcsi2_set_phypll (struct rcar_csi2 *priv,unsigned int mbps) {const struct rcsi2_mbps_reg *hsfreq; +const struct rcsi2_mbps_reg *hsfreq_prev =NULL ; -for (hsfreq = priv->info->hsfreqrange; hsfreq->mbps !=0 ; hsfreq++) +for (hsfreq = priv->info->hsfreqrange; hsfreq->mbps !=0 ; hsfreq++) {if (hsfreq->mbps >= mbps)break ; + hsfreq_prev = hsfreq; + }if (!hsfreq->mbps) {dev_err (priv->dev,"Unsupported PHY speed (%u Mbps)" , mbps);return -ERANGE ; } +if (hsfreq_prev && + ((mbps - hsfreq_prev->mbps) <= (hsfreq->mbps - mbps))) + hsfreq = hsfreq_prev; +rcsi2_write (priv,PHYPLL_REG ,PHYPLL_HSFREQRANGE (hsfreq->reg));return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 164/846 media: imx-pxp: Initialize the spinlock prior to using it
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit ed2f97ad4b21072f849cf4ae6645d1f2b1d3f550 ]
After devm_request_threaded_irq() is called there is a chance that an interrupt may occur before the spinlock is initialized, which will trigger a kernel oops.
To prevent that, move the initialization of the spinlock prior to requesting the interrupts.
--- drivers/media/platform/imx-pxp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/imx-pxp.c +2 -2
@@ -1661,6 +1661,8 @@ static int pxp_probe(struct platform_device *pdev)if (irq <0 )return irq; +spin_lock_init (&dev->irqlock); + ret =devm_request_threaded_irq (&pdev->dev, irq,NULL , pxp_irq_handler,IRQF_ONESHOT ,dev_name (&pdev->dev), dev);if (ret <0 ) {
@@ -1678,8 +1680,6 @@ static int pxp_probe(struct platform_device *pdev) goto err_clk; } -spin_lock_init (&dev->irqlock); - ret =v4l2_device_register (&pdev->dev, &dev->v4l2_dev);if (ret) goto err_clk;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 165/846 media: si470x-i2c: fix possible memory leak in si470x_i2c_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ef054e345ed8c79ce1121a3599b5a2dfd78e57a0 ]
n the 'radio->hdl.error' error handling, ctrl handler allocated by v4l2_ctrl_new_std() does not released, and caused memory leak as follows:
unreferenced object 0xffff888033d54200 (size 256):
comm "i2c-si470x-19", pid 909, jiffies 4294914203 (age 8.072s) hex dump (first 32 bytes):
e8 69 11 03 80 88 ff ff 00 46 d5 33 80 88 ff ff .i.......F.3....
10 42 d5 33 80 88 ff ff 10 42 d5 33 80 88 ff ff .B.3.....B.3....
backtrace:
[<00000000086bd4ed>] __kmalloc_node+0x1eb/0x360
[<00000000bdb68871>] kvmalloc_node+0x66/0x120
[<00000000fac74e4c>] v4l2_ctrl_new+0x7b9/0x1c60 [videodev]
[<00000000693bf940>] v4l2_ctrl_new_std+0x19b/0x270 [videodev]
[<00000000c0cb91bc>] si470x_i2c_probe+0x2d3/0x9a0 [radio_si470x_i2c]
[<0000000056a6f01f>] i2c_device_probe+0x4d8/0xbe0Fix the error handling path to avoid memory leak.
--- drivers/media/radio/si470x/radio-si470x-i2c.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/radio/si470x/radio-si470x-i2c.c +1 -2
@@ -368,7 +368,7 @@ static int si470x_i2c_probe(struct i2c_client *client)if (radio->hdl.error) { retval = radio->hdl.error;dev_err (&client->dev,"couldn't register control\n" ); - goto err_dev; + goto err_all; }/* video device initialization */
@@ -463,7 +463,6 @@ static int si470x_i2c_probe(struct i2c_client *client)return 0 ; err_all:v4l2_ctrl_handler_free (&radio->hdl); -err_dev:v4l2_device_unregister (&radio->v4l2_dev); err_initial:return retval;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 166/846 media: mtk-vcodec: call v4l2_m2m_ctx_release first when file is released
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit 9f89c881bffbdffe4060ffaef3489a2830a6dd9c ]
The func v4l2_m2m_ctx_release waits for currently running jobs to finish and then stop streaming both queues and frees the buffers. All this should be done before the call to mtk_vcodec_enc_release which frees the encoder handler. This fixes null-pointer dereference bug:
[ 638.028076] Mem abort info: [ 638.030932] ESR = 0x96000004 [ 638.033978] EC = 0x25: DABT (current EL), IL = 32 bits [ 638.039293] SET = 0, FnV = 0 [ 638.042338] EA = 0, S1PTW = 0 [ 638.045474] FSC = 0x04: level 0 translation fault [ 638.050349] Data abort info: [ 638.053224] ISV = 0, ISS = 0x00000004 [ 638.057055] CM = 0, WnR = 0 [ 638.060018] user pgtable: 4k pages, 48-bit VAs, pgdp=000000012b6db000 [ 638.066485] [00000000000001a0] pgd=0000000000000000, p4d=0000000000000000 [ 638.073277] Internal error: Oops: 96000004 [#1] SMP [ 638.078145] Modules linked in: rfkill mtk_vcodec_dec mtk_vcodec_enc uvcvideo mtk_mdp mtk_vcodec_common videobuf2_dma_contig v4l2_h264 cdc_ether v4l2_mem2mem videobuf2_vmalloc usbnet videobuf2_memops videobuf2_v4l2 r8152 videobuf2_common videodev cros_ec_sensors cros_ec_sensors_core industrialio_triggered_buffer kfifo_buf elan_i2c elants_i2c sbs_battery mc cros_usbpd_charger cros_ec_chardev cros_usbpd_logger crct10dif_ce mtk_vpu fuse ip_tables x_tables ipv6 [ 638.118583] CPU: 0 PID: 212 Comm: kworker/u8:5 Not tainted 5.15.0-06427-g58a1d4dcfc74-dirty #109 [ 638.127357] Hardware name: Google Elm (DT) [ 638.131444] Workqueue: mtk-vcodec-enc mtk_venc_worker [mtk_vcodec_enc] [ 638.137974] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 638.144925] pc : vp8_enc_encode+0x34/0x2b0 [mtk_vcodec_enc] [ 638.150493] lr : venc_if_encode+0xac/0x1b0 [mtk_vcodec_enc] [ 638.156060] sp : ffff8000124d3c40 [ 638.159364] x29: ffff8000124d3c40 x28: 0000000000000000 x27: 0000000000000000 [ 638.166493] x26: 0000000000000000 x25: ffff0000e7f252d0 x24: ffff8000124d3d58 [ 638.173621] x23: ffff8000124d3d58 x22: ffff8000124d3d60 x21: 0000000000000001 [ 638.180750] x20: ffff80001137e000 x19: 0000000000000000 x18: 0000000000000001 [ 638.187878] x17: 000000040044ffff x16: 00400032b5503510 x15: 0000000000000000 [ 638.195006] x14: ffff8000118536c0 x13: ffff8000ee1da000 x12: 0000000030d4d91d [ 638.202134] x11: 0000000000000000 x10: 0000000000000980 x9 : ffff8000124d3b20 [ 638.209262] x8 : ffff0000c18d4ea0 x7 : ffff0000c18d44c0 x6 : ffff0000c18d44c0 [ 638.216391] x5 : ffff80000904a3b0 x4 : ffff8000124d3d58 x3 : ffff8000124d3d60 [ 638.223519] x2 : ffff8000124d3d78 x1 : 0000000000000001 x0 : ffff80001137efb8 [ 638.230648] Call trace: [ 638.233084] vp8_enc_encode+0x34/0x2b0 [mtk_vcodec_enc] [ 638.238304] venc_if_encode+0xac/0x1b0 [mtk_vcodec_enc] [ 638.243525] mtk_venc_worker+0x110/0x250 [mtk_vcodec_enc] [ 638.248918] process_one_work+0x1f8/0x498 [ 638.252923] worker_thread+0x140/0x538 [ 638.256664] kthread+0x148/0x158 [ 638.259884] ret_from_fork+0x10/0x20 [ 638.263455] Code: f90023f9 2a0103f5 aa0303f6 aa0403f8 (f940d277) [ 638.269538] ---[ end trace e374fc10f8e181f5 ]---
[gst-master] root@debian:~/gst-build# [ 638.019193] Unable to handle kernel NULL pointer dereference at virtual address 00000000000001a0
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +1 -1
@@ -218,11 +218,11 @@ static int fops_vcodec_release(struct file *file)mtk_v4l2_debug (1 ,"[%d] encoder" , ctx->id);mutex_lock (&dev->dev_mutex); +v4l2_m2m_ctx_release (ctx->m2m_ctx);mtk_vcodec_enc_release (ctx);v4l2_fh_del (&ctx->fh);v4l2_fh_exit (&ctx->fh);v4l2_ctrl_handler_free (&ctx->ctrl_hdl); -v4l2_m2m_ctx_release (ctx->m2m_ctx);list_del_init (&ctx->list);kfree (ctx);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 167/846 media: hantro: Hook up RK3399 JPEG encoder output
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 230d683ae04894933720425c8dead9508a09ebc3 ]
The JPEG encoder found in the Hantro H1 encoder block only produces a raw entropy-encoded scan. The driver is responsible for building a JPEG compliant bitstream and placing the entropy-encoded scan in it. Right now the driver uses a bounce buffer for the hardware to output the raw scan to.
In commit e765dba11ec2 ("hantro: Move hantro_enc_buf_finish to JPEG codec_ops.done"), the code that copies the raw scan from the bounce buffer to the capture buffer was moved, but was only hooked up for the Hantro H1 (then RK3288) variant. The RK3399 variant was broken, producing a JPEG bitstream without the scan, and the capture buffer's .bytesused field unset.
Fix this by duplicating the code that is executed when the JPEG encoder finishes encoding a frame. As the encoded length is read back from hardware, and the variants having different register layouts, the code is duplicated rather than shared.
--- .../staging/media/hantro/hantro_h1_jpeg_enc.c | 2 +- drivers/staging/media/hantro/hantro_hw.h | 3 ++- .../media/hantro/rockchip_vpu2_hw_jpeg_enc.c | 17 +++++++++++++++++ drivers/staging/media/hantro/rockchip_vpu_hw.c | 5 +++-- 4 files changed, 23 insertions(+), 4 deletions(-)
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c +1 -1
@@ -140,7 +140,7 @@ int hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx)return 0 ; } -void hantro_jpeg_enc_done (struct hantro_ctx *ctx) +void hantro_h1_jpeg_enc_done (struct hantro_ctx *ctx) {struct hantro_dev *vpu = ctx->dev;u32 bytesused =vepu_read (vpu,H1_REG_STR_BUF_LIMIT ) /8 ;
drivers/staging/media/hantro/hantro_hw.h +2 -1
@@ -235,7 +235,8 @@ int hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx);int rockchip_vpu2_jpeg_enc_run (struct hantro_ctx *ctx);int hantro_jpeg_enc_init (struct hantro_ctx *ctx);void hantro_jpeg_enc_exit (struct hantro_ctx *ctx); -void hantro_jpeg_enc_done (struct hantro_ctx *ctx); +void hantro_h1_jpeg_enc_done (struct hantro_ctx *ctx); +void rockchip_vpu2_jpeg_enc_done (struct hantro_ctx *ctx);dma_addr_t hantro_h264_get_ref_buf (struct hantro_ctx *ctx,unsigned int dpb_idx);
drivers/staging/media/hantro/rockchip_vpu2_hw_jpeg_enc.c +17 -0
@@ -171,3 +171,20 @@ int rockchip_vpu2_jpeg_enc_run(struct hantro_ctx *ctx)return 0 ; } + +void rockchip_vpu2_jpeg_enc_done (struct hantro_ctx *ctx) +{ +struct hantro_dev *vpu = ctx->dev; +u32 bytesused =vepu_read (vpu,VEPU_REG_STR_BUF_LIMIT ) /8 ; +struct vb2_v4l2_buffer *dst_buf =hantro_get_dst_buf (ctx); + +/* +* TODO: Rework the JPEG encoder to eliminate the need +* for a bounce buffer. +*/ +memcpy (vb2_plane_vaddr (&dst_buf->vb2_buf,0 ) + + ctx->vpu_dst_fmt->header_size, + ctx->jpeg_enc.bounce_buffer.cpu, bytesused); +vb2_set_plane_payload (&dst_buf->vb2_buf,0 , + ctx->vpu_dst_fmt->header_size + bytesused); +}
drivers/staging/media/hantro/rockchip_vpu_hw.c +3 -2
@@ -343,7 +343,7 @@ static const struct hantro_codec_ops rk3066_vpu_codec_ops[] = { .run = hantro_h1_jpeg_enc_run, .reset = rockchip_vpu1_enc_reset, .init = hantro_jpeg_enc_init, - .done = hantro_jpeg_enc_done, + .done = hantro_h1_jpeg_enc_done, .exit = hantro_jpeg_enc_exit, }, [HANTRO_MODE_H264_DEC] = {
@@ -371,7 +371,7 @@ static const struct hantro_codec_ops rk3288_vpu_codec_ops[] = { .run = hantro_h1_jpeg_enc_run, .reset = rockchip_vpu1_enc_reset, .init = hantro_jpeg_enc_init, - .done = hantro_jpeg_enc_done, + .done = hantro_h1_jpeg_enc_done, .exit = hantro_jpeg_enc_exit, }, [HANTRO_MODE_H264_DEC] = {
@@ -399,6 +399,7 @@ static const struct hantro_codec_ops rk3399_vpu_codec_ops[] = { .run = rockchip_vpu2_jpeg_enc_run, .reset = rockchip_vpu2_enc_reset, .init = hantro_jpeg_enc_init, + .done = rockchip_vpu2_jpeg_enc_done, .exit = hantro_jpeg_enc_exit, }, [HANTRO_MODE_H264_DEC] = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 168/846 media: coda: fix CODA960 JPEG encoder buffer overflow
In reply to Greg Kroah-HartmanFrom: Philipp Zabel <[email protected]>
[ Upstream commit 1a59cd88f55068710f6549bee548846661673780 ]
Stop the CODA960 JPEG encoder from overflowing capture buffers. The bitstream buffer overflow interrupt doesn't seem to be connected, so this has to be handled via timeout instead.
--- drivers/media/platform/coda/coda-common.c | 8 +++++--- drivers/media/platform/coda/coda-jpeg.c | 21 ++++++++++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-)
drivers/media/platform/coda/coda-common.c +5 -3
@@ -1537,11 +1537,13 @@ static void coda_pic_run_work(struct work_struct *work)if (!wait_for_completion_timeout (&ctx->completion,msecs_to_jiffies (1000 ))) { -dev_err (dev->dev,"CODA PIC_RUN timeout\n" ); +if (ctx->use_bit) { +dev_err (dev->dev,"CODA PIC_RUN timeout\n" ); - ctx->hold = true; + ctx->hold = true; -coda_hw_reset (ctx); +coda_hw_reset (ctx); + }if (ctx->ops->run_timeout) ctx->ops->run_timeout (ctx);
drivers/media/platform/coda/coda-jpeg.c +20 -1
@@ -1127,7 +1127,8 @@ static int coda9_jpeg_prepare_encode(struct coda_ctx *ctx)coda_write (dev,0 ,CODA9_REG_JPEG_GBU_BT_PTR );coda_write (dev,0 ,CODA9_REG_JPEG_GBU_WD_PTR );coda_write (dev,0 ,CODA9_REG_JPEG_GBU_BBSR ); -coda_write (dev,0 ,CODA9_REG_JPEG_BBC_STRM_CTRL ); +coda_write (dev,BIT (31 ) | ((end_addr - start_addr - header_len) /256 ), +CODA9_REG_JPEG_BBC_STRM_CTRL );coda_write (dev,0 ,CODA9_REG_JPEG_GBU_CTRL );coda_write (dev,0 ,CODA9_REG_JPEG_GBU_FF_RPTR );coda_write (dev,127 ,CODA9_REG_JPEG_GBU_BBER );
@@ -1257,6 +1258,23 @@ static void coda9_jpeg_finish_encode(struct coda_ctx *ctx)coda_hw_reset (ctx); } +static void coda9_jpeg_encode_timeout (struct coda_ctx *ctx) +{ +struct coda_dev *dev = ctx->dev; +u32 end_addr, wr_ptr; + +/* Handle missing BBC overflow interrupt via timeout */ + end_addr =coda_read (dev,CODA9_REG_JPEG_BBC_END_ADDR ); + wr_ptr =coda_read (dev,CODA9_REG_JPEG_BBC_WR_PTR ); +if (wr_ptr >= end_addr -256 ) { +v4l2_err (&dev->v4l2_dev,"JPEG too large for capture buffer\n" ); +coda9_jpeg_finish_encode (ctx); +return ; + } + +coda_hw_reset (ctx); +} +static void coda9_jpeg_release (struct coda_ctx *ctx) {int i;
@@ -1276,6 +1294,7 @@ const struct coda_context_ops coda9_jpeg_encode_ops = { .start_streaming = coda9_jpeg_start_encoding, .prepare_run = coda9_jpeg_prepare_encode, .finish_run = coda9_jpeg_finish_encode, + .run_timeout = coda9_jpeg_encode_timeout, .release = coda9_jpeg_release, };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 169/846 media: venus: correct low power frequency calculation for encoder
In reply to Greg Kroah-HartmanFrom: Mansur Alisha Shaik <[email protected]>
[ Upstream commit b1f9bb8020783a48151e3a2864fbdc70548566dd ]
In exististing implimentation, in min_loaded_core() for low_power vpp frequency value is considering as vpp_freq instead of low_power_freq. Fixed this by correcting vpp frequency calculation for encoder.
--- drivers/media/platform/qcom/venus/pm_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/pm_helpers.c +2 -2
@@ -587,8 +587,8 @@ min_loaded_core(struct venus_inst *inst, u32 *min_coreid, u32 *min_load, bool loif (inst->session_type ==VIDC_SESSION_TYPE_DEC ) vpp_freq = inst_pos->clk_data.vpp_freq;else if (inst->session_type ==VIDC_SESSION_TYPE_ENC ) - vpp_freq = low_power ? inst_pos->clk_data.vpp_freq : - inst_pos->clk_data.low_power_freq; + vpp_freq = low_power ? inst_pos->clk_data.low_power_freq : + inst_pos->clk_data.vpp_freq;else continue ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 170/846 media: venus: core: Fix a potential NULL pointer dereference in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit e4debea9be7d5db52bc6a565a4c02c3c6560d093 ]
The normal path of the function makes the assumption that 'pm_ops->core_power' may be NULL.
We should make the same assumption in the error handling path or a NULL pointer dereference may occur.
Add the missing test before calling 'pm_ops->core_power'
--- drivers/media/platform/qcom/venus/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/venus/core.c +2 -1
@@ -472,7 +472,8 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev) err_video_path:icc_set_bw (core->cpucfg_path,kbps_to_icc (1000 ),0 ); err_cpucfg_path: - pm_ops->core_power (core,POWER_ON ); +if (pm_ops->core_power) + pm_ops->core_power (core,POWER_ON );return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 171/846 media: venus: core: Fix a resource leak in the error handling path of venus_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 8cc7a1b2aca067397a016cdb971a5e6ad9b640c7 ]
A successful 'of_platform_populate()' call should be balanced by a corresponding 'of_platform_depopulate()' call in the error handling path of the probe, as already done in the remove function.
A successful 'venus_firmware_init()' call should be balanced by a corresponding 'venus_firmware_deinit()' call in the error handling path of the probe, as already done in the remove function.
Update the error handling path accordingly.
--- drivers/media/platform/qcom/venus/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/core.c +6 -2
@@ -349,11 +349,11 @@ static int venus_probe(struct platform_device *pdev) ret =venus_firmware_init (core);if (ret) - goto err_runtime_disable; + goto err_of_depopulate; ret =venus_boot (core);if (ret) - goto err_runtime_disable; + goto err_firmware_deinit; ret =hfi_core_resume (core, true);if (ret)
@@ -385,6 +385,10 @@ err_dev_unregister:v4l2_device_unregister (&core->v4l2_dev); err_venus_shutdown:venus_shutdown (core); +err_firmware_deinit: +venus_firmware_deinit (core); +err_of_depopulate: +of_platform_depopulate (dev); err_runtime_disable:pm_runtime_put_noidle (dev);pm_runtime_set_suspended (dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 172/846 net: stmmac: Add platform level debug register dump feature
In reply to Greg Kroah-HartmanFrom: Bhupesh Sharma <[email protected]>
[ Upstream commit 4047b9db1aa7512a10ba3560a3f63821c8c40235 ]
dwmac-qcom-ethqos currently exposes a mechanism to dump rgmii registers after the 'stmmac_dvr_probe()' returns. However with commit 5ec55823438e ("net: stmmac: add clocks management for gmac driver"), we now let 'pm_runtime_put()' disable the clocks before returning from 'stmmac_dvr_probe()'.
This causes a crash when 'rgmii_dump()' register dumps are enabled, as the clocks are already off.
Since other dwmac drivers (possible future users as well) might require a similar register dump feature, introduce a platform level callback to allow the same.
This fixes the crash noticed while enabling rgmii_dump() dumps in dwmac-qcom-ethqos driver as well. It also allows future changes to keep a invoking the register dump callback from the correct place inside 'stmmac_dvr_probe()'.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 7 ++++--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +++ include/linux/stmmac.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +4 -3
@@ -113,8 +113,10 @@ static void rgmii_updatel(struct qcom_ethqos *ethqos,rgmii_writel (ethqos, temp, offset); } -static void rgmii_dump (struct qcom_ethqos *ethqos) +static void rgmii_dump (void *priv) { +struct qcom_ethqos *ethqos = priv; +dev_dbg (ðqos->pdev->dev,"Rgmii register dump\n" );dev_dbg (ðqos->pdev->dev,"RGMII_IO_MACRO_CONFIG: %x\n" ,rgmii_readl (ethqos,RGMII_IO_MACRO_CONFIG ));
@@ -499,6 +501,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->bsp_priv = ethqos; plat_dat->fix_mac_speed = ethqos_fix_mac_speed; + plat_dat->dump_debug_regs = rgmii_dump; plat_dat->has_gmac4 =1 ; plat_dat->pmt =1 ; plat_dat->tso_en =of_property_read_bool (np,"snps,tso" );
@@ -507,8 +510,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev)if (ret) goto err_clk; -rgmii_dump (ethqos); -return ret; err_clk:
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -0
@@ -7077,6 +7077,9 @@ int stmmac_dvr_probe(struct device *device,stmmac_init_fs (ndev);#endif +if (priv->plat->dump_debug_regs) + priv->plat->dump_debug_regs (priv->plat->bsp_priv); +/* Let pm_runtime_put() disable the clocks. * If CONFIG_PM is not enabled, the clocks will stay powered. */
include/linux/stmmac.h +1 -0
@@ -233,6 +233,7 @@ struct plat_stmmacenet_data {int (*clks_config)(void *priv,bool enabled);int (*crosststamp)(ktime_t *device,struct system_counterval_t *system,void *ctx); +void (*dump_debug_regs)(void *priv);void *bsp_priv;struct clk *stmmac_clk;struct clk *pclk;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 173/846 thermal/drivers/imx: Implement runtime PM support
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 4cf2ddf16e175ee18c5c29865c32da7d6269cf44 ]
Starting with commit d92ed2c9d3ff ("thermal: imx: Use driver's local data to decide whether to run a measurement") this driver stared using irq_enabled flag to make decision to power on/off the thermal core. This triggered a regression, where after reaching critical temperature, alarm IRQ handler set irq_enabled to false, disabled thermal core and was not able read temperature and disable cooling sequence.
In case the cooling device is "CPU/GPU freq", the system will run with reduce performance until next reboot.
To solve this issue, we need to move all parts implementing hand made runtime power management and let it handle actual runtime PM framework.
--- drivers/thermal/imx_thermal.c | 145 +++++++++++++++++++++------------- 1 file changed, 91 insertions(+), 54 deletions(-)
drivers/thermal/imx_thermal.c +91 -54
@@ -15,6 +15,7 @@#include <linux/regmap.h> #include <linux/thermal.h> #include <linux/nvmem-consumer.h> +#include <linux/pm_runtime.h> #define REG_SET 0x4#define REG_CLR 0x8
@@ -194,6 +195,7 @@ static struct thermal_soc_data thermal_imx7d_data = { };struct imx_thermal_data { +struct device *dev;struct cpufreq_policy *policy;struct thermal_zone_device *tz;struct thermal_cooling_device *cdev;
@@ -252,44 +254,15 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)const struct thermal_soc_data *soc_data = data->socdata;struct regmap *map = data->tempmon;unsigned int n_meas; -bool wait, run_measurement;u32 val; +int ret; - run_measurement = !data->irq_enabled; -if (!run_measurement) { -/* Check if a measurement is currently in progress */ -regmap_read (map, soc_data->temp_data, &val); - wait = !(val & soc_data->temp_valid_mask); - }else { -/* -* Every time we measure the temperature, we will power on the -* temperature sensor, enable measurements, take a reading, -* disable measurements, power off the temperature sensor. -*/ -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , - soc_data->power_down_mask); -regmap_write (map, soc_data->sensor_ctrl +REG_SET , - soc_data->measure_temp_mask); - - wait = true; - } - -/* -* According to the temp sensor designers, it may require up to ~17us -* to complete a measurement. -*/ -if (wait) -usleep_range (20 ,50 ); + ret =pm_runtime_resume_and_get (data->dev); +if (ret <0 ) +return ret;regmap_read (map, soc_data->temp_data, &val); -if (run_measurement) { -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , - soc_data->measure_temp_mask); -regmap_write (map, soc_data->sensor_ctrl +REG_SET , - soc_data->power_down_mask); - } -if ((val & soc_data->temp_valid_mask) ==0 ) {dev_dbg (&tz->device,"temp measurement never finished\n" );return -EAGAIN ;
@@ -328,6 +301,8 @@ static int imx_get_temp(struct thermal_zone_device *tz, int *temp)enable_irq (data->irq); } +pm_runtime_put (data->dev); +return 0 ; }
@@ -335,24 +310,16 @@ static int imx_change_mode(struct thermal_zone_device *tz, enum thermal_device_mode mode) {struct imx_thermal_data *data = tz->devdata; -struct regmap *map = data->tempmon; -const struct thermal_soc_data *soc_data = data->socdata;if (mode ==THERMAL_DEVICE_ENABLED ) { -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , - soc_data->power_down_mask); -regmap_write (map, soc_data->sensor_ctrl +REG_SET , - soc_data->measure_temp_mask); +pm_runtime_get (data->dev);if (!data->irq_enabled) { data->irq_enabled = true;enable_irq (data->irq); } }else { -regmap_write (map, soc_data->sensor_ctrl +REG_CLR , - soc_data->measure_temp_mask); -regmap_write (map, soc_data->sensor_ctrl +REG_SET , - soc_data->power_down_mask); +pm_runtime_put (data->dev);if (data->irq_enabled) {disable_irq (data->irq);
@@ -393,6 +360,11 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip, int temp) {struct imx_thermal_data *data = tz->devdata; +int ret; + + ret =pm_runtime_resume_and_get (data->dev); +if (ret <0 ) +return ret;/* do not allow changing critical threshold */ if (trip ==IMX_TRIP_CRITICAL )
@@ -406,6 +378,8 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip,imx_set_alarm_temp (data, temp); +pm_runtime_put (data->dev); +return 0 ; }
@@ -681,6 +655,8 @@ static int imx_thermal_probe(struct platform_device *pdev)if (!data)return -ENOMEM ; + data->dev = &pdev->dev; + map =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"fsl,tempmon" );if (IS_ERR (map)) { ret =PTR_ERR (map);
@@ -800,6 +776,16 @@ static int imx_thermal_probe(struct platform_device *pdev) data->socdata->power_down_mask);regmap_write (map, data->socdata->sensor_ctrl +REG_SET , data->socdata->measure_temp_mask); +/* After power up, we need a delay before first access can be done. */ +usleep_range (20 ,50 ); + +/* the core was configured and enabled just before */ +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (data->dev); + + ret =pm_runtime_resume_and_get (data->dev); +if (ret <0 ) + goto disable_runtime_pm; data->irq_enabled = true; ret =thermal_zone_device_enable (data->tz);
@@ -814,10 +800,15 @@ static int imx_thermal_probe(struct platform_device *pdev) goto thermal_zone_unregister; } +pm_runtime_put (data->dev); +return 0 ; thermal_zone_unregister:thermal_zone_device_unregister (data->tz); +disable_runtime_pm: +pm_runtime_put_noidle (data->dev); +pm_runtime_disable (data->dev); clk_disable:clk_disable_unprepare (data->thermal_clk); legacy_cleanup:
@@ -829,13 +820,9 @@ legacy_cleanup:static int imx_thermal_remove (struct platform_device *pdev) {struct imx_thermal_data *data =platform_get_drvdata (pdev); -struct regmap *map = data->tempmon; -/* Disable measurements */ -regmap_write (map, data->socdata->sensor_ctrl +REG_SET , - data->socdata->power_down_mask); -if (!IS_ERR (data->thermal_clk)) -clk_disable_unprepare (data->thermal_clk); +pm_runtime_put_noidle (data->dev); +pm_runtime_disable (data->dev);thermal_zone_device_unregister (data->tz);imx_thermal_unregister_legacy_cooling (data);
@@ -858,29 +845,79 @@ static int __maybe_unused imx_thermal_suspend(struct device *dev) ret =thermal_zone_device_disable (data->tz);if (ret)return ret; + +return pm_runtime_force_suspend (data->dev); +} + +static int __maybe_unused imx_thermal_resume (struct device *dev) +{ +struct imx_thermal_data *data =dev_get_drvdata (dev); +int ret; + + ret =pm_runtime_force_resume (data->dev); +if (ret) +return ret; +/* Enabled thermal sensor after resume */ +return thermal_zone_device_enable (data->tz); +} + +static int __maybe_unused imx_thermal_runtime_suspend (struct device *dev) +{ +struct imx_thermal_data *data =dev_get_drvdata (dev); +const struct thermal_soc_data *socdata = data->socdata; +struct regmap *map = data->tempmon; +int ret; + + ret =regmap_write (map, socdata->sensor_ctrl +REG_CLR , + socdata->measure_temp_mask); +if (ret) +return ret; + + ret =regmap_write (map, socdata->sensor_ctrl +REG_SET , + socdata->power_down_mask); +if (ret) +return ret; +clk_disable_unprepare (data->thermal_clk);return 0 ; } -static int __maybe_unused imx_thermal_resume (struct device *dev) +static int __maybe_unused imx_thermal_runtime_resume (struct device *dev) {struct imx_thermal_data *data =dev_get_drvdata (dev); +const struct thermal_soc_data *socdata = data->socdata; +struct regmap *map = data->tempmon;int ret; ret =clk_prepare_enable (data->thermal_clk);if (ret)return ret; -/* Enabled thermal sensor after resume */ - ret =thermal_zone_device_enable (data->tz); + + ret =regmap_write (map, socdata->sensor_ctrl +REG_CLR , + socdata->power_down_mask); +if (ret) +return ret; + + ret =regmap_write (map, socdata->sensor_ctrl +REG_SET , + socdata->measure_temp_mask);if (ret)return ret; +/* +* According to the temp sensor designers, it may require up to ~17us +* to complete a measurement. +*/ +usleep_range (20 ,50 ); +return 0 ; } -static SIMPLE_DEV_PM_OPS(imx_thermal_pm_ops, - imx_thermal_suspend, imx_thermal_resume); +static const struct dev_pm_ops imx_thermal_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(imx_thermal_suspend, imx_thermal_resume) +SET_RUNTIME_PM_OPS (imx_thermal_runtime_suspend, + imx_thermal_runtime_resume,NULL ) +};static struct platform_driver imx_thermal = { .driver = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 174/846 igc: AF_XDP zero-copy metadata adjust breaks SKBs on XDP_PASS
In reply to Greg Kroah-HartmanFrom: Jesper Dangaard Brouer <[email protected]>
[ Upstream commit 4fa8fcd3440101dbacf4fae91de69877ef751977 ]
Driver already implicitly supports XDP metadata access in AF_XDP zero-copy mode, as xsk_buff_pool's xp_alloc() naturally set xdp_buff data_meta equal data.
This works fine for XDP and AF_XDP, but if a BPF-prog adjust via bpf_xdp_adjust_meta() and choose to call XDP_PASS, then igc function igc_construct_skb_zc() will construct an invalid SKB packet. The function correctly include the xdp->data_meta area in the memcpy, but forgot to pull header to take metasize into account.
--- drivers/net/ethernet/intel/igc/igc_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc_main.c +3 -1
@@ -2447,8 +2447,10 @@ static struct sk_buff *igc_construct_skb_zc(struct igc_ring *ring,skb_reserve (skb, xdp->data_meta - xdp->data_hard_start);memcpy (__skb_put (skb, totalsize), xdp->data_meta, totalsize); -if (metasize) +if (metasize) {skb_metadata_set (skb, metasize); +__skb_pull (skb, metasize); + }return skb; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 175/846 netfilter: bridge: add support for pppoe filtering
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 28b78ecffea8078d81466b2e01bb5a154509f1ba ]
This makes 'bridge-nf-filter-pppoe-tagged' sysctl work for bridged traffic.
Looking at the original commit it doesn't appear this ever worked:
static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
[..]
if (skb->protocol == htons(ETH_P_8021Q)) {
skb_pull(skb, VLAN_HLEN);
skb->network_header += VLAN_HLEN;
+ } else if (skb->protocol == htons(ETH_P_PPP_SES)) {
+ skb_pull(skb, PPPOE_SES_HLEN);
+ skb->network_header += PPPOE_SES_HLEN;
}
[..]
NF_HOOK(... POST_ROUTING, ...)... but the adjusted offsets are never restored.
The alternative would be to rip this code out for good, but otoh we'd have to keep this anyway for the vlan handling (which works because vlan tag info is in the skb, not the packet
payload).
--- net/bridge/br_netfilter_hooks.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/bridge/br_netfilter_hooks.c +3 -4
@@ -743,6 +743,9 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buffif (nf_bridge->frag_max_size && nf_bridge->frag_max_size < mtu) mtu = nf_bridge->frag_max_size; +nf_bridge_update_protocol (skb); +nf_bridge_push_encap_header (skb); +if (skb_is_gso (skb) || skb->len + mtu_reserved <= mtu) {nf_bridge_info_free (skb);return br_dev_queue_push_xmit (net, sk, skb);
@@ -760,8 +763,6 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buffIPCB (skb)->frag_max_size = nf_bridge->frag_max_size; -nf_bridge_update_protocol (skb); - data =this_cpu_ptr (&brnf_frag_data_storage);if (skb_vlan_tag_present (skb)) {
@@ -789,8 +790,6 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buffIP6CB (skb)->frag_max_size = nf_bridge->frag_max_size; -nf_bridge_update_protocol (skb); - data =this_cpu_ptr (&brnf_frag_data_storage); data->encap_size =nf_bridge_encap_header_len (skb); data->size =ETH_HLEN + data->encap_size;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 176/846 powerpc: Avoid discarding flags in system_call_exception()
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit 08b0af5b2affbe7419853e8dd1330e4b3fe27125 ]
Some thread flags can be set remotely, and so even when IRQs are disabled, the flags can change under our feet. Thus, when setting flags we must use an atomic operation rather than a plain read-modify-write sequence, as a plain read-modify-write may discard flags which are concurrently set by a remote thread, e.g.
// task A // task B tmp = A->thread_info.flags; set_tsk_thread_flag(A, NEWFLAG_B); tmp |= NEWFLAG_A; A->thread_info.flags = tmp;
arch/powerpc/kernel/interrupt.c's system_call_exception() sets _TIF_RESTOREALL in the thread info flags with a read-modify-write, which may result in other flags being discarded.
Elsewhere in the file it uses clear_bits() to atomically remove flag bits, so use set_bits() here for consistency with those.
There may be reasons (e.g. instrumentation) that prevent the use of set_thread_flag() and clear_thread_flag() here, which would otherwise be preferable.
--- arch/powerpc/kernel/interrupt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/interrupt.c +1 -1
@@ -148,7 +148,7 @@ notrace long system_call_exception(long r3, long r4, long r5,*/ if (IS_ENABLED (CONFIG_PPC_TRANSACTIONAL_MEM ) &&unlikely (MSR_TM_TRANSACTIONAL (regs->msr))) -current_thread_info ()->flags |= _TIF_RESTOREALL; +set_bits (_TIF_RESTOREALL, ¤t_thread_info ()->flags);/* * If the system call was made with a transaction active, doom it and
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 177/846 arm64: dts: qcom: msm8916: fix MMC controller aliases
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit b0293c19d42f6d6951c2fab9a47fed50baf2c14d ]
Change sdhcN aliases to mmcN to make them actually work. Currently the board uses non-standard aliases sdhcN, which do not work, resulting in mmc0 and mmc1 hosts randomly changing indices between boots.
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +2 -2
@@ -19,8 +19,8 @@ #size-cells = <2>; aliases { - sdhc1 = &sdhc_1; /* SDC1 eMMC slot */ - sdhc2 = &sdhc_2; /* SDC2 SD card slot */ + mmc0 = &sdhc_1; /* SDC1 eMMC slot */ + mmc1 = &sdhc_2; /* SDC2 SD card slot */ }; chosen { };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 178/846 drm/vmwgfx: Remove the deprecated lower mem limit
In reply to Greg Kroah-HartmanFrom: Zack Rusin <[email protected]>
[ Upstream commit 826c387d015247df396a91eadbaca94f0394853c ]
TTM during the transition to the new page allocator lost the ability to constrain the allocations via the lower_mem_limit. The code has been unused since the change:256dd44bd897 ("drm/ttm: nuke old page allocator")
and there's no reason to keep it.
--- drivers/gpu/drm/vmwgfx/ttm_memory.c | 99 +---------------------------- drivers/gpu/drm/vmwgfx/ttm_memory.h | 6 +- 2 files changed, 2 insertions(+), 103 deletions(-)
drivers/gpu/drm/vmwgfx/ttm_memory.c +1 -98
@@ -34,7 +34,6 @@#include <linux/mm.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/swap.h> #include <drm/drm_device.h> #include <drm/drm_file.h>
@@ -173,69 +172,7 @@ static struct kobj_type ttm_mem_zone_kobj_type = { .sysfs_ops = &ttm_mem_zone_ops, .default_attrs = ttm_mem_zone_attrs, }; - -static struct attribute ttm_mem_global_lower_mem_limit = { - .name ="lower_mem_limit" , - .mode =S_IRUGO |S_IWUSR -}; - -static ssize_t ttm_mem_global_show (struct kobject *kobj, -struct attribute *attr, -char *buffer) -{ -struct ttm_mem_global *glob = - container_of(kobj, struct ttm_mem_global, kobj); -uint64_t val =0 ; - -spin_lock (&glob->lock); - val = glob->lower_mem_limit; -spin_unlock (&glob->lock); -/* convert from number of pages to KB */ - val <<= (PAGE_SHIFT -10 ); -return snprintf (buffer,PAGE_SIZE ,"%llu\n" , - (unsigned long long ) val); -} - -static ssize_t ttm_mem_global_store (struct kobject *kobj, -struct attribute *attr, -const char *buffer, -size_t size) -{ -int chars; -uint64_t val64; -unsigned long val; -struct ttm_mem_global *glob = - container_of(kobj, struct ttm_mem_global, kobj); - - chars =sscanf (buffer,"%lu" , &val); -if (chars ==0 ) -return size; - - val64 = val; -/* convert from KB to number of pages */ - val64 >>= (PAGE_SHIFT -10 ); - -spin_lock (&glob->lock); - glob->lower_mem_limit = val64; -spin_unlock (&glob->lock); - -return size; -} - -static struct attribute *ttm_mem_global_attrs[] = { - &ttm_mem_global_lower_mem_limit, -NULL -}; - -static const struct sysfs_ops ttm_mem_global_ops = { - .show = &ttm_mem_global_show, - .store = &ttm_mem_global_store, -}; - -static struct kobj_type ttm_mem_glob_kobj_type = { - .sysfs_ops = &ttm_mem_global_ops, - .default_attrs = ttm_mem_global_attrs, -}; +static struct kobj_type ttm_mem_glob_kobj_type = {0 };static bool ttm_zones_above_swap_target (struct ttm_mem_global *glob,bool from_wq,uint64_t extra)
@@ -435,11 +372,6 @@ int ttm_mem_global_init(struct ttm_mem_global *glob, struct device *dev)si_meminfo (&si); -spin_lock (&glob->lock); -/* set it as 0 by default to keep original behavior of OOM */ - glob->lower_mem_limit =0 ; -spin_unlock (&glob->lock); - ret =ttm_mem_init_kernel_zone (glob, &si);if (unlikely (ret !=0 )) goto out_no_zone;
@@ -527,35 +459,6 @@ void ttm_mem_global_free(struct ttm_mem_global *glob, }EXPORT_SYMBOL (ttm_mem_global_free); -/* -* check if the available mem is under lower memory limit -* -* a. if no swap disk at all or free swap space is under swap_mem_limit -* but available system mem is bigger than sys_mem_limit, allow TTM -* allocation; -* -* b. if the available system mem is less than sys_mem_limit but free -* swap disk is bigger than swap_mem_limit, allow TTM allocation. -*/ -bool -ttm_check_under_lowerlimit (struct ttm_mem_global *glob, -uint64_t num_pages, -struct ttm_operation_ctx *ctx) -{ -int64_t available; - -/* We allow over commit during suspend */ -if (ctx->force_alloc) -return false; - - available =get_nr_swap_pages () +si_mem_available (); - available -= num_pages; -if (available < glob->lower_mem_limit) -return true; - -return false; -} -static int ttm_mem_global_reserve (struct ttm_mem_global *glob,struct ttm_mem_zone *single_zone,uint64_t amount,bool reserve)
drivers/gpu/drm/vmwgfx/ttm_memory.h +1 -5
@@ -50,8 +50,6 @@* @work: The workqueue callback for the shrink queue. * @lock: Lock to protect the @shrink - and the memory accounting members, * that is, essentially the whole structure with some exceptions. -* @lower_mem_limit: include lower limit of swap space and lower limit of -* system memory. * @zones: Array of pointers to accounting zones. * @num_zones: Number of populated entries in the @zones array. * @zone_kernel: Pointer to the kernel zone.
@@ -69,7 +67,6 @@ extern struct ttm_mem_global {struct workqueue_struct *swap_queue;struct work_struct work;spinlock_t lock; -uint64_t lower_mem_limit;struct ttm_mem_zone *zones[TTM_MEM_MAX_ZONES ];unsigned int num_zones;struct ttm_mem_zone *zone_kernel;
@@ -91,6 +88,5 @@ int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,void ttm_mem_global_free_page (struct ttm_mem_global *glob,struct page *page,uint64_t size);size_t ttm_round_pot (size_t size); -bool ttm_check_under_lowerlimit (struct ttm_mem_global *glob,uint64_t num_pages, -struct ttm_operation_ctx *ctx); +#endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 179/846 drm/vmwgfx: Fail to initialize on broken configs
In reply to Greg Kroah-HartmanFrom: Zack Rusin <[email protected]>
[ Upstream commit c451af78f301ff5156998d571c37cab329c10051 ]
Some of our hosts have a bug where rescaning a pci bus results in stale fifo memory being mapped on the host. This makes any fifo communication impossible resulting in various kernel crashes.
Instead of unexpectedly crashing, predictably fail to load the driver which will preserve the system.
--- drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c +7 -0
@@ -145,6 +145,13 @@ struct vmw_fifo_state *vmw_fifo_create(struct vmw_private *dev_priv) (unsigned int ) max, (unsigned int ) min, (unsigned int) fifo->capabilities); + +if (unlikely (min >= max)) { +drm_warn (&dev_priv->drm, +"FIFO memory is not usable. Driver failed to initialize." ); +return ERR_PTR (-ENXIO ); + } +return fifo; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 180/846 cgroup: Trace event cgroup id fields should be u64
In reply to Greg Kroah-HartmanFrom: William Kucharski <[email protected]>
[ Upstream commit e14da77113bb890d7bf9e5d17031bdd476a7ce5e ]
Various trace event fields that store cgroup IDs were declared as ints, but cgroup_id(() returns a u64 and the structures and associated TP_printk() calls were not updated to reflect this.
--- include/trace/events/cgroup.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/trace/events/cgroup.h +6 -6
@@ -59,8 +59,8 @@ DECLARE_EVENT_CLASS(cgroup,TP_STRUCT__entry (__field (int ,root ) -__field ( int, id )__field ( int, level ) +__field ( u64, id )__string ( path, path ) ),
@@ -71,7 +71,7 @@ DECLARE_EVENT_CLASS(cgroup,__assign_str (path, path); ), -TP_printk ("root=%d id=%d level=%d path=%s" , +TP_printk ("root=%d id=%llu level=%d path=%s" , __entry->root, __entry->id, __entry->level,__get_str (path)) );
@@ -126,8 +126,8 @@ DECLARE_EVENT_CLASS(cgroup_migrate,TP_STRUCT__entry (__field (int ,dst_root ) -__field ( int, dst_id )__field ( int, dst_level ) +__field ( u64, dst_id )__field ( int, pid )__string ( dst_path, path ) __string( comm, task->comm )
@@ -142,7 +142,7 @@ DECLARE_EVENT_CLASS(cgroup_migrate,__assign_str (comm, task->comm); ), -TP_printk ("dst_root=%d dst_id=%d dst_level=%d dst_path=%s pid=%d comm=%s" , +TP_printk ("dst_root=%d dst_id=%llu dst_level=%d dst_path=%s pid=%d comm=%s" , __entry->dst_root, __entry->dst_id, __entry->dst_level,__get_str (dst_path), __entry->pid,__get_str (comm)) );
@@ -171,8 +171,8 @@ DECLARE_EVENT_CLASS(cgroup_event,TP_STRUCT__entry (__field (int ,root ) -__field ( int, id )__field ( int, level ) +__field ( u64, id )__string ( path, path )__field ( int, val ) ),
@@ -185,7 +185,7 @@ DECLARE_EVENT_CLASS(cgroup_event, __entry->val = val; ), -TP_printk ("root=%d id=%d level=%d path=%s val=%d" , +TP_printk ("root=%d id=%llu level=%d path=%s val=%d" , __entry->root, __entry->id, __entry->level,__get_str (path), __entry->val) );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 181/846 ACPI: EC: Rework flushing of EC work while suspended to idle
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 4a9af6cac050dce2e895ec3205c4615383ad9112 ]
The flushing of pending work in the EC driver uses drain_workqueue() to flush the event handling work that can requeue itself via advance_transaction(), but this is problematic, because that work may also be requeued from the query workqueue.
Namely, if an EC transaction is carried out during the execution of a query handler, it involves calling advance_transaction() which may queue up the event handling work again. This causes the kernel to complain about attempts to add a work item to the EC event workqueue while it is being drained and worst-case it may cause a valid event to be skipped.
To avoid this problem, introduce two new counters, events_in_progress and queries_in_progress, incremented when a work item is queued on the event workqueue or the query workqueue, respectively, and decremented at the end of the corresponding work function, and make acpi_ec_dispatch_gpe() the workqueues in a loop until the both of these counters are zero (or system wakeup is pending) instead of calling acpi_ec_flush_work().
At the same time, change __acpi_ec_flush_work() to call flush_workqueue() instead of drain_workqueue() to flush the event workqueue.
While at it, use the observation that the work item queued in acpi_ec_query() cannot be pending at that time, because it is used only once, to simplify the code in there.
Additionally, clean up a comment in acpi_ec_query() and adjust white space in acpi_ec_event_processor().
--- drivers/acpi/ec.c | 57 +++++++++++++++++++++++++++++++---------- drivers/acpi/internal.h | 2 ++ 2 files changed, 45 insertions(+), 14 deletions(-)
drivers/acpi/ec.c +43 -14
@@ -166,6 +166,7 @@ struct acpi_ec_query {struct transaction transaction;struct work_struct work;struct acpi_ec_query_handler *handler; +struct acpi_ec *ec; };static int acpi_ec_query (struct acpi_ec *ec,u8 *data);
@@ -452,6 +453,7 @@ static void acpi_ec_submit_query(struct acpi_ec *ec)ec_dbg_evt ("Command(%s) submitted/blocked" ,acpi_ec_cmd_string (ACPI_EC_COMMAND_QUERY )); ec->nr_pending_queries++; + ec->events_in_progress++;queue_work (ec_wq, &ec->work); } }
@@ -518,7 +520,7 @@ static void acpi_ec_enable_event(struct acpi_ec *ec)#ifdef CONFIG_PM_SLEEP static void __acpi_ec_flush_work (void ) { -drain_workqueue (ec_wq);/* flush ec->work */ +flush_workqueue (ec_wq);/* flush ec->work */ flush_workqueue (ec_query_wq);/* flush queries */ }
@@ -1103,7 +1105,7 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit) }EXPORT_SYMBOL_GPL (acpi_ec_remove_query_handler); -static struct acpi_ec_query *acpi_ec_create_query (u8 *pval) +static struct acpi_ec_query *acpi_ec_create_query (struct acpi_ec *ec,u8 *pval) {struct acpi_ec_query *q;struct transaction *t;
@@ -1111,11 +1113,13 @@ static struct acpi_ec_query *acpi_ec_create_query(u8 *pval) q =kzalloc (sizeof (struct acpi_ec_query ),GFP_KERNEL );if (!q)return NULL ; +INIT_WORK (&q->work, acpi_ec_event_processor); t = &q->transaction; t->command =ACPI_EC_COMMAND_QUERY ; t->rdata = pval; t->rlen =1 ; + q->ec = ec;return q; }
@@ -1132,13 +1136,21 @@ static void acpi_ec_event_processor(struct work_struct *work) { struct acpi_ec_query *q = container_of(work, struct acpi_ec_query, work);struct acpi_ec_query_handler *handler = q->handler; +struct acpi_ec *ec = q->ec;ec_dbg_evt ("Query(0x%02x) started" , handler->query_bit); +if (handler->func) handler->func (handler->data);else if (handler->handle)acpi_evaluate_object (handler->handle,NULL ,NULL ,NULL ); +ec_dbg_evt ("Query(0x%02x) stopped" , handler->query_bit); + +spin_lock_irq (&ec->lock); + ec->queries_in_progress--; +spin_unlock_irq (&ec->lock); +acpi_ec_delete_query (q); }
@@ -1148,7 +1160,7 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 *data)int result;struct acpi_ec_query *q; - q =acpi_ec_create_query (&value); + q =acpi_ec_create_query (ec, &value);if (!q)return -ENOMEM ;
@@ -1170,19 +1182,20 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 *data) }/* -* It is reported that _Qxx are evaluated in a parallel way on -* Windows: +* It is reported that _Qxx are evaluated in a parallel way on Windows: * https://bugzilla.kernel.org/show_bug.cgi?id=94411 * -* Put this log entry before schedule_work() in order to make -* it appearing before any other log entries occurred during the -* work queue execution. +* Put this log entry before queue_work() to make it appear in the log +* before any other messages emitted during workqueue handling. */ ec_dbg_evt ("Query(0x%02x) scheduled" , value); -if (!queue_work (ec_query_wq, &q->work)) { -ec_dbg_evt ("Query(0x%02x) overlapped" , value); - result = -EBUSY ; - } + +spin_lock_irq (&ec->lock); + + ec->queries_in_progress++; +queue_work (ec_query_wq, &q->work); + +spin_unlock_irq (&ec->lock); err_exit:if (result)
@@ -1240,6 +1253,10 @@ static void acpi_ec_event_handler(struct work_struct *work)ec_dbg_evt ("Event stopped" );acpi_ec_check_event (ec); + +spin_lock_irqsave (&ec->lock, flags); + ec->events_in_progress--; +spin_unlock_irqrestore (&ec->lock, flags); }static void acpi_ec_handle_interrupt (struct acpi_ec *ec)
@@ -2021,6 +2038,7 @@ void acpi_ec_set_gpe_wake_mask(u8 action)bool acpi_ec_dispatch_gpe (void ) { +bool work_in_progress;u32 ret;if (!first_ec)
@@ -2041,8 +2059,19 @@ bool acpi_ec_dispatch_gpe(void)if (ret ==ACPI_INTERRUPT_HANDLED )pm_pr_dbg ("ACPI EC GPE dispatched\n" ); -/* Flush the event and query workqueues. */ -acpi_ec_flush_work (); +/* Drain EC work. */ +do { +acpi_ec_flush_work (); + +pm_pr_dbg ("ACPI EC work flushed\n" ); + +spin_lock_irq (&first_ec->lock); + + work_in_progress = first_ec->events_in_progress + + first_ec->queries_in_progress >0 ; + +spin_unlock_irq (&first_ec->lock); + }while (work_in_progress && !pm_wakeup_pending ());return false; }
drivers/acpi/internal.h +2 -0
@@ -183,6 +183,8 @@ struct acpi_ec {struct work_struct work;unsigned long timestamp;unsigned long nr_pending_queries; +unsigned int events_in_progress; +unsigned int queries_in_progress;bool busy_polling;unsigned int polling_guard; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 182/846 thermal/drivers/imx8mm: Enable ADC when enabling monitor
In reply to Greg Kroah-HartmanFrom: Paul Gerber <[email protected]>
[ Upstream commit 3de89d8842a2b5d3dd22ebf97dd561ae0a330948 ]
The i.MX 8MP has a ADC_PD bit in the TMU_TER register that controls the operating mode of the ADC:
* 0 means normal operating mode
* 1 means power down mode
When enabling/disabling the TMU, the ADC operating mode must be set accordingly.
i.MX 8M Mini & Nano are lacking this bit.
--- drivers/thermal/imx8mm_thermal.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/thermal/imx8mm_thermal.c +3 -0
@@ -21,6 +21,7 @@#define TPS 0x4#define TRITSR 0x20/* TMU immediate temp */ +#define TER_ADC_PD BIT(30)#define TER_EN BIT(31)#define TRITSR_TEMP0_VAL_MASK 0xff#define TRITSR_TEMP1_VAL_MASK 0xff0000
@@ -113,6 +114,8 @@ static void imx8mm_tmu_enable(struct imx8mm_tmu *tmu, bool enable) val =readl_relaxed (tmu->base +TER ); val = enable ? (val |TER_EN ) : (val & ~TER_EN ); +if (tmu->socdata->version ==TMU_VER2 ) + val = enable ? (val & ~TER_ADC_PD ) : (val |TER_ADC_PD );writel_relaxed (val, tmu->base +TER ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 183/846 drm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit b220110e4cd442156f36e1d9b4914bb9e87b0d00 ]
In amdgpu_connector_lcd_native_mode(), the return value of drm_mode_duplicate() is assigned to mode, and there is a dereference of it in amdgpu_connector_lcd_native_mode(), which will lead to a NULL pointer dereference on failure of drm_mode_duplicate().
Fix this bug add a check of mode.
This bug was found by a static analyzer. The analysis employs differential checking to identify inconsistent security operations (e.g., checks or kfrees) between two code paths and confirms that the inconsistent operations are not recovered in the current function or the callers, so they constitute bugs.
Note that, as a bug found by static analysis, it can be a false positive or hard to trigger. Multiple researchers have cross-reviewed the bug.
Builds with CONFIG_DRM_AMDGPU=m show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +6 -0
@@ -387,6 +387,9 @@ amdgpu_connector_lcd_native_mode(struct drm_encoder *encoder) native_mode->vdisplay != 0 && native_mode->clock != 0) { mode =drm_mode_duplicate (dev, native_mode); +if (!mode) +return NULL ; + mode->type =DRM_MODE_TYPE_PREFERRED |DRM_MODE_TYPE_DRIVER ;drm_mode_set_name (mode);
@@ -401,6 +404,9 @@ amdgpu_connector_lcd_native_mode(struct drm_encoder *encoder)* simpler. */ mode =drm_cvt_mode (dev, native_mode->hdisplay, native_mode->vdisplay,60 , true, false, false); +if (!mode) +return NULL ; + mode->type =DRM_MODE_TYPE_PREFERRED |DRM_MODE_TYPE_DRIVER ;DRM_DEBUG_KMS ("Adding cvt approximation of native panel mode %s\n" , mode->name); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 184/846 drm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit ab50cb9df8896b39aae65c537a30de2c79c19735 ]
In radeon_driver_open_kms(), radeon_vm_bo_add() is assigned to vm->ib_bo_va and passes and used in radeon_vm_bo_set_addr(). In radeon_vm_bo_set_addr(), there is a dereference of vm->ib_bo_va, which could lead to a NULL pointer dereference on failure of radeon_vm_bo_add().
Fix this bug by adding a check of vm->ib_bo_va.
This bug was found by a static analyzer. The analysis employs differential checking to identify inconsistent security operations (e.g., checks or kfrees) between two code paths and confirms that the inconsistent operations are not recovered in the current function or the callers, so they constitute bugs.
Note that, as a bug found by static analysis, it can be a false positive or hard to trigger. Multiple researchers have cross-reviewed the bug.
Builds with CONFIG_DRM_RADEON=m show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/gpu/drm/radeon/radeon_kms.c | 36 ++++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/radeon_kms.c +20 -16
@@ -648,6 +648,8 @@ void radeon_driver_lastclose_kms(struct drm_device *dev)int radeon_driver_open_kms (struct drm_device *dev,struct drm_file *file_priv) {struct radeon_device *rdev = dev->dev_private; +struct radeon_fpriv *fpriv; +struct radeon_vm *vm;int r; file_priv->driver_priv =NULL ;
@@ -660,8 +662,6 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)/* new gpu have virtual address space support */ if (rdev->family >=CHIP_CAYMAN ) { -struct radeon_fpriv *fpriv; -struct radeon_vm *vm; fpriv =kzalloc (sizeof (*fpriv),GFP_KERNEL );if (unlikely (!fpriv)) {
@@ -672,35 +672,39 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)if (rdev->accel_working) { vm = &fpriv->vm; r =radeon_vm_init (rdev, vm); -if (r) { -kfree (fpriv); - goto out_suspend; - } +if (r) + goto out_fpriv; r =radeon_bo_reserve (rdev->ring_tmp_bo.bo, false); -if (r) { -radeon_vm_fini (rdev, vm); -kfree (fpriv); - goto out_suspend; - } +if (r) + goto out_vm_fini;/* map the ib pool buffer read only into * virtual address space */ vm->ib_bo_va =radeon_vm_bo_add (rdev, vm, rdev->ring_tmp_bo.bo); +if (!vm->ib_bo_va) { + r = -ENOMEM ; + goto out_vm_fini; + } + r =radeon_vm_bo_set_addr (rdev, vm->ib_bo_va,RADEON_VA_IB_OFFSET ,RADEON_VM_PAGE_READABLE |RADEON_VM_PAGE_SNOOPED ); -if (r) { -radeon_vm_fini (rdev, vm); -kfree (fpriv); - goto out_suspend; - } +if (r) + goto out_vm_fini; } file_priv->driver_priv = fpriv; } +if (!r) + goto out_suspend; + +out_vm_fini: +radeon_vm_fini (rdev, vm); +out_fpriv: +kfree (fpriv); out_suspend:pm_runtime_mark_last_busy (dev->dev);pm_runtime_put_autosuspend (dev->dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 185/846 libbpf: Clean gen_loaders attach kind.
In reply to Greg Kroah-HartmanFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit 19250f5fc0c283892a61f3abf9d65e6325f63897 ]
The gen_loader has to clear attach_kind otherwise the programs without attach_btf_id will fail load if they follow programs with attach_btf_id.
--- tools/lib/bpf/gen_loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/lib/bpf/gen_loader.c +3 -1
@@ -663,9 +663,11 @@ void bpf_gen__prog_load(struct bpf_gen *gen,debug_ret (gen,"prog_load %s insn_cnt %d" , attr.prog_name, attr.insn_cnt);/* successful or not, close btf module FDs used in extern ksyms and attach_btf_obj_fd */ cleanup_relos (gen, insns); -if (gen->attach_kind) +if (gen->attach_kind) {emit_sys_close_blob (gen,attr_field (prog_load_attr, attach_btf_obj_fd)); + gen->attach_kind =0 ; + }emit_check_err (gen);/* remember prog_fd in the stack, if successful */ emit(gen, BPF_STX_MEM(BPF_W, BPF_REG_10, BPF_REG_7,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 186/846 crypto: caam - save caam memory to support crypto engine retry mechanism.
In reply to Greg Kroah-HartmanFrom: Gaurav Jain <[email protected]>
[ Upstream commit 087e1d715bccf25dc0e83294576e416b0386ba20 ]
When caam queue is full (-ENOSPC), caam frees descriptor memory. crypto-engine checks if retry support is true and h/w queue is full(-ENOSPC), then requeue the crypto request.
During processing the requested descriptor again, caam gives below error. (caam_jr 30902000.jr: 40000006: DECO: desc idx 0: Invalid KEY Command).
This patch adds a check to return when caam input ring is full and retry support is true. so descriptor memory is not freed and requeued request can be processed again.
--- drivers/crypto/caam/caamalg.c | 6 ++++++ drivers/crypto/caam/caamhash.c | 3 +++ drivers/crypto/caam/caampkc.c | 3 +++ 3 files changed, 12 insertions(+)
drivers/crypto/caam/caamalg.c +6 -0
@@ -1533,6 +1533,9 @@ static int aead_do_one_req(struct crypto_engine *engine, void *areq) ret =caam_jr_enqueue (ctx->jrdev, desc, aead_crypt_done, req); +if (ret == -ENOSPC && engine->retry_support) +return ret; +if (ret != -EINPROGRESS ) {aead_unmap (ctx->jrdev, rctx->edesc, req);kfree (rctx->edesc);
@@ -1762,6 +1765,9 @@ static int skcipher_do_one_req(struct crypto_engine *engine, void *areq) ret =caam_jr_enqueue (ctx->jrdev, desc, skcipher_crypt_done, req); +if (ret == -ENOSPC && engine->retry_support) +return ret; +if (ret != -EINPROGRESS ) {skcipher_unmap (ctx->jrdev, rctx->edesc, req);kfree (rctx->edesc);
drivers/crypto/caam/caamhash.c +3 -0
@@ -765,6 +765,9 @@ static int ahash_do_one_req(struct crypto_engine *engine, void *areq) ret =caam_jr_enqueue (jrdev, desc, state->ahash_op_done, req); +if (ret == -ENOSPC && engine->retry_support) +return ret; +if (ret != -EINPROGRESS ) {ahash_unmap (jrdev, state->edesc, req,0 );kfree (state->edesc);
drivers/crypto/caam/caampkc.c +3 -0
@@ -380,6 +380,9 @@ static int akcipher_do_one_req(struct crypto_engine *engine, void *areq) ret =caam_jr_enqueue (jrdev, desc, req_ctx->akcipher_op_done, req); +if (ret == -ENOSPC && engine->retry_support) +return ret; +if (ret != -EINPROGRESS ) {rsa_pub_unmap (jrdev, req_ctx->edesc, req);rsa_io_unmap (jrdev, req_ctx->edesc, req);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 187/846 arm64: dts: ti: k3-am642: Fix the L2 cache sets
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit a27a93bf70045be54b594fa8482959ffb84166d7 ]
A53's L2 cache[1] on AM642[2] is 256KB. A53's L2 is fixed line length of 64 bytes and 16-way set-associative cache structure.
256KB of L2 / 64 (line length) = 4096 ways
4096 ways / 16 = 256 sets
Fix the l2 cache-sets.
[1] https://developer.arm.com/documentation/ddi0500/j/Level-2-Memory-System/About-the-L2-memory-system?lang=en
[2] https://www.ti.com/lit/pdf/spruim2
--- arch/arm64/boot/dts/ti/k3-am642.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-am642.dtsi +1 -1
@@ -60,6 +60,6 @@ cache-level = <2>; cache-size = <0x40000>; cache-line-size = <64>; - cache-sets = <512>; + cache-sets = <256>; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 188/846 arm64: dts: ti: k3-j7200: Fix the L2 cache sets
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit d0c826106f3fc11ff97285102b576b65576654ae ]
A72's L2 cache[1] on J7200[2] is 1MB. A72's L2 is fixed line length of 64 bytes and 16-way set-associative cache structure.
1MB of L2 / 64 (line length) = 16384 ways
16384 ways / 16 = 1024 sets
Fix the l2 cache-sets.
[1] https://developer.arm.com/documentation/100095/0003/Level-2-Memory-System/About-the-L2-memory-system
[2] https://www.ti.com/lit/pdf/spruiu1
--- arch/arm64/boot/dts/ti/k3-j7200.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-j7200.dtsi +1 -1
@@ -84,7 +84,7 @@ cache-level = <2>; cache-size = <0x100000>; cache-line-size = <64>; - cache-sets = <2048>; + cache-sets = <1024>; next-level-cache = <&msmc_l3>; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 189/846 arm64: dts: ti: k3-j721e: Fix the L2 cache sets
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit e9ba3a5bc6fdc2c796c69fdaf5ed6c9957cf9f9d ]
A72's L2 cache[1] on J721e[2] is 1MB. A72's L2 is fixed line length of 64 bytes and 16-way set-associative cache structure.
1MB of L2 / 64 (line length) = 16384 ways
16384 ways / 16 = 1024 sets
Fix the l2 cache-sets.
[1] https://developer.arm.com/documentation/100095/0003/Level-2-Memory-System/About-the-L2-memory-system
[2] http://www.ti.com/lit/pdf/spruil1
--- arch/arm64/boot/dts/ti/k3-j721e.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-j721e.dtsi +1 -1
@@ -85,7 +85,7 @@ cache-level = <2>; cache-size = <0x100000>; cache-line-size = <64>; - cache-sets = <2048>; + cache-sets = <1024>; next-level-cache = <&msmc_l3>; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 190/846 arm64: dts: ti: k3-j7200: Correct the d-cache-sets info
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit a172c86931709d6663318609d71a811333bdf4b0 ]
A72 Cluster (chapter 1.3.1 [1]) has 48KB Icache, 32KB Dcache and 1MB L2 Cache
- ICache is 3-way set-associative
- Dcache is 2-way set-associative
- Line size are 64bytes
32KB (Dcache)/64 (fixed line length of 64 bytes) = 512 ways 512 ways / 2 (Dcache is 2-way per set) = 256 sets.
So, correct the d-cache-sets info.
[1] https://www.ti.com/lit/pdf/spruiu1
--- arch/arm64/boot/dts/ti/k3-j7200.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200.dtsi +2 -2
@@ -60,7 +60,7 @@ i-cache-sets = <256>; d-cache-size = <0x8000>; d-cache-line-size = <64>; - d-cache-sets = <128>; + d-cache-sets = <256>; next-level-cache = <&L2_0>; };
@@ -74,7 +74,7 @@ i-cache-sets = <256>; d-cache-size = <0x8000>; d-cache-line-size = <64>; - d-cache-sets = <128>; + d-cache-sets = <256>; next-level-cache = <&L2_0>; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 191/846 tty: serial: uartlite: allow 64 bit address
In reply to Greg Kroah-HartmanFrom: Lizhi Hou <[email protected]>
[ Upstream commit 3672fb65155530b5eea6225685c75329b6debec3 ]
The base address of uartlite registers could be 64 bit address which is from device resource. When ulite_probe() calls ulite_assign(), this 64 bit address is casted to 32-bit. The fix is to replace "u32" type with "phys_addr_t" type for the base address in ulite_assign() argument list.
--- drivers/tty/serial/uartlite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/uartlite.c +1 -1
@@ -612,7 +612,7 @@ static struct uart_driver ulite_uart_driver = {* * Returns: 0 on success, <0 otherwise */ -static int ulite_assign (struct device *dev,int id,u32 base,int irq, +static int ulite_assign (struct device *dev,int id,phys_addr_t base,int irq,struct uartlite_data *pdata) {struct uart_port *port;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 192/846 serial: amba-pl011: do not request memory region twice
In reply to Greg Kroah-HartmanFrom: Lino Sanfilippo <[email protected]>
[ Upstream commit d1180405c7b5c7a1c6bde79d5fc24fe931430737 ]
With commit 3873e2d7f63a ("drivers: PL011: refactor pl011_probe()") the function devm_ioremap() called from pl011_setup_port() was replaced with devm_ioremap_resource(). Since this function not only remaps but also requests the ports io memory region it now collides with the .config_port() callback which requests the same region at uart port registration.
Since devm_ioremap_resource() already claims the memory successfully, the request in .config_port() fails.
Later at uart port deregistration the attempt to release the unclaimed memory also fails. The failure results in a “Trying to free nonexistent resource" warning.
Fix these issues by removing the callbacks that implement the redundant memory allocation/release. Also make sure that changing the drivers io memory base address via TIOCSSERIAL is not allowed any more.
--- drivers/tty/serial/amba-pl011.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-)
drivers/tty/serial/amba-pl011.c +3 -24
@@ -2183,32 +2183,13 @@ static const char *pl011_type(struct uart_port *port)return uap->port.type ==PORT_AMBA ? uap->type :NULL ; } -/* -* Release the memory region(s) being used by 'port' -*/ -static void pl011_release_port (struct uart_port *port) -{ -release_mem_region (port->mapbase,SZ_4K ); -} - -/* -* Request the memory region(s) being used by 'port' -*/ -static int pl011_request_port (struct uart_port *port) -{ -return request_mem_region (port->mapbase,SZ_4K ,"uart-pl011" ) - !=NULL ?0 : -EBUSY ; -} -/* * Configure/autoconfigure the port. */ static void pl011_config_port (struct uart_port *port,int flags) { -if (flags &UART_CONFIG_TYPE ) { +if (flags &UART_CONFIG_TYPE ) port->type =PORT_AMBA ; -pl011_request_port (port); - } }/*
@@ -2223,6 +2204,8 @@ static int pl011_verify_port(struct uart_port *port, struct serial_struct *ser) ret = -EINVAL ;if (ser->baud_base <9600 ) ret = -EINVAL ; +if (port->mapbase != (unsigned long ) ser->iomem_base) + ret = -EINVAL ;return ret; }
@@ -2275,8 +2258,6 @@ static const struct uart_ops amba_pl011_pops = { .flush_buffer = pl011_dma_flush_buffer, .set_termios = pl011_set_termios, .type = pl011_type, - .release_port = pl011_release_port, - .request_port = pl011_request_port, .config_port = pl011_config_port, .verify_port = pl011_verify_port,#ifdef CONFIG_CONSOLE_POLL
@@ -2306,8 +2287,6 @@ static const struct uart_ops sbsa_uart_pops = { .shutdown = sbsa_uart_shutdown, .set_termios = sbsa_uart_set_termios, .type = pl011_type, - .release_port = pl011_release_port, - .request_port = pl011_request_port, .config_port = pl011_config_port, .verify_port = pl011_verify_port,#ifdef CONFIG_CONSOLE_POLL
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 193/846 mtd: core: provide unique name for nvmem device
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit c048b60d39e109c201d31ed5ad3a4f939064d6c4 ]
If there is more than one mtd device which supports OTP, there will be a kernel warning about duplicated sysfs entries and the probing will fail. This is because the nvmem device name is not unique. Make it unique by prepending the name of the mtd. E.g. before the name was "user-otp", now it will be "mtd0-user-otp".
For reference the kernel splash is:
[ 4.665531] sysfs: cannot create duplicate filename '/bus/nvmem/devices/user-otp' [ 4.673056] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.15.0-next-20211101+ #1296 [ 4.680565] Hardware name: Kontron SMARC-sAL28 (Single PHY) on SMARC Eval 2.0 carrier (DT) [ 4.688856] Call trace: [ 4.691303] dump_backtrace+0x0/0x1bc [ 4.694984] show_stack+0x24/0x30 [ 4.698306] dump_stack_lvl+0x68/0x84 [ 4.701980] dump_stack+0x18/0x34 [ 4.705302] sysfs_warn_dup+0x70/0x90 [ 4.708973] sysfs_do_create_link_sd+0x144/0x150 [ 4.713603] sysfs_create_link+0x2c/0x50 [ 4.717535] bus_add_device+0x74/0x120 [ 4.721293] device_add+0x330/0x890 [ 4.724791] device_register+0x2c/0x40 [ 4.728550] nvmem_register+0x240/0x9f0 [ 4.732398] mtd_otp_nvmem_register+0xb0/0x10c [ 4.736854] mtd_device_parse_register+0x28c/0x2b4 [ 4.741659] spi_nor_probe+0x20c/0x2e0 [ 4.745418] spi_mem_probe+0x78/0xbc [ 4.749001] spi_probe+0x90/0xf0 [ 4.752237] really_probe.part.0+0xa4/0x320 .. [ 4.873936] mtd mtd1: Failed to register OTP NVMEM device [ 4.894468] spi-nor: probe of spi0.0 failed with error -17
--- drivers/mtd/mtdcore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/mtdcore.c +2 -2
@@ -825,8 +825,7 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd,/* OTP nvmem will be registered on the physical device */ config.dev = mtd->dev.parent; -/* just reuse the compatible as name */ - config.name = compatible; + config.name =kasprintf (GFP_KERNEL ,"%s-%s" ,dev_name (&mtd->dev), compatible); config.id =NVMEM_DEVID_NONE ; config.owner =THIS_MODULE ; config.type =NVMEM_TYPE_OTP ;
@@ -842,6 +841,7 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd, nvmem =NULL ;of_node_put (np); +kfree (config.name);return nvmem; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 194/846 floppy: Fix hang in watchdog when disk is ejected
In reply to Greg Kroah-HartmanFrom: Tasos Sahanidis <[email protected]>
[ Upstream commit fb48febce7e30baed94dd791e19521abd2c3fd83 ]
When the watchdog detects a disk change, it calls cancel_activity(), which in turn tries to cancel the fd_timer delayed work.
In the above scenario, fd_timer_fn is set to fd_watchdog(), meaning it is trying to cancel its own work.
This results in a hang as cancel_delayed_work_sync() is waiting for the watchdog (itself) to return, which never happens.
This can be reproduced relatively consistently by attempting to read a broken floppy, and ejecting it while IO is being attempted and retried.
To resolve this, this patch calls cancel_delayed_work() instead, which cancels the work without waiting for the watchdog to return and finish.
Before this regression was introduced, the code in this section used del_timer(), and not del_timer_sync() to delete the watchdog timer.
--- drivers/block/floppy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/floppy.c +1 -1
@@ -1014,7 +1014,7 @@ static DECLARE_DELAYED_WORK(fd_timer, fd_timer_workfn);static void cancel_activity (void ) { do_floppy =NULL ; -cancel_delayed_work_sync (&fd_timer); +cancel_delayed_work (&fd_timer);cancel_work_sync (&floppy_work); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 195/846 staging: rtl8192e: return error code from rtllib_softmac_init()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 68bf78ff59a0891eb1239948e94ce10f73a9dd30 ]
If it fails to allocate 'dot11d_info', rtllib_softmac_init() should return error code. And remove unneccessary error message.
--- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtllib.h +1 -1
@@ -1980,7 +1980,7 @@ void SendDisassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn);void rtllib_softmac_xmit (struct rtllib_txb *txb,struct rtllib_device *ieee);void rtllib_start_ibss (struct rtllib_device *ieee); -void rtllib_softmac_init (struct rtllib_device *ieee); +int rtllib_softmac_init (struct rtllib_device *ieee);void rtllib_softmac_free (struct rtllib_device *ieee);void rtllib_disassociate (struct rtllib_device *ieee);void rtllib_stop_scan (struct rtllib_device *ieee);
drivers/staging/rtl8192e/rtllib_softmac.c +4 -2
@@ -2952,7 +2952,7 @@ void rtllib_start_protocol(struct rtllib_device *ieee) } } -void rtllib_softmac_init (struct rtllib_device *ieee) +int rtllib_softmac_init (struct rtllib_device *ieee) {int i;
@@ -2963,7 +2963,8 @@ void rtllib_softmac_init(struct rtllib_device *ieee) ieee->seq_ctrl[i] =0 ; ieee->dot11d_info =kzalloc (sizeof (struct rt_dot11d_info ),GFP_ATOMIC );if (!ieee->dot11d_info) -netdev_err (ieee->dev,"Can't alloc memory for DOT11D\n" ); +return -ENOMEM ; + ieee->LinkDetectInfo.SlotIndex =0 ; ieee->LinkDetectInfo.SlotNum =2 ; ieee->LinkDetectInfo.NumRecvBcnInPeriod =0 ;
@@ -3029,6 +3030,7 @@ void rtllib_softmac_init(struct rtllib_device *ieee)tasklet_setup (&ieee->ps_task, rtllib_sta_ps); +return 0 ; }void rtllib_softmac_free (struct rtllib_device *ieee)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 196/846 staging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit e730cd57ac2dfe94bca0f14a3be8e1b21de41a9c ]
Some variables are leaked in the error handling in alloc_rtllib(), free the variables in the error path.
--- drivers/staging/rtl8192e/rtllib_module.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtllib_module.c +12 -4
@@ -88,7 +88,7 @@ struct net_device *alloc_rtllib(int sizeof_priv) err =rtllib_networks_allocate (ieee);if (err) {pr_err ("Unable to allocate beacon storage: %d\n" , err); - goto failed; + goto free_netdev; }rtllib_networks_initialize (ieee);
@@ -121,11 +121,13 @@ struct net_device *alloc_rtllib(int sizeof_priv) ieee->hwsec_active =0 ;memset (ieee->swcamtable,0 ,sizeof (struct sw_cam_table ) *32 ); -rtllib_softmac_init (ieee); + err =rtllib_softmac_init (ieee); +if (err) + goto free_crypt_info; ieee->pHTInfo =kzalloc (sizeof (struct rt_hi_throughput ),GFP_KERNEL );if (!ieee->pHTInfo) -return NULL ; + goto free_softmac;HTUpdateDefaultSetting (ieee);HTInitializeHTInfo (ieee);
@@ -141,8 +143,14 @@ struct net_device *alloc_rtllib(int sizeof_priv)return dev; - failed: +free_softmac: +rtllib_softmac_free (ieee); +free_crypt_info: +lib80211_crypt_info_free (&ieee->crypt_info); +rtllib_networks_free (ieee); +free_netdev:free_netdev (dev); +return NULL ; }EXPORT_SYMBOL (alloc_rtllib);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 197/846 Bluetooth: btmtksdio: fix resume failure
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit 561ae1d46a8ddcbc13162d5771f5ed6c8249e730 ]
btmtksdio have to rely on MMC_PM_KEEP_POWER in pm_flags to avoid that SDIO power is being shut off during the device is in suspend. That fixes the SDIO command fails to access the bus after the device is resumed.
--- drivers/bluetooth/btmtksdio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/btmtksdio.c +2 -0
@@ -1042,6 +1042,8 @@ static int btmtksdio_runtime_suspend(struct device *dev)if (!bdev)return 0 ; +sdio_set_host_pm_flags (func,MMC_PM_KEEP_POWER ); +sdio_claim_host (bdev->func);sdio_writel (bdev->func,C_FW_OWN_REQ_SET ,MTK_REG_CHLPCR , &err);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 198/846 bpf: Fix the test_task_vma selftest to support output shorter than 1 kB
In reply to Greg Kroah-HartmanFrom: Maxim Mikityanskiy <[email protected]>
[ Upstream commit da54ab14953c38d98cb3e34c564c06c3739394b2 ]
The test for bpf_iter_task_vma assumes that the output will be longer than 1 kB, as the comment above the loop says. Due to this assumption, the loop becomes infinite if the output turns to be shorter than 1 kB. The return value of read_fd_into_buffer is 0 when the end of file was reached, and len isn't being increased any more.
This commit adds a break on EOF to handle short output correctly. For the reference, this is the contents that I get when running test_progs under vmtest.sh, and it's shorter than 1 kB:
00400000-00401000 r--p 00000000 fe:00 25867 /root/bpf/test_progs 00401000-00674000 r-xp 00001000 fe:00 25867 /root/bpf/test_progs 00674000-0095f000 r--p 00274000 fe:00 25867 /root/bpf/test_progs 0095f000-00983000 r--p 0055e000 fe:00 25867 /root/bpf/test_progs 00983000-00a8a000 rw-p 00582000 fe:00 25867 /root/bpf/test_progs
00a8a000-0484e000 rw-p 00000000 00:00 0 7f6c64000000-7f6c64021000 rw-p 00000000 00:00 0 7f6c64021000-7f6c68000000 ---p 00000000 00:00 0 7f6c6ac8f000-7f6c6ac90000 r--s 00000000 00:0d 8032 anon_inode:bpf-map 7f6c6ac90000-7f6c6ac91000 ---p 00000000 00:00 0 7f6c6ac91000-7f6c6b491000 rw-p 00000000 00:00 0 7f6c6b491000-7f6c6b492000 r--s 00000000 00:0d 8032 anon_inode:bpf-map 7f6c6b492000-7f6c6b493000 rw-s 00000000 00:0d 8032 anon_inode:bpf-map 7ffc1e23d000-7ffc1e25e000 rw-p 00000000 00:00 0 7ffc1e3b8000-7ffc1e3bc000 r--p 00000000 00:00 0 7ffc1e3bc000-7ffc1e3bd000 r-xp 00000000 00:00 0 7fffffffe000-7ffffffff000 --xp 00000000 00:00 0
--- tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +3 -2
@@ -1208,13 +1208,14 @@ static void test_task_vma(void) goto out;/* Read CMP_BUFFER_SIZE (1kB) from bpf_iter. Read in small chunks -* to trigger seq_file corner cases. The expected output is much -* longer than 1kB, so the while loop will terminate. +* to trigger seq_file corner cases. */ len =0 ;while (len <CMP_BUFFER_SIZE ) { err =read_fd_into_buffer (iter_fd, task_vma_output + len,min (read_size,CMP_BUFFER_SIZE - len)); +if (!err) +break ;if (CHECK (err <0 ,"read_iter_fd" ,"read_iter_fd failed\n" )) goto out; len += err;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 199/846 sched/fair: Fix detection of per-CPU kthreads waking a task
In reply to Greg Kroah-HartmanFrom: Vincent Donnefort <[email protected]>
[ Upstream commit 8b4e74ccb582797f6f0b0a50372ebd9fd2372a27 ]
select_idle_sibling() has a special case for tasks woken up by a per-CPU kthread, where the selected CPU is the previous one. However, the current condition for this exit path is incomplete. A task can wake up from an interrupt context (e.g. hrtimer), while a per-CPU kthread is running. A such scenario would spuriously trigger the special case described above. Also, a recent change made the idle task like a regular per-CPU kthread, hence making that situation more likely to happen (is_per_cpu_kthread(swapper) being true now).
Checking for task context makes sure select_idle_sibling() will not interpret a wake up from any other context as a wake up by a per-CPU kthread.
--- kernel/sched/fair.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/fair.c +1 -0
@@ -6429,6 +6429,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target)* pattern is IO completions. */ if (is_per_cpu_kthread (current) && +in_task () && prev ==smp_processor_id () &&this_rq ()->nr_running <=1 ) {return prev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 200/846 sched/fair: Fix per-CPU kthread and wakee stacking for asym CPU capacity
In reply to Greg Kroah-HartmanFrom: Vincent Donnefort <[email protected]>
[ Upstream commit 014ba44e8184e1acf93e0cbb7089ee847802f8f0 ]
select_idle_sibling() has a special case for tasks woken up by a per-CPU kthread where the selected CPU is the previous one. For asymmetric CPU capacity systems, the assumption was that the wakee couldn't have a bigger utilization during task placement than it used to have during the last activation. That was not considering uclamp.min which can completely change between two task activations and as a consequence mandates the fitness criterion asym_fits_capacity(), even for the exit path described above.
--- kernel/sched/fair.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/fair.c +2 -1
@@ -6431,7 +6431,8 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target)if (is_per_cpu_kthread (current) &&in_task () && prev ==smp_processor_id () && -this_rq ()->nr_running <=1 ) { +this_rq ()->nr_running <=1 && +asym_fits_capacity (task_util, prev)) {return prev; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 201/846 bpf: Adjust BTF log size limit.
In reply to Greg Kroah-HartmanFrom: Alexei Starovoitov <[email protected]>
[ Upstream commit c5a2d43e998a821701029f23e25b62f9188e93ff ]
Make BTF log size limit to be the same as the verifier log size limit. Otherwise tools that progressively increase log size and use the same log for BTF loading and program loading will be hitting hard to debug EINVAL.
--- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/btf.c +1 -1
@@ -4332,7 +4332,7 @@ static struct btf *btf_parse(bpfptr_t btf_data, u32 btf_data_size, log->len_total = log_size;/* log attributes have to be sane */ -if (log->len_total <128 || log->len_total >UINT_MAX >>8 || +if (log->len_total <128 || log->len_total >UINT_MAX >>2 || !log->level || !log->ubuf) { err = -EINVAL ; goto errout;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 202/846 bpf: Disallow BPF_LOG_KERNEL log level for bpf(BPF_BTF_LOAD)
In reply to Greg Kroah-HartmanFrom: Hou Tao <[email protected]>
[ Upstream commit 866de407444398bc8140ea70de1dba5f91cc34ac ]
BPF_LOG_KERNEL is only used internally, so disallow bpf_btf_load() to set log level as BPF_LOG_KERNEL. The same checking has already been done in bpf_check(), so factor out a helper to check the validity of log attributes and use it in both places.
--- include/linux/bpf_verifier.h | 7 +++++++ kernel/bpf/btf.c | 3 +-- kernel/bpf/verifier.c | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-)
include/linux/bpf_verifier.h +7 -0
@@ -396,6 +396,13 @@ static inline bool bpf_verifier_log_needed(const struct bpf_verifier_log *log) log->level == BPF_LOG_KERNEL); } +static inline bool +bpf_verifier_log_attr_valid (const struct bpf_verifier_log *log) +{ +return log->len_total >=128 && log->len_total <=UINT_MAX >>2 && + log->level && log->ubuf && !(log->level & ~BPF_LOG_MASK ); +} +#define BPF_MAX_SUBPROGS 256struct bpf_subprog_info {
kernel/bpf/btf.c +1 -2
@@ -4332,8 +4332,7 @@ static struct btf *btf_parse(bpfptr_t btf_data, u32 btf_data_size, log->len_total = log_size;/* log attributes have to be sane */ -if (log->len_total <128 || log->len_total >UINT_MAX >>2 || - !log->level || !log->ubuf) { +if (!bpf_verifier_log_attr_valid (log)) { err = -EINVAL ; goto errout; }
kernel/bpf/verifier.c +3 -3
@@ -13759,11 +13759,11 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr) log->ubuf = (char __user *) (unsigned long ) attr->log_buf; log->len_total = attr->log_size; - ret = -EINVAL ;/* log attributes have to be sane */ -if (log->len_total <128 || log->len_total >UINT_MAX >>2 || - !log->level || !log->ubuf || log->level & ~BPF_LOG_MASK ) +if (!bpf_verifier_log_attr_valid (log)) { + ret = -EINVAL ; goto err_unlock; + } }if (IS_ERR (btf_vmlinux)) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 203/846 bpf: Remove config check to enable bpf support for branch records
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit db52f57211b4e45f0ebb274e2c877b211dc18591 ]
Branch data available to BPF programs can be very useful to get stack traces out of userspace application.
Commit fff7b64355ea ("bpf: Add bpf_read_branch_records() helper") added BPF support to capture branch records in x86. Enable this feature also for other architectures as well by removing checks specific to x86.
If an architecture doesn't support branch records, bpf_read_branch_records() still has appropriate checks and it will return an -EINVAL in that scenario. Based on UAPI helper doc in include/uapi/linux/bpf.h, unsupported architectures should return -ENOENT in such case. Hence, update the appropriate check to return -ENOENT instead.
Selftest 'perf_branches' result on power9 machine which has the branch stacks support:
- Before this patch:
[command]# ./test_progs -t perf_branches
#88/1 perf_branches/perf_branches_hw:FAIL
#88/2 perf_branches/perf_branches_no_hw:OK
#88 perf_branches:FAIL
Summary: 0/1 PASSED, 0 SKIPPED, 1 FAILED
- After this patch:
[command]# ./test_progs -t perf_branches
#88/1 perf_branches/perf_branches_hw:OK
#88/2 perf_branches/perf_branches_no_hw:OK
#88 perf_branches:OK
Summary: 1/2 PASSED, 0 SKIPPED, 0 FAILED
Selftest 'perf_branches' result on power9 machine which doesn't have branch stack report:
- After this patch:
[command]# ./test_progs -t perf_branches
#88/1 perf_branches/perf_branches_hw:SKIP
#88/2 perf_branches/perf_branches_no_hw:OK
#88 perf_branches:OK
Summary: 1/1 PASSED, 1 SKIPPED, 0 FAILED
--- kernel/trace/bpf_trace.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
kernel/trace/bpf_trace.c +1 -5
@@ -1322,9 +1322,6 @@ static const struct bpf_func_proto bpf_perf_prog_read_value_proto = { BPF_CALL_4(bpf_read_branch_records, struct bpf_perf_event_data_kern *, ctx, void *, buf, u32, size, u64, flags) { -#ifndef CONFIG_X86 -return -ENOENT ; -#else static const u32 br_entry_size =sizeof (struct perf_branch_entry );struct perf_branch_stack *br_stack = ctx->data->br_stack;u32 to_copy;
@@ -1333,7 +1330,7 @@ BPF_CALL_4(bpf_read_branch_records, struct bpf_perf_event_data_kern *, ctx,return -EINVAL ;if (unlikely (!br_stack)) -return -EINVAL ; +return -ENOENT ;if (flags &BPF_F_GET_BRANCH_RECORDS_SIZE )return br_stack->nr * br_entry_size;
@@ -1345,7 +1342,6 @@ BPF_CALL_4(bpf_read_branch_records, struct bpf_perf_event_data_kern *, ctx,memcpy (buf, br_stack->entries, to_copy);return to_copy; -#endif }static const struct bpf_func_proto bpf_read_branch_records_proto = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 204/846 arm64: clear_page() shouldnt use DC ZVA when DCZID_EL0.DZP == 1
In reply to Greg Kroah-HartmanFrom: Reiji Watanabe <[email protected]>
[ Upstream commit f0616abd4e67143b45b04b565839148458857347 ]
Currently, clear_page() uses DC ZVA instruction unconditionally. But it should make sure that DCZID_EL0.DZP, which indicates whether or not use of DC ZVA instruction is prohibited, is zero when using the instruction. Use STNP instead when DCZID_EL0.DZP == 1.
--- arch/arm64/lib/clear_page.S | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/lib/clear_page.S +10 -0
@@ -16,6 +16,7 @@ */ SYM_FUNC_START_PI(clear_page) mrs x1, dczid_el0 + tbnz x1, #4, 2f /* Branch if DC ZVA is prohibited */ and w1, w1, #0xf mov x2, #4 lsl x1, x2, x1
@@ -25,5 +26,14 @@ SYM_FUNC_START_PI(clear_page) tst x0, #(PAGE_SIZE - 1) b.ne 1b ret + +2: stnp xzr, xzr, [x0] + stnp xzr, xzr, [x0, #16] + stnp xzr, xzr, [x0, #32] + stnp xzr, xzr, [x0, #48] + add x0, x0, #64 + tst x0, #(PAGE_SIZE - 1) + b.ne 2b + ret SYM_FUNC_END_PI(clear_page) EXPORT_SYMBOL(clear_page)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 205/846 arm64: mte: DC {GVA,GZVA} shouldnt be used when DCZID_EL0.DZP == 1
In reply to Greg Kroah-HartmanFrom: Reiji Watanabe <[email protected]>
[ Upstream commit 685e2564daa1493053fcd7f1dbed38b35ee2f3cb ]
Currently, mte_set_mem_tag_range() and mte_zero_clear_page_tags() use DC {GVA,GZVA} unconditionally. But, they should make sure that DCZID_EL0.DZP, which indicates whether or not use of those instructions is prohibited, is zero when using those instructions.
Use ST{G,ZG,Z2G} instead when DCZID_EL0.DZP == 1.
--- arch/arm64/include/asm/mte-kasan.h | 8 +++++--- arch/arm64/lib/mte.S | 8 +++++++- 2 files changed, 12 insertions(+), 4 deletions(-)
arch/arm64/include/asm/mte-kasan.h +5 -3
@@ -84,10 +84,12 @@ static inline void __dc_gzva(u64 p)static inline void mte_set_mem_tag_range (void *addr,size_t size,u8 tag,bool init) { -u64 curr, mask, dczid_bs, end1, end2, end3; +u64 curr, mask, dczid, dczid_bs, dczid_dzp, end1, end2, end3;/* Read DC G(Z)VA block size from the system register. */ - dczid_bs =4ul << (read_cpuid (DCZID_EL0 ) &0xf ); + dczid =read_cpuid (DCZID_EL0 ); + dczid_bs =4ul << (dczid &0xf ); + dczid_dzp = (dczid >>4 ) &1 ; curr = (u64 )__tag_set (addr, tag); mask = dczid_bs -1 ;
@@ -106,7 +108,7 @@ static inline void mte_set_mem_tag_range(void *addr, size_t size, u8 tag,*/ #define SET_MEMTAG_RANGE (stg_post, dc_gva) \ do { \ - if (size >= 2 * dczid_bs) { \ + if (!dczid_dzp && size >= 2 * dczid_bs) {\ do { \ curr = stg_post(curr); \ } while (curr < end1); \
arch/arm64/lib/mte.S +7 -1
@@ -43,17 +43,23 @@ SYM_FUNC_END(mte_clear_page_tags) * x0 - address to the beginning of the page */ SYM_FUNC_START(mte_zero_clear_page_tags) + and x0, x0, #(1 << MTE_TAG_SHIFT) - 1 // clear the tag mrs x1, dczid_el0 + tbnz x1, #4, 2f // Branch if DC GZVA is prohibited and w1, w1, #0xf mov x2, #4 lsl x1, x2, x1 - and x0, x0, #(1 << MTE_TAG_SHIFT) - 1 // clear the tag 1: dc gzva, x0 add x0, x0, x1 tst x0, #(PAGE_SIZE - 1) b.ne 1b ret + +2: stz2g x0, [x0], #(MTE_GRANULE_SIZE * 2) + tst x0, #(PAGE_SIZE - 1) + b.ne 2b + ret SYM_FUNC_END(mte_zero_clear_page_tags) /*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 206/846 samples/bpf: Install libbpf headers when building
In reply to Greg Kroah-HartmanFrom: Quentin Monnet <[email protected]>
[ Upstream commit 3f7a3318a7c60947e27be372950840a5eab976d0 ]
API headers from libbpf should not be accessed directly from the source directory. Instead, they should be exported with "make install_headers". Make sure that samples/bpf/Makefile installs the headers properly when building.
The object compiled from and exported by libbpf are now placed into a subdirectory of sample/bpf/ instead of remaining in tools/lib/bpf/. We attempt to remove this directory on "make clean". However, the "clean" target re-enters the samples/bpf/ directory from the root of the repository ("$(MAKE) -C ../../ M=$(CURDIR) clean"), in such a way that $(srctree) and $(src) are not defined, making it impossible to use $(LIBBPF_OUTPUT) and $(LIBBPF_DESTDIR) in the recipe. So we only attempt to clean $(CURDIR)/libbpf, which is the default value.
Add a dependency on libbpf's headers for the $(TRACE_HELPERS).
We also change the output directory for bpftool, to place the generated objects under samples/bpf/bpftool/ instead of building in bpftool's directory directly. Doing so, we make sure bpftool reuses the libbpf library previously compiled and installed.
--- samples/bpf/Makefile | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-)
samples/bpf/Makefile +30 -10
@@ -59,7 +59,11 @@ tprogs-y += xdp_redirect tprogs-y += xdp_monitor # Libbpf dependencies -LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a +LIBBPF_SRC = $(TOOLS_PATH)/lib/bpf +LIBBPF_OUTPUT = $(abspath $(BPF_SAMPLES_PATH))/libbpf +LIBBPF_DESTDIR = $(LIBBPF_OUTPUT) +LIBBPF_INCLUDE = $(LIBBPF_DESTDIR)/include +LIBBPF = $(LIBBPF_OUTPUT)/libbpf.a CGROUP_HELPERS := ../../tools/testing/selftests/bpf/cgroup_helpers.o TRACE_HELPERS := ../../tools/testing/selftests/bpf/trace_helpers.o
@@ -198,7 +202,7 @@ TPROGS_CFLAGS += -Wstrict-prototypes TPROGS_CFLAGS += -I$(objtree)/usr/include TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ -TPROGS_CFLAGS += -I$(srctree)/tools/lib/ +TPROGS_CFLAGS += -I$(LIBBPF_INCLUDE) TPROGS_CFLAGS += -I$(srctree)/tools/include TPROGS_CFLAGS += -I$(srctree)/tools/perf TPROGS_CFLAGS += -DHAVE_ATTR_TEST=0
@@ -268,16 +272,27 @@ all: clean: $(MAKE) -C ../../ M=$(CURDIR) clean @find $(CURDIR) -type f -name '*~' -delete + @$(RM) -r $(CURDIR)/libbpf $(CURDIR)/bpftool -$(LIBBPF): FORCE +$(LIBBPF): FORCE | $(LIBBPF_OUTPUT) # Fix up variables inherited from Kbuild that tools/ build system won't like - $(MAKE) -C $(dir $@) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)" \ - LDFLAGS=$(TPROGS_LDFLAGS) srctree=$(BPF_SAMPLES_PATH)/../../ O= + $(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)" \ + LDFLAGS=$(TPROGS_LDFLAGS) srctree=$(BPF_SAMPLES_PATH)/../../ \ + O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= \ + $@ install_headers BPFTOOLDIR := $(TOOLS_PATH)/bpf/bpftool -BPFTOOL := $(BPFTOOLDIR)/bpftool -$(BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) - $(MAKE) -C $(BPFTOOLDIR) srctree=$(BPF_SAMPLES_PATH)/../../ +BPFTOOL_OUTPUT := $(abspath $(BPF_SAMPLES_PATH))/bpftool +BPFTOOL := $(BPFTOOL_OUTPUT)/bpftool +$(BPFTOOL): $(LIBBPF) $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) | $(BPFTOOL_OUTPUT) + $(MAKE) -C $(BPFTOOLDIR) srctree=$(BPF_SAMPLES_PATH)/../../ \ + OUTPUT=$(BPFTOOL_OUTPUT)/ \ + LIBBPF_OUTPUT=$(LIBBPF_OUTPUT)/ \ + LIBBPF_DESTDIR=$(LIBBPF_DESTDIR)/ + +$(LIBBPF_OUTPUT) $(BPFTOOL_OUTPUT): + $(call msg,MKDIR,$@) + $(Q)mkdir -p $@ $(obj)/syscall_nrs.h: $(obj)/syscall_nrs.s FORCE $(call filechk,offsets,__SYSCALL_NRS_H__)
@@ -309,6 +324,11 @@ verify_target_bpf: verify_cmds $(BPF_SAMPLES_PATH)/*.c: verify_target_bpf $(LIBBPF) $(src)/*.c: verify_target_bpf $(LIBBPF) +libbpf_hdrs: $(LIBBPF) +$(obj)/$(TRACE_HELPERS): | libbpf_hdrs + +.PHONY: libbpf_hdrs + $(obj)/xdp_redirect_cpu_user.o: $(obj)/xdp_redirect_cpu.skel.h $(obj)/xdp_redirect_map_multi_user.o: $(obj)/xdp_redirect_map_multi.skel.h $(obj)/xdp_redirect_map_user.o: $(obj)/xdp_redirect_map.skel.h
@@ -366,7 +386,7 @@ $(obj)/%.bpf.o: $(src)/%.bpf.c $(obj)/vmlinux.h $(src)/xdp_sample.bpf.h $(src)/x $(Q)$(CLANG) -g -O2 -target bpf -D__TARGET_ARCH_$(SRCARCH) \ -Wno-compare-distinct-pointer-types -I$(srctree)/include \ -I$(srctree)/samples/bpf -I$(srctree)/tools/include \ - -I$(srctree)/tools/lib $(CLANG_SYS_INCLUDES) \ + -I$(LIBBPF_INCLUDE) $(CLANG_SYS_INCLUDES) \ -c $(filter %.bpf.c,$^) -o $@ LINKED_SKELS := xdp_redirect_cpu.skel.h xdp_redirect_map_multi.skel.h \
@@ -403,7 +423,7 @@ $(obj)/%.o: $(src)/%.c @echo " CLANG-bpf " $@ $(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(BPF_EXTRA_CFLAGS) \ -I$(obj) -I$(srctree)/tools/testing/selftests/bpf/ \ - -I$(srctree)/tools/lib/ \ + -I$(LIBBPF_INCLUDE) \ -D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \ -D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \ -Wno-gnu-variable-sized-type-not-at-end \
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 207/846 samples/bpf: Clean up samples/bpf build failes
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 527024f7aeb683ce7ef49b07ef7ce9ecf015288d ]
Remove xdp_samples_user.o rule redefinition which generates Makefile warning and instead override TPROGS_CFLAGS. This seems to work fine when building inside selftests/bpf.
That was one big head-scratcher before I found that generic Makefile.target hid this surprising specialization for for xdp_samples_user.o.
Main change is to use actual locally installed libbpf headers.
Also drop printk macro re-definition (not even used!).
--- samples/bpf/Makefile | 13 ++++++++++++- samples/bpf/Makefile.target | 11 ----------- samples/bpf/hbm_kern.h | 2 -- samples/bpf/lwt_len_hist_kern.c | 7 ------- 4 files changed, 12 insertions(+), 21 deletions(-)
samples/bpf/Makefile +12 -1
@@ -325,7 +325,7 @@ $(BPF_SAMPLES_PATH)/*.c: verify_target_bpf $(LIBBPF) $(src)/*.c: verify_target_bpf $(LIBBPF) libbpf_hdrs: $(LIBBPF) -$(obj)/$(TRACE_HELPERS): | libbpf_hdrs +$(obj)/$(TRACE_HELPERS) $(obj)/$(CGROUP_HELPERS) $(obj)/$(XDP_SAMPLE): | libbpf_hdrs .PHONY: libbpf_hdrs
@@ -340,6 +340,17 @@ $(obj)/hbm_out_kern.o: $(src)/hbm.h $(src)/hbm_kern.h $(obj)/hbm.o: $(src)/hbm.h $(obj)/hbm_edt_kern.o: $(src)/hbm.h $(src)/hbm_kern.h +# Override includes for xdp_sample_user.o because $(srctree)/usr/include in +# TPROGS_CFLAGS causes conflicts +XDP_SAMPLE_CFLAGS += -Wall -O2 -lm \ + -I$(src)/../../tools/include \ + -I$(src)/../../tools/include/uapi \ + -I$(LIBBPF_INCLUDE) \ + -I$(src)/../../tools/testing/selftests/bpf + +$(obj)/$(XDP_SAMPLE): TPROGS_CFLAGS = $(XDP_SAMPLE_CFLAGS) +$(obj)/$(XDP_SAMPLE): $(src)/xdp_sample_user.h $(src)/xdp_sample_shared.h + -include $(BPF_SAMPLES_PATH)/Makefile.target VMLINUX_BTF_PATHS ?= $(abspath $(if $(O),$(O)/vmlinux)) \
samples/bpf/Makefile.target +0 -11
@@ -73,14 +73,3 @@ quiet_cmd_tprog-cobjs = CC $@ cmd_tprog-cobjs = $(CC) $(tprogc_flags) -c -o $@ $< $(tprog-cobjs): $(obj)/%.o: $(src)/%.c FORCE $(call if_changed_dep,tprog-cobjs) - -# Override includes for xdp_sample_user.o because $(srctree)/usr/include in -# TPROGS_CFLAGS causes conflicts -XDP_SAMPLE_CFLAGS += -Wall -O2 -lm \ - -I./tools/include \ - -I./tools/include/uapi \ - -I./tools/lib \ - -I./tools/testing/selftests/bpf -$(obj)/xdp_sample_user.o: $(src)/xdp_sample_user.c \ - $(src)/xdp_sample_user.h $(src)/xdp_sample_shared.h - $(CC) $(XDP_SAMPLE_CFLAGS) -c -o $@ $<
samples/bpf/hbm_kern.h +0 -2
@@ -9,8 +9,6 @@* Include file for sample Host Bandwidth Manager (HBM) BPF programs */ #define KBUILD_MODNAME "foo" -#include <stddef.h> -#include <stdbool.h> #include <uapi/linux/bpf.h> #include <uapi/linux/if_ether.h> #include <uapi/linux/if_packet.h>
samples/bpf/lwt_len_hist_kern.c +0 -7
@@ -16,13 +16,6 @@#include <uapi/linux/in.h> #include <bpf/bpf_helpers.h> -# define printk (fmt, ...) \ - ({ \ - char ____fmt[] = fmt; \ - bpf_trace_printk(____fmt, sizeof(____fmt), \ - ##__VA_ARGS__); \ - }) -struct bpf_elf_map {__u32 type;__u32 size_key;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 208/846 samples: bpf: Fix xdp_sample_user.o linking with Clang
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit e64fbcaa7a666f16329b1c67af15ea501bc84586 ]
Clang (13) doesn't get the jokes about specifying libraries to link in cclags of individual .o objects:
clang-13: warning: -lm: 'linker' input unused [-Wunused-command-line-argument] [ ... ]
LD samples/bpf/xdp_redirect_cpu LD samples/bpf/xdp_redirect_map_multi LD samples/bpf/xdp_redirect_map LD samples/bpf/xdp_redirect LD samples/bpf/xdp_monitor
/usr/bin/ld: samples/bpf/xdp_sample_user.o: in function `sample_summary_print':
xdp_sample_user.c:(.text+0x84c): undefined reference to floor' /usr/bin/ld: xdp_sample_user.c:(.text+0x870): undefined reference to ceil' /usr/bin/ld: xdp_sample_user.c:(.text+0x8cf): undefined reference to floor' /usr/bin/ld: xdp_sample_user.c:(.text+0x8f3): undefined reference to ceil' [ more ]
Specify '-lm' as ldflags for all xdp_sample_user.o users in the main Makefile and remove it from ccflags of ^ in Makefile.target -- just like it's done for all other samples. This works with all compilers.
--- samples/bpf/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
samples/bpf/Makefile +6 -1
@@ -213,6 +213,11 @@ TPROGS_LDFLAGS := -L$(SYSROOT)/usr/lib endif TPROGS_LDLIBS += $(LIBBPF) -lelf -lz +TPROGLDLIBS_xdp_monitor += -lm +TPROGLDLIBS_xdp_redirect += -lm +TPROGLDLIBS_xdp_redirect_cpu += -lm +TPROGLDLIBS_xdp_redirect_map += -lm +TPROGLDLIBS_xdp_redirect_map_multi += -lm TPROGLDLIBS_tracex4 += -lrt TPROGLDLIBS_trace_output += -lrt TPROGLDLIBS_map_perf_test += -lrt
@@ -342,7 +347,7 @@ $(obj)/hbm_edt_kern.o: $(src)/hbm.h $(src)/hbm_kern.h # Override includes for xdp_sample_user.o because $(srctree)/usr/include in # TPROGS_CFLAGS causes conflicts -XDP_SAMPLE_CFLAGS += -Wall -O2 -lm \ +XDP_SAMPLE_CFLAGS += -Wall -O2 \ -I$(src)/../../tools/include \ -I$(src)/../../tools/include/uapi \ -I$(LIBBPF_INCLUDE) \
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 209/846 samples: bpf: Fix unknown warning group build warning on Clang
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit 6f670d06e47c774bc065aaa84a527a4838f34bd8 ]
Clang doesn't have 'stringop-truncation' group like GCC does, and complains about it when building samples which use xdp_sample_user infra:
samples/bpf/xdp_sample_user.h:48:32: warning: unknown warning group '-Wstringop-truncation', ignored [-Wunknown-warning-option] #pragma GCC diagnostic ignored "-Wstringop-truncation"
^
[ repeat ]
Those are harmless, but avoidable when guarding it with ifdef. I could guard push/pop as well, but this would require one more ifdef cruft around a single line which I don't think is reasonable.
--- samples/bpf/xdp_sample_user.h | 2 ++ 1 file changed, 2 insertions(+)
samples/bpf/xdp_sample_user.h +2 -0
@@ -45,7 +45,9 @@ const char *get_driver_name(int ifindex);int get_mac_addr (int ifindex,void *mac_addr);#pragma GCC diagnostic push +#ifndef __clang__#pragma GCC diagnostic ignored "-Wstringop-truncation" +#endif __attribute__((unused))static inline char *safe_strncpy (char *dst,const char *src,size_t size) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 210/846 media: dib8000: Fix a memleak in dib8000_init()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit 8dbdcc7269a83305ee9d677b75064d3530a48ee2 ]
In dib8000_init(), the variable fe is not freed or passed out on the failure of dib8000_identify(&state->i2c), which could lead to a memleak.
Fix this bug by adding a kfree of fe in the error path.
This bug was found by a static analyzer. The analysis employs differential checking to identify inconsistent security operations (e.g., checks or kfrees) between two code paths and confirms that the inconsistent operations are not recovered in the current function or the callers, so they constitute bugs.
Note that, as a bug found by static analysis, it can be a false positive or hard to trigger. Multiple researchers have cross-reviewed the bug.
Builds with CONFIG_DVB_DIB8000=m show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/media/dvb-frontends/dib8000.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/dib8000.c +3 -1
@@ -4473,8 +4473,10 @@ static struct dvb_frontend *dib8000_init(struct i2c_adapter *i2c_adap, u8 i2c_ad state->timf_default = cfg->pll->timf; -if (dib8000_identify (&state->i2c) ==0 ) +if (dib8000_identify (&state->i2c) ==0 ) { +kfree (fe); goto error; + }dibx000_init_i2c_master (&state->i2c_master,DIB8000 , state->i2c.adap, state->i2c.addr);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 211/846 media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit 0407c49ebe330333478440157c640fffd986f41b ]
In mxb_attach(dev, info), saa7146_vv_init() is called to allocate a new memory for dev->vv_data. saa7146_vv_release() will be called on failure of mxb_probe(dev). There is a dereference of dev->vv_data in saa7146_vv_release(), which could lead to a NULL pointer dereference on failure of saa7146_vv_init().
Fix this bug by adding a check of saa7146_vv_init().
This bug was found by a static analyzer. The analysis employs differential checking to identify inconsistent security operations (e.g., checks or kfrees) between two code paths and confirms that the inconsistent operations are not recovered in the current function or the callers, so they constitute bugs.
Note that, as a bug found by static analysis, it can be a false positive or hard to trigger. Multiple researchers have cross-reviewed the bug.
Builds with CONFIG_VIDEO_MXB=m show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/media/pci/saa7146/mxb.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/pci/saa7146/mxb.c +7 -1
@@ -683,10 +683,16 @@ static struct saa7146_ext_vv vv_data;static int mxb_attach (struct saa7146_dev *dev,struct saa7146_pci_extension_data *info) {struct mxb *mxb; +int ret;DEB_EE ("dev:%p\n" , dev); -saa7146_vv_init (dev, &vv_data); + ret =saa7146_vv_init (dev, &vv_data); +if (ret) { +ERR ("Error in saa7146_vv_init()" ); +return ret; + } +if (mxb_probe (dev)) {saa7146_vv_release (dev);return -1 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 212/846 media: si2157: Fix "warm" tuner state detection
In reply to Greg Kroah-HartmanFrom: Robert Schlabbach <[email protected]>
[ Upstream commit a6441ea29cb2c9314654e093a1cd8020b9b851c8 ]
Commit e955f959ac52 ("media: si2157: Better check for running tuner in init") completely broke the "warm" tuner detection of the si2157 driver due to a simple endian error: The Si2157 CRYSTAL_TRIM property code is 0x0402 and needs to be transmitted LSB first. However, it was inserted MSB first, causing the warm detection to always fail and spam the kernel log with tuner initialization messages each time the DVB frontend device was closed and reopened:
[ 312.215682] si2157 16-0060: found a 'Silicon Labs Si2157-A30' [ 312.264334] si2157 16-0060: firmware version: 3.0.5 [ 342.248593] si2157 16-0060: found a 'Silicon Labs Si2157-A30' [ 342.295743] si2157 16-0060: firmware version: 3.0.5 [ 372.328574] si2157 16-0060: found a 'Silicon Labs Si2157-A30' [ 372.385035] si2157 16-0060: firmware version: 3.0.5
Also, the reinitializations were observed disturb _other_ tuners on multi-tuner cards such as the Hauppauge WinTV-QuadHD, leading to missed or errored packets when one of the other DVB frontend devices on that card was opened.
Fix the order of the property code bytes to make the warm detection work again, also reducing the tuner initialization message in the kernel log to once per power-on, as well as fixing the interference with other tuners.
--- drivers/media/tuners/si2157.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/tuners/si2157.c +1 -1
@@ -90,7 +90,7 @@ static int si2157_init(struct dvb_frontend *fe)dev_dbg (&client->dev,"\n" );/* Try to get Xtal trim property, to verify tuner still running */ -memcpy (cmd.args,"\x15\x00\x04\x02" ,4 ); +memcpy (cmd.args,"\x15\x00\x02\x04" ,4 ); cmd.wlen =4 ; cmd.rlen =4 ; ret =si2157_cmd_execute (client, &cmd);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 213/846 wireless: iwlwifi: Fix a double free in iwl_txq_dyn_alloc_dma
In reply to Greg Kroah-HartmanFrom: Lv Yunlong <[email protected]>
[ Upstream commit f973795a8d19cbf3d03807704eb7c6ff65788d5a ]
In iwl_txq_dyn_alloc_dma, txq->tfds is freed at first time by:
iwl_txq_alloc()->goto err_free_tfds->dma_free_coherent(). But it forgot to set txq->tfds to NULL.
Then the txq->tfds is freed again in iwl_txq_dyn_alloc_dma by:
goto error->iwl_txq_gen2_free_memory()->dma_free_coherent().
My patch sets txq->tfds to NULL after the first free to avoid the double free.
--- drivers/net/wireless/intel/iwlwifi/queue/tx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/intel/iwlwifi/queue/tx.c +1 -0
@@ -1072,6 +1072,7 @@ int iwl_txq_alloc(struct iwl_trans *trans, struct iwl_txq *txq, int slots_num,return 0 ; err_free_tfds:dma_free_coherent (trans->dev, tfd_sz, txq->tfds, txq->dma_addr); + txq->tfds =NULL ; error:if (txq->entries && cmd_queue)for (i =0 ; i < slots_num; i++)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 214/846 sched/rt: Try to restart rt period timer when rt runtime exceeded
In reply to Greg Kroah-HartmanFrom: Li Hua <[email protected]>
[ Upstream commit 9b58e976b3b391c0cf02e038d53dd0478ed3013c ]
When rt_runtime is modified from -1 to a valid control value, it may cause the task to be throttled all the time. Operations like the following will trigger the bug. E.g:
1. echo -1 > /proc/sys/kernel/sched_rt_runtime_us
2. Run a FIFO task named A that executes while(1)
3. echo 950000 > /proc/sys/kernel/sched_rt_runtime_us
When rt_runtime is -1, The rt period timer will not be activated when task A enqueued. And then the task will be throttled after setting rt_runtime to 950,000. The task will always be throttled because the rt period timer is not activated.
--- kernel/sched/rt.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
kernel/sched/rt.c +18 -5
@@ -52,11 +52,8 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime) rt_b->rt_period_timer.function = sched_rt_period_timer; } -static void start_rt_bandwidth (struct rt_bandwidth *rt_b) +static inline void do_start_rt_bandwidth (struct rt_bandwidth *rt_b) { -if (!rt_bandwidth_enabled () || rt_b->rt_runtime ==RUNTIME_INF ) -return ; -raw_spin_lock (&rt_b->rt_runtime_lock);if (!rt_b->rt_period_active) { rt_b->rt_period_active =1 ;
@@ -75,6 +72,14 @@ static void start_rt_bandwidth(struct rt_bandwidth *rt_b)raw_spin_unlock (&rt_b->rt_runtime_lock); } +static void start_rt_bandwidth (struct rt_bandwidth *rt_b) +{ +if (!rt_bandwidth_enabled () || rt_b->rt_runtime ==RUNTIME_INF ) +return ; + +do_start_rt_bandwidth (rt_b); +} +void init_rt_rq (struct rt_rq *rt_rq) {struct rt_prio_array *array;
@@ -1029,13 +1034,17 @@ static void update_curr_rt(struct rq *rq)for_each_sched_rt_entity (rt_se) {struct rt_rq *rt_rq =rt_rq_of_se (rt_se); +int exceeded;if (sched_rt_runtime (rt_rq) !=RUNTIME_INF ) {raw_spin_lock (&rt_rq->rt_runtime_lock); rt_rq->rt_time += delta_exec; -if (sched_rt_runtime_exceeded (rt_rq)) + exceeded =sched_rt_runtime_exceeded (rt_rq); +if (exceeded)resched_curr (rq);raw_spin_unlock (&rt_rq->rt_runtime_lock); +if (exceeded) +do_start_rt_bandwidth (sched_rt_bandwidth (rt_rq)); } } }
@@ -2785,8 +2794,12 @@ static int sched_rt_global_validate(void)static void sched_rt_do_global (void ) { +unsigned long flags; + +raw_spin_lock_irqsave (&def_rt_bandwidth.rt_runtime_lock, flags); def_rt_bandwidth.rt_runtime =global_rt_runtime (); def_rt_bandwidth.rt_period =ns_to_ktime (global_rt_period ()); +raw_spin_unlock_irqrestore (&def_rt_bandwidth.rt_runtime_lock, flags); } int sched_rt_handler(struct ctl_table *table, int write, void *buffer,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 215/846 ath10k: Fix the MTU size on QCA9377 SDIO
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 09b8cd69edcf2be04a781e1781e98e52a775c9ad ]
On an imx6dl-pico-pi board with a QCA9377 SDIO chip, simply trying to connect via ssh to another machine causes:
[ 55.824159] ath10k_sdio mmc1:0001:1: failed to transmit packet, dropping: -12 [ 55.832169] ath10k_sdio mmc1:0001:1: failed to submit frame: -12 [ 55.838529] ath10k_sdio mmc1:0001:1: failed to push frame: -12 [ 55.905863] ath10k_sdio mmc1:0001:1: failed to transmit packet, dropping: -12 [ 55.913650] ath10k_sdio mmc1:0001:1: failed to submit frame: -12 [ 55.919887] ath10k_sdio mmc1:0001:1: failed to push frame: -12
, leading to an ssh connection failure.
One user inspected the size of frames on Wireshark and reported the followig:
"I was able to narrow the issue down to the mtu. If I set the mtu for the wlan0 device to 1486 instead of 1500, the issue does not happen.
The size of frames that I see on Wireshark is exactly 1500 after setting it to 1486."
Clearing the HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE avoids the problem and the ssh command works successfully after that.
Introduce a 'credit_size_workaround' field to ath10k_hw_params for the QCA9377 SDIO, so that the HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE is not set in this case.
Tested with QCA9377 SDIO with firmware WLAN.TF.1.1.1-00061-QCATFSWPZ-1.
--- drivers/net/wireless/ath/ath10k/core.c | 19 ++++++++++++++++++- drivers/net/wireless/ath/ath10k/hw.h | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +18 -1
@@ -89,6 +89,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = true, .dynamic_sar_support = false, },
@@ -124,6 +125,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = true, .dynamic_sar_support = false, },
@@ -160,6 +162,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -190,6 +193,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .num_wds_entries = 0x20, .uart_pin_workaround = true, .tx_stats_over_pktlog = false, + .credit_size_workaround = false, .bmi_large_size_download = true, .supports_peer_stats_info = true, .dynamic_sar_support = true,
@@ -226,6 +230,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -261,6 +266,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -296,6 +302,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -334,6 +341,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = true, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .supports_peer_stats_info = true, .dynamic_sar_support = true,
@@ -376,6 +384,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -424,6 +433,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -469,6 +479,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -504,6 +515,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -541,6 +553,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = true, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -570,6 +583,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .ast_skid_limit = 0x10, .num_wds_entries = 0x20, .uart_pin_workaround = true, + .credit_size_workaround = true, .dynamic_sar_support = false, }, {
@@ -611,6 +625,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = false, .hw_filter_reset_required = true, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = false, },
@@ -639,6 +654,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rri_on_ddr = true, .hw_filter_reset_required = false, .fw_diag_ce_download = false, + .credit_size_workaround = false, .tx_stats_over_pktlog = false, .dynamic_sar_support = true, },
@@ -714,6 +730,7 @@ static void ath10k_send_suspend_complete(struct ath10k *ar)static int ath10k_init_sdio (struct ath10k *ar,enum ath10k_firmware_mode mode) { +bool mtu_workaround = ar->hw_params.credit_size_workaround;int ret;u32 param =0 ;
@@ -731,7 +748,7 @@ static int ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode) param |=HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET ; -if (mode ==ATH10K_FIRMWARE_MODE_NORMAL ) +if (mode ==ATH10K_FIRMWARE_MODE_NORMAL && !mtu_workaround) param |=HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE ;else param &= ~HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE ;
drivers/net/wireless/ath/ath10k/hw.h +3 -0
@@ -618,6 +618,9 @@ struct ath10k_hw_params {*/ bool uart_pin_workaround; +/* Workaround for the credit size calculation */ +bool credit_size_workaround; +/* tx stats support over pktlog */ bool tx_stats_over_pktlog;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 216/846 Bluetooth: refactor set_exp_feature with a feature table
In reply to Greg Kroah-HartmanFrom: Joseph Hwang <[email protected]>
[ Upstream commit 93fb70bc112e922def6e50b37e20ccfce0c67c0a ]
This patch refactors the set_exp_feature with a feature table consisting of UUIDs and the corresponding callback functions. In this way, a new experimental feature setting function can be simply added with its UUID and callback function.
--- net/bluetooth/mgmt.c | 248 +++++++++++++++++++++++++------------------ 1 file changed, 142 insertions(+), 106 deletions(-)
net/bluetooth/mgmt.c +142 -106
@@ -3806,7 +3806,7 @@ static const u8 rpa_resolution_uuid[16] = {static int read_exp_features_info (struct sock *sk,struct hci_dev *hdev,void *data,u16 data_len) { -char buf[62 ];/* Enough space for 3 features */ +char buf[62 ];/* Enough space for 3 features */ struct mgmt_rp_read_exp_features_info *rp = (void *)buf;u16 idx =0 ;u32 flags;
@@ -3892,150 +3892,186 @@ static int exp_debug_feature_changed(bool enabled, struct sock *skip) }#endif -static int set_exp_feature (struct sock *sk,struct hci_dev *hdev, -void *data,u16 data_len) +#define EXP_FEAT (_uuid, _set_func) \ +{ \ + .uuid = _uuid, \ + .set_func = _set_func, \ +} + +/* The zero key uuid is special. Multiple exp features are set through it. */ +static int set_zero_key_func (struct sock *sk,struct hci_dev *hdev, +struct mgmt_cp_set_exp_feature *cp,u16 data_len) { -struct mgmt_cp_set_exp_feature *cp = data;struct mgmt_rp_set_exp_feature rp; -bt_dev_dbg (hdev,"sock %p" , sk); - -if (!memcmp (cp->uuid,ZERO_KEY ,16 )) { -memset (rp.uuid,0 ,16 ); - rp.flags =cpu_to_le32 (0 ); +memset (rp.uuid,0 ,16 ); + rp.flags =cpu_to_le32 (0 );#ifdef CONFIG_BT_FEATURE_DEBUG -if (!hdev) { -bool changed =bt_dbg_get (); +if (!hdev) { +bool changed =bt_dbg_get (); -bt_dbg_set (false); +bt_dbg_set (false); -if (changed) -exp_debug_feature_changed (false, sk); - } +if (changed) +exp_debug_feature_changed (false, sk); + }#endif -if (hdev &&use_ll_privacy (hdev) && !hdev_is_powered (hdev)) { -bool changed =hci_dev_test_flag (hdev, -HCI_ENABLE_LL_PRIVACY ); +if (hdev &&use_ll_privacy (hdev) && !hdev_is_powered (hdev)) { +bool changed =hci_dev_test_flag (hdev,HCI_ENABLE_LL_PRIVACY ); -hci_dev_clear_flag (hdev,HCI_ENABLE_LL_PRIVACY ); +hci_dev_clear_flag (hdev,HCI_ENABLE_LL_PRIVACY ); -if (changed) -exp_ll_privacy_feature_changed (false, hdev, sk); - } +if (changed) +exp_ll_privacy_feature_changed (false, hdev, sk); + } -hci_sock_set_flag (sk,HCI_MGMT_EXP_FEATURE_EVENTS ); +hci_sock_set_flag (sk,HCI_MGMT_EXP_FEATURE_EVENTS ); -return mgmt_cmd_complete (sk, hdev ? hdev->id :MGMT_INDEX_NONE , -MGMT_OP_SET_EXP_FEATURE ,0 , - &rp,sizeof (rp)); - } +return mgmt_cmd_complete (sk, hdev ? hdev->id :MGMT_INDEX_NONE , +MGMT_OP_SET_EXP_FEATURE ,0 , + &rp,sizeof (rp)); +}#ifdef CONFIG_BT_FEATURE_DEBUG -if (!memcmp (cp->uuid, debug_uuid,16 )) { -bool val, changed; -int err; +static int set_debug_func (struct sock *sk,struct hci_dev *hdev, +struct mgmt_cp_set_exp_feature *cp,u16 data_len) +{ +struct mgmt_rp_set_exp_feature rp; -/* Command requires to use the non-controller index */ -if (hdev) -return mgmt_cmd_status (sk, hdev->id, -MGMT_OP_SET_EXP_FEATURE , -MGMT_STATUS_INVALID_INDEX ); +bool val, changed; +int err; -/* Parameters are limited to a single octet */ -if (data_len !=MGMT_SET_EXP_FEATURE_SIZE +1 ) -return mgmt_cmd_status (sk,MGMT_INDEX_NONE , -MGMT_OP_SET_EXP_FEATURE , -MGMT_STATUS_INVALID_PARAMS ); +/* Command requires to use the non-controller index */ +if (hdev) +return mgmt_cmd_status (sk, hdev->id, +MGMT_OP_SET_EXP_FEATURE , +MGMT_STATUS_INVALID_INDEX ); -/* Only boolean on/off is supported */ -if (cp->param[0 ] !=0x00 && cp->param[0 ] !=0x01 ) -return mgmt_cmd_status (sk,MGMT_INDEX_NONE , -MGMT_OP_SET_EXP_FEATURE , -MGMT_STATUS_INVALID_PARAMS ); +/* Parameters are limited to a single octet */ +if (data_len !=MGMT_SET_EXP_FEATURE_SIZE +1 ) +return mgmt_cmd_status (sk,MGMT_INDEX_NONE , +MGMT_OP_SET_EXP_FEATURE , +MGMT_STATUS_INVALID_PARAMS ); - val = !!cp->param[0 ]; - changed = val ? !bt_dbg_get () :bt_dbg_get (); -bt_dbg_set (val); +/* Only boolean on/off is supported */ +if (cp->param[0 ] !=0x00 && cp->param[0 ] !=0x01 ) +return mgmt_cmd_status (sk,MGMT_INDEX_NONE , +MGMT_OP_SET_EXP_FEATURE , +MGMT_STATUS_INVALID_PARAMS ); -memcpy (rp.uuid, debug_uuid,16 ); - rp.flags =cpu_to_le32 (val ?BIT (0 ) :0 ); + val = !!cp->param[0 ]; + changed = val ? !bt_dbg_get () :bt_dbg_get (); +bt_dbg_set (val); -hci_sock_set_flag (sk,HCI_MGMT_EXP_FEATURE_EVENTS ); +memcpy (rp.uuid, debug_uuid,16 ); + rp.flags =cpu_to_le32 (val ?BIT (0 ) :0 ); - err =mgmt_cmd_complete (sk,MGMT_INDEX_NONE , -MGMT_OP_SET_EXP_FEATURE ,0 , - &rp,sizeof (rp)); +hci_sock_set_flag (sk,HCI_MGMT_EXP_FEATURE_EVENTS ); -if (changed) -exp_debug_feature_changed (val, sk); + err =mgmt_cmd_complete (sk,MGMT_INDEX_NONE , +MGMT_OP_SET_EXP_FEATURE ,0 , + &rp,sizeof (rp)); -return err; - } +if (changed) +exp_debug_feature_changed (val, sk); + +return err; +}#endif -if (!memcmp (cp->uuid, rpa_resolution_uuid,16 )) { -bool val, changed; -int err; -u32 flags; +static int set_rpa_resolution_func (struct sock *sk,struct hci_dev *hdev, +struct mgmt_cp_set_exp_feature *cp, +u16 data_len) +{ +struct mgmt_rp_set_exp_feature rp; +bool val, changed; +int err; +u32 flags; + +/* Command requires to use the controller index */ +if (!hdev) +return mgmt_cmd_status (sk,MGMT_INDEX_NONE , +MGMT_OP_SET_EXP_FEATURE , +MGMT_STATUS_INVALID_INDEX ); -/* Command requires to use the controller index */ -if (!hdev) -return mgmt_cmd_status (sk,MGMT_INDEX_NONE , -MGMT_OP_SET_EXP_FEATURE , -MGMT_STATUS_INVALID_INDEX ); +/* Changes can only be made when controller is powered down */ +if (hdev_is_powered (hdev)) +return mgmt_cmd_status (sk, hdev->id, +MGMT_OP_SET_EXP_FEATURE , +MGMT_STATUS_REJECTED ); -/* Changes can only be made when controller is powered down */ -if (hdev_is_powered (hdev)) -return mgmt_cmd_status (sk, hdev->id, -MGMT_OP_SET_EXP_FEATURE , -MGMT_STATUS_REJECTED ); +/* Parameters are limited to a single octet */ +if (data_len !=MGMT_SET_EXP_FEATURE_SIZE +1 ) +return mgmt_cmd_status (sk, hdev->id, +MGMT_OP_SET_EXP_FEATURE , +MGMT_STATUS_INVALID_PARAMS ); -/* Parameters are limited to a single octet */ -if (data_len !=MGMT_SET_EXP_FEATURE_SIZE +1 ) -return mgmt_cmd_status (sk, hdev->id, -MGMT_OP_SET_EXP_FEATURE , -MGMT_STATUS_INVALID_PARAMS ); +/* Only boolean on/off is supported */ +if (cp->param[0 ] !=0x00 && cp->param[0 ] !=0x01 ) +return mgmt_cmd_status (sk, hdev->id, +MGMT_OP_SET_EXP_FEATURE , +MGMT_STATUS_INVALID_PARAMS ); -/* Only boolean on/off is supported */ -if (cp->param[0 ] !=0x00 && cp->param[0 ] !=0x01 ) -return mgmt_cmd_status (sk, hdev->id, -MGMT_OP_SET_EXP_FEATURE , -MGMT_STATUS_INVALID_PARAMS ); + val = !!cp->param[0 ]; - val = !!cp->param[0 ]; +if (val) { + changed = !hci_dev_test_flag (hdev,HCI_ENABLE_LL_PRIVACY ); +hci_dev_set_flag (hdev,HCI_ENABLE_LL_PRIVACY ); +hci_dev_clear_flag (hdev,HCI_ADVERTISING ); -if (val) { - changed = !hci_dev_test_flag (hdev, -HCI_ENABLE_LL_PRIVACY ); -hci_dev_set_flag (hdev,HCI_ENABLE_LL_PRIVACY ); -hci_dev_clear_flag (hdev,HCI_ADVERTISING ); +/* Enable LL privacy + supported settings changed */ + flags =BIT (0 ) |BIT (1 ); + }else { + changed =hci_dev_test_flag (hdev,HCI_ENABLE_LL_PRIVACY ); +hci_dev_clear_flag (hdev,HCI_ENABLE_LL_PRIVACY ); -/* Enable LL privacy + supported settings changed */ - flags =BIT (0 ) |BIT (1 ); - }else { - changed =hci_dev_test_flag (hdev, -HCI_ENABLE_LL_PRIVACY ); -hci_dev_clear_flag (hdev,HCI_ENABLE_LL_PRIVACY ); +/* Disable LL privacy + supported settings changed */ + flags =BIT (1 ); + } -/* Disable LL privacy + supported settings changed */ - flags =BIT (1 ); - } +memcpy (rp.uuid, rpa_resolution_uuid,16 ); + rp.flags =cpu_to_le32 (flags); -memcpy (rp.uuid, rpa_resolution_uuid,16 ); - rp.flags =cpu_to_le32 (flags); +hci_sock_set_flag (sk,HCI_MGMT_EXP_FEATURE_EVENTS ); -hci_sock_set_flag (sk,HCI_MGMT_EXP_FEATURE_EVENTS ); + err =mgmt_cmd_complete (sk, hdev->id, +MGMT_OP_SET_EXP_FEATURE ,0 , + &rp,sizeof (rp)); - err =mgmt_cmd_complete (sk, hdev->id, -MGMT_OP_SET_EXP_FEATURE ,0 , - &rp,sizeof (rp)); +if (changed) +exp_ll_privacy_feature_changed (val, hdev, sk); -if (changed) -exp_ll_privacy_feature_changed (val, hdev, sk); +return err; +} -return err; +static const struct mgmt_exp_feature { +const u8 *uuid; +int (*set_func)(struct sock *sk,struct hci_dev *hdev, +struct mgmt_cp_set_exp_feature *cp,u16 data_len); +} exp_features[] = { +EXP_FEAT (ZERO_KEY , set_zero_key_func), +#ifdef CONFIG_BT_FEATURE_DEBUG +EXP_FEAT (debug_uuid, set_debug_func), +#endif +EXP_FEAT (rpa_resolution_uuid, set_rpa_resolution_func), + +/* end with a null feature */ +EXP_FEAT (NULL ,NULL ) +}; + +static int set_exp_feature (struct sock *sk,struct hci_dev *hdev, +void *data,u16 data_len) +{ +struct mgmt_cp_set_exp_feature *cp = data; +size_t i =0 ; + +bt_dev_dbg (hdev,"sock %p" , sk); + +for (i =0 ; exp_features[i].uuid; i++) { +if (!memcmp (cp->uuid, exp_features[i].uuid,16 )) +return exp_features[i].set_func (sk, hdev, cp, data_len); } return mgmt_cmd_status(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 217/846 Bluetooth: MGMT: Use hci_dev_test_and_{set,clear}_flag
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 6f59f991b4e735323f099ac6490e725ae8c750a5 ]
This make use of hci_dev_test_and_{set,clear}_flag instead of doing 2 operations in a row.
--- net/bluetooth/mgmt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/bluetooth/mgmt.c +7 -7
@@ -3919,10 +3919,10 @@ static int set_zero_key_func(struct sock *sk, struct hci_dev *hdev,#endif if (hdev &&use_ll_privacy (hdev) && !hdev_is_powered (hdev)) { -bool changed =hci_dev_test_flag (hdev,HCI_ENABLE_LL_PRIVACY ); - -hci_dev_clear_flag (hdev,HCI_ENABLE_LL_PRIVACY ); +bool changed; + changed =hci_dev_test_and_clear_flag (hdev, +HCI_ENABLE_LL_PRIVACY );if (changed)exp_ll_privacy_feature_changed (false, hdev, sk); }
@@ -4017,15 +4017,15 @@ static int set_rpa_resolution_func(struct sock *sk, struct hci_dev *hdev, val = !!cp->param[0 ];if (val) { - changed = !hci_dev_test_flag (hdev,HCI_ENABLE_LL_PRIVACY ); -hci_dev_set_flag (hdev,HCI_ENABLE_LL_PRIVACY ); + changed = !hci_dev_test_and_set_flag (hdev, +HCI_ENABLE_LL_PRIVACY );hci_dev_clear_flag (hdev,HCI_ADVERTISING );/* Enable LL privacy + supported settings changed */ flags =BIT (0 ) |BIT (1 ); }else { - changed =hci_dev_test_flag (hdev,HCI_ENABLE_LL_PRIVACY ); -hci_dev_clear_flag (hdev,HCI_ENABLE_LL_PRIVACY ); + changed =hci_dev_test_and_clear_flag (hdev, +HCI_ENABLE_LL_PRIVACY );/* Disable LL privacy + supported settings changed */ flags =BIT (1 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 218/846 Bluetooth: btusb: Handle download_firmware failure cases
In reply to Greg Kroah-HartmanFrom: Mark Chen <[email protected]>
[ Upstream commit 00c0ee9850b7b0cb7c40b8daba806ae2245e59d4 ]
For Mediatek chipset, it can not enabled if there are something wrong in btmtk_setup_firmware_79xx(). Thus, the process must be terminated and returned error code.
--- drivers/bluetooth/btusb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/bluetooth/btusb.c +4 -0
@@ -2856,6 +2856,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev)"mediatek/BT_RAM_CODE_MT%04x_1_%x_hdr.bin" , dev_id & 0xffff, (fw_version & 0xff) + 1); err =btusb_mtk_setup_firmware_79xx (hdev, fw_bin_name); +if (err <0 ) { +bt_dev_err (hdev,"Failed to set up firmware (%d)" , err); +return err; + }/* It's Device EndPoint Reset Option Register */ btusb_mtk_uhw_reg_write (data,MTK_EP_RST_OPT ,MTK_EP_RST_IN_OUT_OPT );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 219/846 drm/amd/display: Fix bug in debugfs crc_win_update entry
In reply to Greg Kroah-HartmanFrom: Wayne Lin <[email protected]>
[ Upstream commit 4bef85d4c9491415b7931407b07f24841c1e0390 ]
[Why]crc_rd_wrk shouldn't be null in crc_win_update_set(). Current programming logic is inconsistent in crc_win_update_set().
[How]
Initially, return if crc_rd_wrk is NULL. Later on, we can use member of crc_rd_wrk safely.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +4 -1
@@ -2908,10 +2908,13 @@ static int crc_win_update_set(void *data, u64 val)struct amdgpu_device *adev =drm_to_adev (new_crtc->dev);struct crc_rd_work *crc_rd_wrk = adev->dm.crc_rd_wrk; +if (!crc_rd_wrk) +return 0 ; +if (val) {spin_lock_irq (&adev_to_drm (adev)->event_lock);spin_lock_irq (&crc_rd_wrk->crc_rd_work_lock); -if (crc_rd_wrk && crc_rd_wrk->crtc) { +if (crc_rd_wrk->crtc) { old_crtc = crc_rd_wrk->crtc; old_acrtc =to_amdgpu_crtc (old_crtc); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 220/846 drm/amd/display: Fix out of bounds access on DNC31 stream encoder regs
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit d374d3b493215d637b9e7be12a93f22caf4c1f97 ]
[Why]
During dcn31_stream_encoder_create, if PHYC/D get remapped to F/G on B0 then we'll index 5 or 6 into a array of length 5 - leading to an access violation on some configs during device creation.
[How]
Software won't be touching PHYF/PHYG directly, so just extend the array to cover all possible engine IDs.
Even if it does by try to access one of these registers by accident the offset will be 0 and we'll get a warning during the access.
--- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +2 -1
@@ -470,7 +470,8 @@ static const struct dcn30_afmt_mask afmt_mask = { SE_DCN3_REG_LIST(id)\ } -static const struct dcn10_stream_enc_registers stream_enc_regs[] = { +/* Some encoders won't be initialized here - but they're logical, not physical. */ +static const struct dcn10_stream_enc_registers stream_enc_regs[ENGINE_ID_COUNT ] = {stream_enc_regs (0 ),stream_enc_regs (1 ),stream_enc_regs (2 ),
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 221/846 drm/msm/gpu: Dont allow zero fence_id
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit ca3ffcbeb0c866d9b0cb38eaa2bd4416597b5966 ]
Elsewhere we treat zero as "no fence" and __msm_gem_submit_destroy() skips removal from fence_idr. We could alternately change this to use negative values for "no fence" but I think it is more clear to not allow zero as a valid fence_id.
--- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem_submit.c +1 -1
@@ -887,7 +887,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,* to the underlying fence. */ submit->fence_id =idr_alloc_cyclic (&queue->fence_idr, - submit->user_fence,0 ,INT_MAX ,GFP_KERNEL ); + submit->user_fence,1 ,INT_MAX ,GFP_KERNEL );if (submit->fence_id <0 ) { ret = submit->fence_id =0 ; submit->fence_id =0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 222/846 drm/msm/dp: displayPort driver need algorithm rational
In reply to Greg Kroah-HartmanFrom: Jackie Liu <[email protected]>
[ Upstream commit 53d22794711ad630f40d59dd726bd260d77d585f ]
Let's select RATIONAL with dp driver. avoid like:
[...]
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dp/dp_catalog.o: in function `dp_catalog_ctrl_config_msa':
dp_catalog.c:(.text+0x57e): undefined reference to `rational_best_approximation'
--- drivers/gpu/drm/msm/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/Kconfig +1 -0
@@ -63,6 +63,7 @@ config DRM_MSM_HDMI_HDCP config DRM_MSM_DP bool "Enable DisplayPort support in MSM DRM driver" depends on DRM_MSM + select RATIONAL default y help Compile in support for DP driver in MSM DRM driver. DP external
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 223/846 rcu/exp: Mark current CPU as exp-QS in IPI loop second pass
In reply to Greg Kroah-HartmanFrom: Frederic Weisbecker <[email protected]>
[ Upstream commit 81f6d49cce2d2fe507e3fddcc4a6db021d9c2e7b ]
Expedited RCU grace periods invoke sync_rcu_exp_select_node_cpus(), which takes two passes over the leaf rcu_node structure's CPUs. The first pass gathers up the current CPU and CPUs that are in dynticks idle mode. The workqueue will report a quiescent state on their behalf later. The second pass sends IPIs to the rest of the CPUs, but excludes the current CPU, incorrectly assuming it has been included in the first pass's list of CPUs.
Unfortunately the current CPU may have changed between the first and second pass, due to the fact that the various rcu_node structures' ->lock fields have been dropped, thus momentarily enabling preemption. This means that if the second pass's CPU was not on the first pass's list, it will be ignored completely. There will be no IPI sent to it, and there will be no reporting of quiescent states on its behalf. Unfortunately, the expedited grace period will nevertheless be waiting for that CPU to report a quiescent state, but with that CPU having no reason to believe that such a report is needed.
The result will be an expedited grace period stall.
Fix this by no longer excluding the current CPU from consideration during the second pass.
--- kernel/rcu/tree_exp.h | 1 + 1 file changed, 1 insertion(+)
kernel/rcu/tree_exp.h +1 -0
@@ -387,6 +387,7 @@ retry_ipi:continue ; }if (get_cpu () == cpu) { + mask_ofl_test |= mask;put_cpu ();continue ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 224/846 wcn36xx: Fix max channels retrieval
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
[ Upstream commit 09cab4308bf9b8076ee4a3c56015daf9ef9cb23e ]
Kernel test robot reported:drivers/net/wireless/ath/wcn36xx/smd.c:943:33:
sparse: sparse: cast truncates bits from constant value (780 becomes 80)
The 'channels' field is not a simple u8 array but an array of channel_params. Using sizeof for retrieving the max number of channels is then wrong.
In practice, it was not an issue, because the sizeof returned value is 780, which is truncated in min_t (u8) to 80, which is the value we expect...
Fix that properly using ARRAY_SIZE instead of sizeof.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/wcn36xx/smd.c +1 -1
@@ -943,7 +943,7 @@ int wcn36xx_smd_update_channel_list(struct wcn36xx *wcn, struct cfg80211_scan_reINIT_HAL_MSG ((*msg_body),WCN36XX_HAL_UPDATE_CHANNEL_LIST_REQ ); - msg_body->num_channel =min_t (u8, req->n_channels,sizeof (msg_body->channels)); + msg_body->num_channel =min_t (u8, req->n_channels,ARRAY_SIZE (msg_body->channels));for (i =0 ; i < msg_body->num_channel; i++) {struct wcn36xx_hal_channel_param *param = &msg_body->channels[i];u32 min_power =WCN36XX_HAL_DEFAULT_MIN_POWER ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 225/846 drm/msm/dsi: fix initialization in the bonded DSI case
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 92cb1bedde9dba78d802fe2510949743a2581aed ]
Commit 739b4e7756d3 ("drm/msm/dsi: Fix an error code in msm_dsi_modeset_init()") changed msm_dsi_modeset_init() to return an error code in case msm_dsi_manager_validate_current_config() returns false. However this is not an error case, but a slave DSI of the bonded DSI link. In this case msm_dsi_modeset_init() should return 0, but just skip connector and bridge initialization.
To reduce possible confusion, drop the msm_dsi_manager_validate_current_config() function, and specif 'bonded && !master' condition directly in the msm_dsi_modeset_init().
--- drivers/gpu/drm/msm/dsi/dsi.c | 10 +++++++--- drivers/gpu/drm/msm/dsi/dsi.h | 1 - drivers/gpu/drm/msm/dsi/dsi_manager.c | 17 ----------------- 3 files changed, 7 insertions(+), 21 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.c +7 -3
@@ -215,9 +215,13 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, goto fail; } -if (!msm_dsi_manager_validate_current_config (msm_dsi->id)) { - ret = -EINVAL ; - goto fail; +if (msm_dsi_is_bonded_dsi (msm_dsi) && + !msm_dsi_is_master_dsi (msm_dsi)) { +/* +* Do not return an eror here, +* Just skip creating encoder/connector for the slave-DSI. +*/ +return 0 ; } msm_dsi->encoder = encoder;
drivers/gpu/drm/msm/dsi/dsi.h +0 -1
@@ -82,7 +82,6 @@ int msm_dsi_manager_cmd_xfer(int id, const struct mipi_dsi_msg *msg);bool msm_dsi_manager_cmd_xfer_trigger (int id,u32 dma_base,u32 len);int msm_dsi_manager_register (struct msm_dsi *msm_dsi);void msm_dsi_manager_unregister (struct msm_dsi *msm_dsi); -bool msm_dsi_manager_validate_current_config (u8 id);void msm_dsi_manager_tpg_enable (void );/* msm dsi */
drivers/gpu/drm/msm/dsi/dsi_manager.c +0 -17
@@ -647,23 +647,6 @@ fail:return ERR_PTR (ret); } -bool msm_dsi_manager_validate_current_config (u8 id) -{ -bool is_bonded_dsi =IS_BONDED_DSI (); - -/* -* For bonded DSI, we only have one drm panel. For this -* use case, we register only one bridge/connector. -* Skip bridge/connector initialisation if it is -* slave-DSI for bonded DSI configuration. -*/ -if (is_bonded_dsi && !IS_MASTER_DSI_LINK (id)) { -DBG ("Skip bridge registration for slave DSI->id: %d\n" , id); -return false; - } -return true; -} -/* initialize bridge */ struct drm_bridge *msm_dsi_manager_bridge_init (u8 id) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 226/846 mwifiex: Fix possible ABBA deadlock
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
[ Upstream commit 1b8bb8919ef81bfc8873d223b9361f1685f2106d ]
Quoting Jia-Ju Bai <[email protected]>:
mwifiex_dequeue_tx_packet()
spin_lock_bh(&priv->wmm.ra_list_spinlock); --> Line 1432 (Lock A)
mwifiex_send_addba()
spin_lock_bh(&priv->sta_list_spinlock); --> Line 608 (Lock B) mwifiex_process_sta_tx_pause()
spin_lock_bh(&priv->sta_list_spinlock); --> Line 398 (Lock B)
mwifiex_update_ralist_tx_pause()
spin_lock_bh(&priv->wmm.ra_list_spinlock); --> Line 941 (Lock A)Similar report for mwifiex_process_uap_tx_pause().
While the locking expectations in this driver are a bit unclear, the Fixed commit only intended to protect the sta_ptr, so we can drop the lock as soon as we're done with it.
IIUC, this deadlock cannot actually happen, because command event processing (which calls mwifiex_process_sta_tx_pause()) is sequentialized with TX packet processing (e.g., mwifiex_dequeue_tx_packet()) via the main loop (mwifiex_main_process()). But it's good not to leave this potential issue lurking.
--- drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/marvell/mwifiex/sta_event.c +6 -2
@@ -365,10 +365,12 @@ static void mwifiex_process_uap_tx_pause(struct mwifiex_private *priv, sta_ptr =mwifiex_get_sta_entry (priv, tp->peermac);if (sta_ptr && sta_ptr->tx_pause != tp->tx_pause) { sta_ptr->tx_pause = tp->tx_pause; +spin_unlock_bh (&priv->sta_list_spinlock);mwifiex_update_ralist_tx_pause (priv, tp->peermac, tp->tx_pause); + }else { +spin_unlock_bh (&priv->sta_list_spinlock); } -spin_unlock_bh (&priv->sta_list_spinlock); } }
@@ -400,11 +402,13 @@ static void mwifiex_process_sta_tx_pause(struct mwifiex_private *priv, sta_ptr =mwifiex_get_sta_entry (priv, tp->peermac);if (sta_ptr && sta_ptr->tx_pause != tp->tx_pause) { sta_ptr->tx_pause = tp->tx_pause; +spin_unlock_bh (&priv->sta_list_spinlock);mwifiex_update_ralist_tx_pause (priv, tp->peermac, tp->tx_pause); + }else { +spin_unlock_bh (&priv->sta_list_spinlock); } -spin_unlock_bh (&priv->sta_list_spinlock); } } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 227/846 xfrm: fix a small bug in xfrm_sa_len()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 7770a39d7c63faec6c4f33666d49a8cb664d0482 ]
copy_user_offload() will actually push a struct struct xfrm_user_offload, which is different than (struct xfrm_state *)->xso
(struct xfrm_state_offload)
--- net/xfrm/xfrm_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_user.c +1 -1
@@ -3058,7 +3058,7 @@ static inline unsigned int xfrm_sa_len(struct xfrm_state *x)if (x->props.extra_flags) l +=nla_total_size (sizeof (x->props.extra_flags));if (x->xso.dev) - l +=nla_total_size (sizeof (x->xso)); + l +=nla_total_size (sizeof (struct xfrm_user_offload ));if (x->props.smark.v | x->props.smark.m) { l +=nla_total_size (sizeof (x->props.smark.v)); l +=nla_total_size (sizeof (x->props.smark.m));
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 228/846 x86/uaccess: Move variable into switch case statement
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 61646ca83d3889696f2772edaff122dd96a2935e ]
When building with automatic stack variable initialization, GCC 12 complains about variables defined outside of switch case statements. Move the variable into the case that uses it, which silences the warning:
./arch/x86/include/asm/uaccess.h:317:23: warning: statement will never be executed [-Wswitch-unreachable]
317 | unsigned char x_u8__; \
| ^~~~~~
--- arch/x86/include/asm/uaccess.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/include/asm/uaccess.h +3 -2
@@ -314,11 +314,12 @@ do { \ do { \ __chk_user_ptr(ptr); \ switch (size) { \ - unsigned char x_u8__; \ - case 1: \ + case 1: { \ + unsigned char x_u8__; \ __get_user_asm(x_u8__, ptr, "b", "=q", label); \ (x) = x_u8__; \ break; \ + } \ case 2: \ __get_user_asm(x, ptr, "w", "=r", label); \ break; \
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 229/846 selftests: clone3: clone3: add case CLONE3_ARGS_NO_TEST
In reply to Greg Kroah-HartmanFrom: Anders Roxell <[email protected]>
[ Upstream commit a531b0c23c0fc68ad758cc31a74cf612a4dafeb0 ]
Building selftests/clone3 with clang warns about enumeration not handled in switch case:
clone3.c:54:10: warning: enumeration value 'CLONE3_ARGS_NO_TEST' not handled in switch [-Wswitch]
switch (test_mode) {
^Add the missing switch case with a comment.
--- tools/testing/selftests/clone3/clone3.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/testing/selftests/clone3/clone3.c +6 -0
@@ -52,6 +52,12 @@ static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mode) size =sizeof (struct __clone_args );switch (test_mode) { +case CLONE3_ARGS_NO_TEST : +/* +* Uses default 'flags' and 'SIGCHLD' +* assignment. +*/ +break ;case CLONE3_ARGS_ALL_0 : args.flags =0 ; args.exit_signal =0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 230/846 selftests: harness: avoid false negatives if test has no ASSERTs
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 3abedf4646fdc0036fcb8ebbc3b600667167fafe ]
Test can fail either immediately when ASSERT() failed or at the end if one or more EXPECT() was not met. The exact return code is decided based on the number of successful ASSERT()s.
If test has no ASSERT()s, however, the return code will be 0, as if the test did not fail. Start counting ASSERT()s from 1.
--- tools/testing/selftests/kselftest_harness.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kselftest_harness.h +1 -1
@@ -969,7 +969,7 @@ void __run_test(struct __fixture_metadata *f, t->passed =1 ; t->skip =0 ; t->trigger =0 ; - t->step =0 ; + t->step =1 ; t->no_print =0 ;memset (t->results->reason,0 ,sizeof (t->results->reason));
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 231/846 crypto: stm32/cryp - fix CTR counter carry
In reply to Greg Kroah-HartmanFrom: Nicolas Toromanoff <[email protected]>
[ Upstream commit 41c76690b0990efacd15d35cfb4e77318cd80ebb ]
STM32 CRYP hardware doesn't manage CTR counter bigger than max U32, as a workaround, at each block the current IV is saved, if the saved IV lower u32 is 0xFFFFFFFF, the full IV is manually incremented, and set in hardware.
--- drivers/crypto/stm32/stm32-cryp.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/crypto/stm32/stm32-cryp.c +13 -14
@@ -163,7 +163,7 @@ struct stm32_cryp {struct scatter_walk in_walk;struct scatter_walk out_walk; -u32 last_ctr[4 ]; +__be32 last_ctr[4 ];u32 gcm_ctr; };
@@ -1217,27 +1217,26 @@ static void stm32_cryp_check_ctr_counter(struct stm32_cryp *cryp) {u32 cr; -if (unlikely (cryp->last_ctr[3 ] ==0xFFFFFFFF )) { - cryp->last_ctr[3 ] =0 ; - cryp->last_ctr[2 ]++; -if (!cryp->last_ctr[2 ]) { - cryp->last_ctr[1 ]++; -if (!cryp->last_ctr[1 ]) - cryp->last_ctr[0 ]++; - } +if (unlikely (cryp->last_ctr[3 ] ==cpu_to_be32 (0xFFFFFFFF ))) { +/* +* In this case, we need to increment manually the ctr counter, +* as HW doesn't handle the U32 carry. +*/ +crypto_inc ((u8 *)cryp->last_ctr,sizeof (cryp->last_ctr)); cr =stm32_cryp_read (cryp,CRYP_CR );stm32_cryp_write (cryp,CRYP_CR , cr & ~CR_CRYPEN ); -stm32_cryp_hw_write_iv (cryp, (__be32 *)cryp->last_ctr); +stm32_cryp_hw_write_iv (cryp, cryp->last_ctr);stm32_cryp_write (cryp,CRYP_CR , cr); } - cryp->last_ctr[0 ] =stm32_cryp_read (cryp,CRYP_IV0LR ); - cryp->last_ctr[1 ] =stm32_cryp_read (cryp,CRYP_IV0RR ); - cryp->last_ctr[2 ] =stm32_cryp_read (cryp,CRYP_IV1LR ); - cryp->last_ctr[3 ] =stm32_cryp_read (cryp,CRYP_IV1RR ); +/* The IV registers are BE */ + cryp->last_ctr[0 ] =cpu_to_be32 (stm32_cryp_read (cryp,CRYP_IV0LR )); + cryp->last_ctr[1 ] =cpu_to_be32 (stm32_cryp_read (cryp,CRYP_IV0RR )); + cryp->last_ctr[2 ] =cpu_to_be32 (stm32_cryp_read (cryp,CRYP_IV1LR )); + cryp->last_ctr[3 ] =cpu_to_be32 (stm32_cryp_read (cryp,CRYP_IV1RR )); }static bool stm32_cryp_irq_read_data (struct stm32_cryp *cryp)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 232/846 crypto: stm32/cryp - fix xts and race condition in crypto_engine requests
In reply to Greg Kroah-HartmanFrom: Nicolas Toromanoff <[email protected]>
[ Upstream commit d703c7a994ee34b7fa89baf21631fca0aa9f17fc ]
Don't erase key:
If key is erased before the crypto_finalize_.*_request() call, some pending process will run with a key={ 0 }.
Moreover if the key is reset at end of request, it breaks xts chaining mode, as for last xts block (in case input len is not a multiple of block) a new AES request is started without calling again set_key().
--- drivers/crypto/stm32/stm32-cryp.c | 2 -- 1 file changed, 2 deletions(-)
drivers/crypto/stm32/stm32-cryp.c +0 -2
@@ -674,8 +674,6 @@ static void stm32_cryp_finish_req(struct stm32_cryp *cryp, int err)else crypto_finalize_skcipher_request (cryp->engine, cryp->req, err); - -memset (cryp->ctx->key,0 , cryp->ctx->keylen); }static int stm32_cryp_cpu_start (struct stm32_cryp *cryp)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 233/846 crypto: stm32/cryp - check early input data
In reply to Greg Kroah-HartmanFrom: Nicolas Toromanoff <[email protected]>
[ Upstream commit 39e6e699c7fb92bdb2617b596ca4a4ea35c5d2a7 ]
Some auto tests failed because driver wasn't returning the expected error with some input size/iv value/tag size.
Now:
Return 0 early for empty buffer. (We don't need to start the engine for an empty input buffer).
Accept any valid authsize for gcm(aes).
Return -EINVAL if iv for ccm(aes) is invalid.
Return -EINVAL if buffer size is a not a multiple of algorithm block size.
--- drivers/crypto/stm32/stm32-cryp.c | 114 +++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-)
drivers/crypto/stm32/stm32-cryp.c +113 -1
@@ -799,7 +799,20 @@ static int stm32_cryp_aes_aead_setkey(struct crypto_aead *tfm, const u8 *key,static int stm32_cryp_aes_gcm_setauthsize (struct crypto_aead *tfm,unsigned int authsize) { -return authsize ==AES_BLOCK_SIZE ?0 : -EINVAL ; +switch (authsize) { +case 4 : +case 8 : +case 12 : +case 13 : +case 14 : +case 15 : +case 16 : +break ; +default : +return -EINVAL ; + } + +return 0 ; } static int stm32_cryp_aes_ccm_setauthsize(struct crypto_aead *tfm,
@@ -823,31 +836,61 @@ static int stm32_cryp_aes_ccm_setauthsize(struct crypto_aead *tfm,static int stm32_cryp_aes_ecb_encrypt (struct skcipher_request *req) { +if (req->cryptlen %AES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_AES |FLG_ECB |FLG_ENCRYPT ); }static int stm32_cryp_aes_ecb_decrypt (struct skcipher_request *req) { +if (req->cryptlen %AES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_AES |FLG_ECB ); }static int stm32_cryp_aes_cbc_encrypt (struct skcipher_request *req) { +if (req->cryptlen %AES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_AES |FLG_CBC |FLG_ENCRYPT ); }static int stm32_cryp_aes_cbc_decrypt (struct skcipher_request *req) { +if (req->cryptlen %AES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_AES |FLG_CBC ); }static int stm32_cryp_aes_ctr_encrypt (struct skcipher_request *req) { +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_AES |FLG_CTR |FLG_ENCRYPT ); }static int stm32_cryp_aes_ctr_decrypt (struct skcipher_request *req) { +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_AES |FLG_CTR ); }
@@ -861,53 +904,122 @@ static int stm32_cryp_aes_gcm_decrypt(struct aead_request *req)return stm32_cryp_aead_crypt (req,FLG_AES |FLG_GCM ); } +static inline int crypto_ccm_check_iv (const u8 *iv) +{ +/* 2 <= L <= 8, so 1 <= L' <= 7. */ +if (iv[0 ] <1 || iv[0 ] >7 ) +return -EINVAL ; + +return 0 ; +} +static int stm32_cryp_aes_ccm_encrypt (struct aead_request *req) { +int err; + + err =crypto_ccm_check_iv (req->iv); +if (err) +return err; +return stm32_cryp_aead_crypt (req,FLG_AES |FLG_CCM |FLG_ENCRYPT ); }static int stm32_cryp_aes_ccm_decrypt (struct aead_request *req) { +int err; + + err =crypto_ccm_check_iv (req->iv); +if (err) +return err; +return stm32_cryp_aead_crypt (req,FLG_AES |FLG_CCM ); }static int stm32_cryp_des_ecb_encrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_DES |FLG_ECB |FLG_ENCRYPT ); }static int stm32_cryp_des_ecb_decrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_DES |FLG_ECB ); }static int stm32_cryp_des_cbc_encrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_DES |FLG_CBC |FLG_ENCRYPT ); }static int stm32_cryp_des_cbc_decrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_DES |FLG_CBC ); }static int stm32_cryp_tdes_ecb_encrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_TDES |FLG_ECB |FLG_ENCRYPT ); }static int stm32_cryp_tdes_ecb_decrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_TDES |FLG_ECB ); }static int stm32_cryp_tdes_cbc_encrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_TDES |FLG_CBC |FLG_ENCRYPT ); }static int stm32_cryp_tdes_cbc_decrypt (struct skcipher_request *req) { +if (req->cryptlen %DES_BLOCK_SIZE ) +return -EINVAL ; + +if (req->cryptlen ==0 ) +return 0 ; +return stm32_cryp_crypt (req,FLG_TDES |FLG_CBC ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 234/846 crypto: stm32/cryp - fix double pm exit
In reply to Greg Kroah-HartmanFrom: Nicolas Toromanoff <[email protected]>
[ Upstream commit 6c12e742785bf9333faf60bfb96575bdd763448e ]
Delete extraneous lines in probe error handling code: pm was disabled twice.
--- drivers/crypto/stm32/stm32-cryp.c | 2 -- 1 file changed, 2 deletions(-)
drivers/crypto/stm32/stm32-cryp.c +0 -2
@@ -2134,8 +2134,6 @@ err_engine1:list_del (&cryp->list);spin_unlock (&cryp_list.lock); -pm_runtime_disable (dev); -pm_runtime_put_noidle (dev);pm_runtime_disable (dev);pm_runtime_put_noidle (dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 235/846 crypto: stm32/cryp - fix lrw chaining mode
In reply to Greg Kroah-HartmanFrom: Nicolas Toromanoff <[email protected]>
[ Upstream commit fa97dc2d48b476ea98199d808d3248d285987e99 ]
This fixes the lrw autotest if lrw uses the CRYP as the AES block cipher provider (as ecb(aes)). At end of request, CRYP should not update the IV in case of ECB chaining mode. Indeed the ECB chaining mode never uses the IV, but the software LRW chaining mode uses the IV field as a counter and due to the (unexpected) update done by CRYP while the AES block process, the counter get a wrong value when the IV overflow.
--- drivers/crypto/stm32/stm32-cryp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/stm32/stm32-cryp.c +1 -1
@@ -644,7 +644,7 @@ static void stm32_cryp_finish_req(struct stm32_cryp *cryp, int err)/* Phase 4 : output tag */ err =stm32_cryp_read_auth_tag (cryp); -if (!err && (!(is_gcm (cryp) ||is_ccm (cryp)))) +if (!err && (!(is_gcm (cryp) ||is_ccm (cryp) ||is_ecb (cryp))))stm32_cryp_get_iv (cryp);if (cryp->sgs_copied) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 236/846 crypto: stm32/cryp - fix bugs and crash in tests
In reply to Greg Kroah-HartmanFrom: Nicolas Toromanoff <[email protected]>
[ Upstream commit 4b898d5cfa4d9a0ad5bc82cb5eafdc092394c6a9 ]
Extra crypto manager auto test were crashing or failling due to 2 reasons:
- block in a dead loop (dues to issues in cipher end process management)
- crash due to read/write unmapped memory (this crash was also reported when using openssl afalg engine)
Rework interrupt management, interrupts are masked as soon as they are no more used: if input buffer is fully consumed, "Input FIFO not full" interrupt is masked and if output buffer is full, "Output FIFO not empty" interrupt is masked.
And crypto request finish when input *and* outpout buffer are fully read/write.
About the crash due to unmapped memory, using scatterwalk_copychunks() that will map and copy each block fix the issue.
Using this api and copying full block will also fix unaligned data access, avoid early copy of in/out buffer, and make useless the extra alignment constraint.
--- drivers/crypto/stm32/stm32-cryp.c | 790 +++++++++--------------------- 1 file changed, 243 insertions(+), 547 deletions(-)
drivers/crypto/stm32/stm32-cryp.c +243 -547
@@ -37,7 +37,6 @@/* Mode mask = bits [15..0] */ #define FLG_MODE_MASK GENMASK(15, 0)/* Bit [31..16] status */ -#define FLG_CCM_PADDED_WA BIT(16)/* Registers */ #define CRYP_CR 0x00000000
@@ -105,8 +104,6 @@/* Misc */ #define AES_BLOCK_32 (AES_BLOCK_SIZE / sizeof(u32))#define GCM_CTR_INIT 2 -#define _walked_in (cryp->in_walk.offset - cryp->in_sg->offset) -#define _walked_out (cryp->out_walk.offset - cryp->out_sg->offset)#define CRYP_AUTOSUSPEND_DELAY 50struct stm32_cryp_caps {
@@ -144,21 +141,11 @@ struct stm32_cryp {size_t authsize;size_t hw_blocksize; -size_t total_in; -size_t total_in_save; -size_t total_out; -size_t total_out_save; +size_t payload_in; +size_t header_in; +size_t payload_out; -struct scatterlist *in_sg;struct scatterlist *out_sg; -struct scatterlist *out_sg_save; - -struct scatterlist in_sgl; -struct scatterlist out_sgl; -bool sgs_copied; - -int in_sg_len; -int out_sg_len;struct scatter_walk in_walk;struct scatter_walk out_walk;
@@ -262,6 +249,7 @@ static inline int stm32_cryp_wait_output(struct stm32_cryp *cryp) }static int stm32_cryp_read_auth_tag (struct stm32_cryp *cryp); +static void stm32_cryp_finish_req (struct stm32_cryp *cryp,int err);static struct stm32_cryp *stm32_cryp_find_dev (struct stm32_cryp_ctx *ctx) {
@@ -283,103 +271,6 @@ static struct stm32_cryp *stm32_cryp_find_dev(struct stm32_cryp_ctx *ctx)return cryp; } -static int stm32_cryp_check_aligned (struct scatterlist *sg,size_t total, -size_t align) -{ -int len =0 ; - -if (!total) -return 0 ; - -if (!IS_ALIGNED (total, align)) -return -EINVAL ; - -while (sg) { -if (!IS_ALIGNED (sg->offset,sizeof (u32))) -return -EINVAL ; - -if (!IS_ALIGNED (sg->length, align)) -return -EINVAL ; - - len += sg->length; - sg =sg_next (sg); - } - -if (len != total) -return -EINVAL ; - -return 0 ; -} - -static int stm32_cryp_check_io_aligned (struct stm32_cryp *cryp) -{ -int ret; - - ret =stm32_cryp_check_aligned (cryp->in_sg, cryp->total_in, - cryp->hw_blocksize); -if (ret) -return ret; - - ret =stm32_cryp_check_aligned (cryp->out_sg, cryp->total_out, - cryp->hw_blocksize); - -return ret; -} - -static void sg_copy_buf (void *buf,struct scatterlist *sg, -unsigned int start,unsigned int nbytes,int out) -{ -struct scatter_walk walk; - -if (!nbytes) -return ; - -scatterwalk_start (&walk, sg); -scatterwalk_advance (&walk, start); -scatterwalk_copychunks (buf, &walk, nbytes, out); -scatterwalk_done (&walk, out,0 ); -} - -static int stm32_cryp_copy_sgs (struct stm32_cryp *cryp) -{ -void *buf_in, *buf_out; -int pages, total_in, total_out; - -if (!stm32_cryp_check_io_aligned (cryp)) { - cryp->sgs_copied =0 ; -return 0 ; - } - - total_in =ALIGN (cryp->total_in, cryp->hw_blocksize); - pages = total_in ?get_order (total_in) :1 ; - buf_in = (void *)__get_free_pages (GFP_ATOMIC , pages); - - total_out =ALIGN (cryp->total_out, cryp->hw_blocksize); - pages = total_out ?get_order (total_out) :1 ; - buf_out = (void *)__get_free_pages (GFP_ATOMIC , pages); - -if (!buf_in || !buf_out) { -dev_err (cryp->dev,"Can't allocate pages when unaligned\n" ); - cryp->sgs_copied =0 ; -return -EFAULT ; - } - -sg_copy_buf (buf_in, cryp->in_sg,0 , cryp->total_in,0 ); - -sg_init_one (&cryp->in_sgl, buf_in, total_in); - cryp->in_sg = &cryp->in_sgl; - cryp->in_sg_len =1 ; - -sg_init_one (&cryp->out_sgl, buf_out, total_out); - cryp->out_sg_save = cryp->out_sg; - cryp->out_sg = &cryp->out_sgl; - cryp->out_sg_len =1 ; - - cryp->sgs_copied =1 ; - -return 0 ; -} -static void stm32_cryp_hw_write_iv (struct stm32_cryp *cryp,__be32 *iv) {if (!iv)
@@ -481,16 +372,99 @@ static int stm32_cryp_gcm_init(struct stm32_cryp *cryp, u32 cfg)/* Wait for end of processing */ ret =stm32_cryp_wait_enable (cryp); -if (ret) +if (ret) {dev_err (cryp->dev,"Timeout (gcm init)\n" ); +return ret; + } -return ret; +/* Prepare next phase */ +if (cryp->areq->assoclen) { + cfg |=CR_PH_HEADER ; +stm32_cryp_write (cryp,CRYP_CR , cfg); + }else if (stm32_cryp_get_input_text_len (cryp)) { + cfg |=CR_PH_PAYLOAD ; +stm32_cryp_write (cryp,CRYP_CR , cfg); + } + +return 0 ; +} + +static void stm32_crypt_gcmccm_end_header (struct stm32_cryp *cryp) +{ +u32 cfg; +int err; + +/* Check if whole header written */ +if (!cryp->header_in) { +/* Wait for completion */ + err =stm32_cryp_wait_busy (cryp); +if (err) { +dev_err (cryp->dev,"Timeout (gcm/ccm header)\n" ); +stm32_cryp_write (cryp,CRYP_IMSCR ,0 ); +stm32_cryp_finish_req (cryp, err); +return ; + } + +if (stm32_cryp_get_input_text_len (cryp)) { +/* Phase 3 : payload */ + cfg =stm32_cryp_read (cryp,CRYP_CR ); + cfg &= ~CR_CRYPEN ; +stm32_cryp_write (cryp,CRYP_CR , cfg); + + cfg &= ~CR_PH_MASK ; + cfg |=CR_PH_PAYLOAD |CR_CRYPEN ; +stm32_cryp_write (cryp,CRYP_CR , cfg); + }else { +/* +* Phase 4 : tag. +* Nothing to read, nothing to write, caller have to +* end request +*/ + } + } +} + +static void stm32_cryp_write_ccm_first_header (struct stm32_cryp *cryp) +{ +unsigned int i; +size_t written; +size_t len; +u32 alen = cryp->areq->assoclen; +u32 block[AES_BLOCK_32 ] = {0 }; +u8 *b8 = (u8 *)block; + +if (alen <=65280 ) { +/* Write first u32 of B1 */ + b8[0 ] = (alen >>8 ) &0xFF ; + b8[1 ] = alen &0xFF ; + len =2 ; + }else { +/* Build the two first u32 of B1 */ + b8[0 ] =0xFF ; + b8[1 ] =0xFE ; + b8[2 ] = (alen &0xFF000000 ) >>24 ; + b8[3 ] = (alen &0x00FF0000 ) >>16 ; + b8[4 ] = (alen &0x0000FF00 ) >>8 ; + b8[5 ] = alen &0x000000FF ; + len =6 ; + } + + written =min_t (size_t,AES_BLOCK_SIZE - len, alen); + +scatterwalk_copychunks ((char *)block + len, &cryp->in_walk, written,0 ); +for (i =0 ; i <AES_BLOCK_32 ; i++) +stm32_cryp_write (cryp,CRYP_DIN , block[i]); + + cryp->header_in -= written; + +stm32_crypt_gcmccm_end_header (cryp); }static int stm32_cryp_ccm_init (struct stm32_cryp *cryp,u32 cfg) {int ret; -u8 iv[AES_BLOCK_SIZE ], b0[AES_BLOCK_SIZE ]; +u32 iv_32[AES_BLOCK_32 ], b0_32[AES_BLOCK_32 ]; +u8 *iv = (u8 *)iv_32, *b0 = (u8 *)b0_32;__be32 *bd;u32 *d;unsigned int i, textlen;
@@ -531,17 +505,30 @@ static int stm32_cryp_ccm_init(struct stm32_cryp *cryp, u32 cfg)/* Wait for end of processing */ ret =stm32_cryp_wait_enable (cryp); -if (ret) +if (ret) {dev_err (cryp->dev,"Timeout (ccm init)\n" ); +return ret; + } -return ret; +/* Prepare next phase */ +if (cryp->areq->assoclen) { + cfg |=CR_PH_HEADER |CR_CRYPEN ; +stm32_cryp_write (cryp,CRYP_CR , cfg); + +/* Write first (special) block (may move to next phase [payload]) */ +stm32_cryp_write_ccm_first_header (cryp); + }else if (stm32_cryp_get_input_text_len (cryp)) { + cfg |=CR_PH_PAYLOAD ; +stm32_cryp_write (cryp,CRYP_CR , cfg); + } + +return 0 ; }static int stm32_cryp_hw_init (struct stm32_cryp *cryp) {int ret;u32 cfg, hw_mode; -pm_runtime_resume_and_get (cryp->dev);/* Disable interrupt */
@@ -605,16 +592,6 @@ static int stm32_cryp_hw_init(struct stm32_cryp *cryp)if (ret)return ret; -/* Phase 2 : header (authenticated data) */ -if (cryp->areq->assoclen) { - cfg |=CR_PH_HEADER ; - }else if (stm32_cryp_get_input_text_len (cryp)) { - cfg |=CR_PH_PAYLOAD ; -stm32_cryp_write (cryp,CRYP_CR , cfg); - }else { - cfg |=CR_PH_INIT ; - } -break ;case CR_DES_CBC :
@@ -633,8 +610,6 @@ static int stm32_cryp_hw_init(struct stm32_cryp *cryp)stm32_cryp_write (cryp,CRYP_CR , cfg); - cryp->flags &= ~FLG_CCM_PADDED_WA ; -return 0 ; }
@@ -647,25 +622,6 @@ static void stm32_cryp_finish_req(struct stm32_cryp *cryp, int err)if (!err && (!(is_gcm (cryp) ||is_ccm (cryp) ||is_ecb (cryp))))stm32_cryp_get_iv (cryp); -if (cryp->sgs_copied) { -void *buf_in, *buf_out; -int pages, len; - - buf_in =sg_virt (&cryp->in_sgl); - buf_out =sg_virt (&cryp->out_sgl); - -sg_copy_buf (buf_out, cryp->out_sg_save,0 , - cryp->total_out_save,1 ); - - len =ALIGN (cryp->total_in_save, cryp->hw_blocksize); - pages = len ?get_order (len) :1 ; -free_pages ((unsigned long )buf_in, pages); - - len =ALIGN (cryp->total_out_save, cryp->hw_blocksize); - pages = len ?get_order (len) :1 ; -free_pages ((unsigned long )buf_out, pages); - } -pm_runtime_mark_last_busy (cryp->dev);pm_runtime_put_autosuspend (cryp->dev);
@@ -1029,6 +985,7 @@ static int stm32_cryp_prepare_req(struct skcipher_request *req,struct stm32_cryp_ctx *ctx;struct stm32_cryp *cryp;struct stm32_cryp_reqctx *rctx; +struct scatterlist *in_sg;int ret;if (!req && !areq)
@@ -1054,76 +1011,55 @@ static int stm32_cryp_prepare_req(struct skcipher_request *req,if (req) { cryp->req = req; cryp->areq =NULL ; - cryp->total_in = req->cryptlen; - cryp->total_out = cryp->total_in; + cryp->header_in =0 ; + cryp->payload_in = req->cryptlen; + cryp->payload_out = req->cryptlen; + cryp->authsize =0 ; }else {/* * Length of input and output data: * Encryption case: -* INPUT = AssocData || PlainText +* INPUT = AssocData || PlainText * <- assoclen -> <- cryptlen -> -* <------- total_in -----------> * -* OUTPUT = AssocData || CipherText || AuthTag -* <- assoclen -> <- cryptlen -> <- authsize -> -* <---------------- total_out -----------------> +* OUTPUT = AssocData || CipherText || AuthTag +* <- assoclen -> <-- cryptlen --> <- authsize -> * * Decryption case: -* INPUT = AssocData || CipherText || AuthTag -* <- assoclen -> <--------- cryptlen ---------> -* <- authsize -> -* <---------------- total_in ------------------> +* INPUT = AssocData || CipherTex || AuthTag +* <- assoclen ---> <---------- cryptlen ----------> * -* OUTPUT = AssocData || PlainText -* <- assoclen -> <- crypten - authsize -> -* <---------- total_out -----------------> +* OUTPUT = AssocData || PlainText +* <- assoclen -> <- cryptlen - authsize -> */ cryp->areq = areq; cryp->req =NULL ; cryp->authsize =crypto_aead_authsize (crypto_aead_reqtfm (areq)); - cryp->total_in = areq->assoclen + areq->cryptlen; -if (is_encrypt (cryp)) -/* Append auth tag to output */ - cryp->total_out = cryp->total_in + cryp->authsize; -else -/* No auth tag in output */ - cryp->total_out = cryp->total_in - cryp->authsize; +if (is_encrypt (cryp)) { + cryp->payload_in = areq->cryptlen; + cryp->header_in = areq->assoclen; + cryp->payload_out = areq->cryptlen; + }else { + cryp->payload_in = areq->cryptlen - cryp->authsize; + cryp->header_in = areq->assoclen; + cryp->payload_out = cryp->payload_in; + } } - cryp->total_in_save = cryp->total_in; - cryp->total_out_save = cryp->total_out; + in_sg = req ? req->src : areq->src; +scatterwalk_start (&cryp->in_walk, in_sg); - cryp->in_sg = req ? req->src : areq->src; cryp->out_sg = req ? req->dst : areq->dst; - cryp->out_sg_save = cryp->out_sg; - - cryp->in_sg_len =sg_nents_for_len (cryp->in_sg, cryp->total_in); -if (cryp->in_sg_len <0 ) { -dev_err (cryp->dev,"Cannot get in_sg_len\n" ); - ret = cryp->in_sg_len; -return ret; - } - - cryp->out_sg_len =sg_nents_for_len (cryp->out_sg, cryp->total_out); -if (cryp->out_sg_len <0 ) { -dev_err (cryp->dev,"Cannot get out_sg_len\n" ); - ret = cryp->out_sg_len; -return ret; - } - - ret =stm32_cryp_copy_sgs (cryp); -if (ret) -return ret; - -scatterwalk_start (&cryp->in_walk, cryp->in_sg);scatterwalk_start (&cryp->out_walk, cryp->out_sg);if (is_gcm (cryp) ||is_ccm (cryp)) {/* In output, jump after assoc data */ -scatterwalk_advance (&cryp->out_walk, cryp->areq->assoclen); - cryp->total_out -= cryp->areq->assoclen; +scatterwalk_copychunks (NULL , &cryp->out_walk, cryp->areq->assoclen,2 ); } +if (is_ctr (cryp)) +memset (cryp->last_ctr,0 ,sizeof (cryp->last_ctr)); + ret =stm32_cryp_hw_init (cryp);return ret; }
@@ -1171,8 +1107,7 @@ static int stm32_cryp_aead_one_req(struct crypto_engine *engine, void *areq)if (!cryp)return -ENODEV ; -if (unlikely (!cryp->areq->assoclen && - !stm32_cryp_get_input_text_len (cryp))) { +if (unlikely (!cryp->payload_in && !cryp->header_in)) {/* No input data to process: get tag and finish */ stm32_cryp_finish_req (cryp,0 );return 0 ;
@@ -1181,43 +1116,10 @@ static int stm32_cryp_aead_one_req(struct crypto_engine *engine, void *areq)return stm32_cryp_cpu_start (cryp); } -static u32 *stm32_cryp_next_out (struct stm32_cryp *cryp,u32 *dst, -unsigned int n) -{ -scatterwalk_advance (&cryp->out_walk, n); - -if (unlikely (cryp->out_sg->length == _walked_out)) { - cryp->out_sg =sg_next (cryp->out_sg); -if (cryp->out_sg) { -scatterwalk_start (&cryp->out_walk, cryp->out_sg); -return (sg_virt (cryp->out_sg) + _walked_out); - } - } - -return (u32 *)((u8 *)dst + n); -} - -static u32 *stm32_cryp_next_in (struct stm32_cryp *cryp,u32 *src, -unsigned int n) -{ -scatterwalk_advance (&cryp->in_walk, n); - -if (unlikely (cryp->in_sg->length == _walked_in)) { - cryp->in_sg =sg_next (cryp->in_sg); -if (cryp->in_sg) { -scatterwalk_start (&cryp->in_walk, cryp->in_sg); -return (sg_virt (cryp->in_sg) + _walked_in); - } - } - -return (u32 *)((u8 *)src + n); -} -static int stm32_cryp_read_auth_tag (struct stm32_cryp *cryp) { -u32 cfg, size_bit, *dst, d32; -u8 *d8; -unsigned int i, j; +u32 cfg, size_bit; +unsigned int i;int ret =0 ;/* Update Config */
@@ -1240,7 +1142,7 @@ static int stm32_cryp_read_auth_tag(struct stm32_cryp *cryp)stm32_cryp_write (cryp,CRYP_DIN , size_bit); size_bit =is_encrypt (cryp) ? cryp->areq->cryptlen : - cryp->areq->cryptlen -AES_BLOCK_SIZE ; + cryp->areq->cryptlen - cryp->authsize; size_bit *=8 ;if (cryp->caps->swap_final) size_bit = (__force u32 )cpu_to_be32 (size_bit);
@@ -1249,11 +1151,9 @@ static int stm32_cryp_read_auth_tag(struct stm32_cryp *cryp)stm32_cryp_write (cryp,CRYP_DIN , size_bit); }else {/* CCM: write CTR0 */ -u8 iv[AES_BLOCK_SIZE ]; -u32 *iv32 = (u32 *)iv; -__be32 *biv; - - biv = (void *)iv; +u32 iv32[AES_BLOCK_32 ]; +u8 *iv = (u8 *)iv32; +__be32 *biv = (__be32 *)iv32;memcpy (iv, cryp->areq->iv,AES_BLOCK_SIZE );memset (iv +AES_BLOCK_SIZE -1 - iv[0 ],0 , iv[0 ] +1 );
@@ -1275,39 +1175,18 @@ static int stm32_cryp_read_auth_tag(struct stm32_cryp *cryp) }if (is_encrypt (cryp)) { +u32 out_tag[AES_BLOCK_32 ]; +/* Get and write tag */ - dst =sg_virt (cryp->out_sg) + _walked_out; +for (i =0 ; i <AES_BLOCK_32 ; i++) + out_tag[i] =stm32_cryp_read (cryp,CRYP_DOUT ); -for (i =0 ; i <AES_BLOCK_32 ; i++) { -if (cryp->total_out >=sizeof (u32)) { -/* Read a full u32 */ - *dst =stm32_cryp_read (cryp,CRYP_DOUT ); - - dst =stm32_cryp_next_out (cryp, dst, -sizeof (u32)); - cryp->total_out -=sizeof (u32); - }else if (!cryp->total_out) { -/* Empty fifo out (data from input padding) */ -stm32_cryp_read (cryp,CRYP_DOUT ); - }else { -/* Read less than an u32 */ - d32 =stm32_cryp_read (cryp,CRYP_DOUT ); - d8 = (u8 *)&d32; - -for (j =0 ; j < cryp->total_out; j++) { - *((u8 *)dst) = *(d8++); - dst =stm32_cryp_next_out (cryp, dst,1 ); - } - cryp->total_out =0 ; - } - } +scatterwalk_copychunks (out_tag, &cryp->out_walk, cryp->authsize,1 ); }else {/* Get and check tag */ u32 in_tag[AES_BLOCK_32 ], out_tag[AES_BLOCK_32 ]; -scatterwalk_map_and_copy (in_tag, cryp->in_sg, - cryp->total_in_save - cryp->authsize, - cryp->authsize,0 ); +scatterwalk_copychunks (in_tag, &cryp->in_walk, cryp->authsize,0 );for (i =0 ; i <AES_BLOCK_32 ; i++) out_tag[i] =stm32_cryp_read (cryp,CRYP_DOUT );
@@ -1349,92 +1228,37 @@ static void stm32_cryp_check_ctr_counter(struct stm32_cryp *cryp) cryp->last_ctr[3 ] =cpu_to_be32 (stm32_cryp_read (cryp,CRYP_IV1RR )); } -static bool stm32_cryp_irq_read_data (struct stm32_cryp *cryp) +static void stm32_cryp_irq_read_data (struct stm32_cryp *cryp) { -unsigned int i, j; -u32 d32, *dst; -u8 *d8; -size_t tag_size; - -/* Do no read tag now (if any) */ -if (is_encrypt (cryp) && (is_gcm (cryp) ||is_ccm (cryp))) - tag_size = cryp->authsize; -else - tag_size =0 ; - - dst =sg_virt (cryp->out_sg) + _walked_out; - -for (i =0 ; i < cryp->hw_blocksize /sizeof (u32); i++) { -if (likely (cryp->total_out - tag_size >=sizeof (u32))) { -/* Read a full u32 */ - *dst =stm32_cryp_read (cryp,CRYP_DOUT ); +unsigned int i; +u32 block[AES_BLOCK_32 ]; - dst =stm32_cryp_next_out (cryp, dst,sizeof (u32)); - cryp->total_out -=sizeof (u32); - }else if (cryp->total_out == tag_size) { -/* Empty fifo out (data from input padding) */ - d32 =stm32_cryp_read (cryp,CRYP_DOUT ); - }else { -/* Read less than an u32 */ - d32 =stm32_cryp_read (cryp,CRYP_DOUT ); - d8 = (u8 *)&d32; - -for (j =0 ; j < cryp->total_out - tag_size; j++) { - *((u8 *)dst) = *(d8++); - dst =stm32_cryp_next_out (cryp, dst,1 ); - } - cryp->total_out = tag_size; - } - } +for (i =0 ; i < cryp->hw_blocksize /sizeof (u32); i++) + block[i] =stm32_cryp_read (cryp,CRYP_DOUT ); -return !(cryp->total_out - tag_size) || !cryp->total_in; +scatterwalk_copychunks (block, &cryp->out_walk,min_t (size_t, cryp->hw_blocksize, + cryp->payload_out),1 ); + cryp->payload_out -=min_t (size_t, cryp->hw_blocksize, + cryp->payload_out); }static void stm32_cryp_irq_write_block (struct stm32_cryp *cryp) { -unsigned int i, j; -u32 *src; -u8 d8[4 ]; -size_t tag_size; - -/* Do no write tag (if any) */ -if (is_decrypt (cryp) && (is_gcm (cryp) ||is_ccm (cryp))) - tag_size = cryp->authsize; -else - tag_size =0 ; - - src =sg_virt (cryp->in_sg) + _walked_in; +unsigned int i; +u32 block[AES_BLOCK_32 ] = {0 }; -for (i =0 ; i < cryp->hw_blocksize /sizeof (u32); i++) { -if (likely (cryp->total_in - tag_size >=sizeof (u32))) { -/* Write a full u32 */ -stm32_cryp_write (cryp,CRYP_DIN , *src); +scatterwalk_copychunks (block, &cryp->in_walk,min_t (size_t, cryp->hw_blocksize, + cryp->payload_in),0 ); +for (i =0 ; i < cryp->hw_blocksize /sizeof (u32); i++) +stm32_cryp_write (cryp,CRYP_DIN , block[i]); - src =stm32_cryp_next_in (cryp, src,sizeof (u32)); - cryp->total_in -=sizeof (u32); - }else if (cryp->total_in == tag_size) { -/* Write padding data */ -stm32_cryp_write (cryp,CRYP_DIN ,0 ); - }else { -/* Write less than an u32 */ -memset (d8,0 ,sizeof (u32)); -for (j =0 ; j < cryp->total_in - tag_size; j++) { - d8[j] = *((u8 *)src); - src =stm32_cryp_next_in (cryp, src,1 ); - } - -stm32_cryp_write (cryp,CRYP_DIN , *(u32 *)d8); - cryp->total_in = tag_size; - } - } + cryp->payload_in -=min_t (size_t, cryp->hw_blocksize, cryp->payload_in); }static void stm32_cryp_irq_write_gcm_padded_data (struct stm32_cryp *cryp) {int err; -u32 cfg, tmp[AES_BLOCK_32 ]; -size_t total_in_ori = cryp->total_in; -struct scatterlist *out_sg_ori = cryp->out_sg; +u32 cfg, block[AES_BLOCK_32 ] = {0 };unsigned int i;/* 'Special workaround' procedure described in the datasheet */
@@ -1459,18 +1283,25 @@ static void stm32_cryp_irq_write_gcm_padded_data(struct stm32_cryp *cryp)/* b) pad and write the last block */ stm32_cryp_irq_write_block (cryp); - cryp->total_in = total_in_ori; +/* wait end of process */ err =stm32_cryp_wait_output (cryp);if (err) { -dev_err (cryp->dev,"Timeout (write gcm header)\n" ); +dev_err (cryp->dev,"Timeout (write gcm last data)\n" );return stm32_cryp_finish_req (cryp, err); }/* c) get and store encrypted data */ -stm32_cryp_irq_read_data (cryp); -scatterwalk_map_and_copy (tmp, out_sg_ori, - cryp->total_in_save - total_in_ori, - total_in_ori,0 ); +/* +* Same code as stm32_cryp_irq_read_data(), but we want to store +* block value +*/ +for (i =0 ; i < cryp->hw_blocksize /sizeof (u32); i++) + block[i] =stm32_cryp_read (cryp,CRYP_DOUT ); + +scatterwalk_copychunks (block, &cryp->out_walk,min_t (size_t, cryp->hw_blocksize, + cryp->payload_out),1 ); + cryp->payload_out -=min_t (size_t, cryp->hw_blocksize, + cryp->payload_out);/* d) change mode back to AES GCM */ cfg &= ~CR_ALGO_MASK ;
@@ -1483,19 +1314,13 @@ static void stm32_cryp_irq_write_gcm_padded_data(struct stm32_cryp *cryp)stm32_cryp_write (cryp,CRYP_CR , cfg);/* f) write padded data */ -for (i =0 ; i <AES_BLOCK_32 ; i++) { -if (cryp->total_in) -stm32_cryp_write (cryp,CRYP_DIN , tmp[i]); -else -stm32_cryp_write (cryp,CRYP_DIN ,0 ); - - cryp->total_in -=min_t (size_t,sizeof (u32), cryp->total_in); - } +for (i =0 ; i <AES_BLOCK_32 ; i++) +stm32_cryp_write (cryp,CRYP_DIN , block[i]);/* g) Empty fifo out */ err =stm32_cryp_wait_output (cryp);if (err) { -dev_err (cryp->dev,"Timeout (write gcm header)\n" ); +dev_err (cryp->dev,"Timeout (write gcm padded data)\n" );return stm32_cryp_finish_req (cryp, err); }
@@ -1508,16 +1333,14 @@ static void stm32_cryp_irq_write_gcm_padded_data(struct stm32_cryp *cryp)static void stm32_cryp_irq_set_npblb (struct stm32_cryp *cryp) { -u32 cfg, payload_bytes; +u32 cfg;/* disable ip, set NPBLB and reneable ip */ cfg =stm32_cryp_read (cryp,CRYP_CR ); cfg &= ~CR_CRYPEN ;stm32_cryp_write (cryp,CRYP_CR , cfg); - payload_bytes =is_decrypt (cryp) ? cryp->total_in - cryp->authsize : - cryp->total_in; - cfg |= (cryp->hw_blocksize - payload_bytes) <<CR_NBPBL_SHIFT ; + cfg |= (cryp->hw_blocksize - cryp->payload_in) <<CR_NBPBL_SHIFT ; cfg |=CR_CRYPEN ;stm32_cryp_write (cryp,CRYP_CR , cfg); }
@@ -1526,13 +1349,11 @@ static void stm32_cryp_irq_write_ccm_padded_data(struct stm32_cryp *cryp) {int err =0 ;u32 cfg, iv1tmp; -u32 cstmp1[AES_BLOCK_32 ], cstmp2[AES_BLOCK_32 ], tmp[AES_BLOCK_32 ]; -size_t last_total_out, total_in_ori = cryp->total_in; -struct scatterlist *out_sg_ori = cryp->out_sg; +u32 cstmp1[AES_BLOCK_32 ], cstmp2[AES_BLOCK_32 ]; +u32 block[AES_BLOCK_32 ] = {0 };unsigned int i;/* 'Special workaround' procedure described in the datasheet */ - cryp->flags |=FLG_CCM_PADDED_WA ;/* a) disable ip */ stm32_cryp_write (cryp,CRYP_IMSCR ,0 );
@@ -1562,7 +1383,7 @@ static void stm32_cryp_irq_write_ccm_padded_data(struct stm32_cryp *cryp)/* b) pad and write the last block */ stm32_cryp_irq_write_block (cryp); - cryp->total_in = total_in_ori; +/* wait end of process */ err =stm32_cryp_wait_output (cryp);if (err) {dev_err (cryp->dev,"Timeout (wite ccm padded data)\n" );
@@ -1570,13 +1391,16 @@ static void stm32_cryp_irq_write_ccm_padded_data(struct stm32_cryp *cryp) }/* c) get and store decrypted data */ - last_total_out = cryp->total_out; -stm32_cryp_irq_read_data (cryp); +/* +* Same code as stm32_cryp_irq_read_data(), but we want to store +* block value +*/ +for (i =0 ; i < cryp->hw_blocksize /sizeof (u32); i++) + block[i] =stm32_cryp_read (cryp,CRYP_DOUT ); -memset (tmp,0 ,sizeof (tmp)); -scatterwalk_map_and_copy (tmp, out_sg_ori, - cryp->total_out_save - last_total_out, - last_total_out,0 ); +scatterwalk_copychunks (block, &cryp->out_walk,min_t (size_t, cryp->hw_blocksize, + cryp->payload_out),1 ); + cryp->payload_out -=min_t (size_t, cryp->hw_blocksize, cryp->payload_out);/* d) Load again CRYP_CSGCMCCMxR */ for (i =0 ; i <ARRAY_SIZE (cstmp2); i++)
@@ -1593,10 +1417,10 @@ static void stm32_cryp_irq_write_ccm_padded_data(struct stm32_cryp *cryp)stm32_cryp_write (cryp,CRYP_CR , cfg);/* g) XOR and write padded data */ -for (i =0 ; i <ARRAY_SIZE (tmp); i++) { - tmp[i] ^= cstmp1[i]; - tmp[i] ^= cstmp2[i]; -stm32_cryp_write (cryp,CRYP_DIN , tmp[i]); +for (i =0 ; i <ARRAY_SIZE (block); i++) { + block[i] ^= cstmp1[i]; + block[i] ^= cstmp2[i]; +stm32_cryp_write (cryp,CRYP_DIN , block[i]); }/* h) wait for completion */
@@ -1610,30 +1434,34 @@ static void stm32_cryp_irq_write_ccm_padded_data(struct stm32_cryp *cryp)static void stm32_cryp_irq_write_data (struct stm32_cryp *cryp) { -if (unlikely (!cryp->total_in)) { +if (unlikely (!cryp->payload_in)) {dev_warn (cryp->dev,"No more data to process\n" );return ; } -if (unlikely (cryp->total_in <AES_BLOCK_SIZE && +if (unlikely (cryp->payload_in <AES_BLOCK_SIZE && (stm32_cryp_get_hw_mode (cryp) ==CR_AES_GCM ) &&is_encrypt (cryp))) {/* Padding for AES GCM encryption */ -if (cryp->caps->padding_wa) +if (cryp->caps->padding_wa) {/* Special case 1 */ -return stm32_cryp_irq_write_gcm_padded_data (cryp); +stm32_cryp_irq_write_gcm_padded_data (cryp); +return ; + }/* Setting padding bytes (NBBLB) */ stm32_cryp_irq_set_npblb (cryp); } -if (unlikely ((cryp->total_in - cryp->authsize <AES_BLOCK_SIZE ) && +if (unlikely ((cryp->payload_in <AES_BLOCK_SIZE ) && (stm32_cryp_get_hw_mode (cryp) ==CR_AES_CCM ) &&is_decrypt (cryp))) {/* Padding for AES CCM decryption */ -if (cryp->caps->padding_wa) +if (cryp->caps->padding_wa) {/* Special case 2 */ -return stm32_cryp_irq_write_ccm_padded_data (cryp); +stm32_cryp_irq_write_ccm_padded_data (cryp); +return ; + }/* Setting padding bytes (NBBLB) */ stm32_cryp_irq_set_npblb (cryp);
@@ -1645,192 +1473,60 @@ static void stm32_cryp_irq_write_data(struct stm32_cryp *cryp)stm32_cryp_irq_write_block (cryp); } -static void stm32_cryp_irq_write_gcm_header (struct stm32_cryp *cryp) +static void stm32_cryp_irq_write_gcmccm_header (struct stm32_cryp *cryp) { -int err; -unsigned int i, j; -u32 cfg, *src; - - src =sg_virt (cryp->in_sg) + _walked_in; - -for (i =0 ; i <AES_BLOCK_32 ; i++) { -stm32_cryp_write (cryp,CRYP_DIN , *src); - - src =stm32_cryp_next_in (cryp, src,sizeof (u32)); - cryp->total_in -=min_t (size_t,sizeof (u32), cryp->total_in); - -/* Check if whole header written */ -if ((cryp->total_in_save - cryp->total_in) == - cryp->areq->assoclen) { -/* Write padding if needed */ -for (j = i +1 ; j <AES_BLOCK_32 ; j++) -stm32_cryp_write (cryp,CRYP_DIN ,0 ); - -/* Wait for completion */ - err =stm32_cryp_wait_busy (cryp); -if (err) { -dev_err (cryp->dev,"Timeout (gcm header)\n" ); -return stm32_cryp_finish_req (cryp, err); - } - -if (stm32_cryp_get_input_text_len (cryp)) { -/* Phase 3 : payload */ - cfg =stm32_cryp_read (cryp,CRYP_CR ); - cfg &= ~CR_CRYPEN ; -stm32_cryp_write (cryp,CRYP_CR , cfg); - - cfg &= ~CR_PH_MASK ; - cfg |=CR_PH_PAYLOAD ; - cfg |=CR_CRYPEN ; -stm32_cryp_write (cryp,CRYP_CR , cfg); - }else { -/* Phase 4 : tag */ -stm32_cryp_write (cryp,CRYP_IMSCR ,0 ); -stm32_cryp_finish_req (cryp,0 ); - } - -break ; - } - -if (!cryp->total_in) -break ; - } -} +unsigned int i; +u32 block[AES_BLOCK_32 ] = {0 }; +size_t written; -static void stm32_cryp_irq_write_ccm_header (struct stm32_cryp *cryp) -{ -int err; -unsigned int i =0 , j, k; -u32 alen, cfg, *src; -u8 d8[4 ]; - - src =sg_virt (cryp->in_sg) + _walked_in; - alen = cryp->areq->assoclen; - -if (!_walked_in) { -if (cryp->areq->assoclen <=65280 ) { -/* Write first u32 of B1 */ - d8[0 ] = (alen >>8 ) &0xFF ; - d8[1 ] = alen &0xFF ; - d8[2 ] = *((u8 *)src); - src =stm32_cryp_next_in (cryp, src,1 ); - d8[3 ] = *((u8 *)src); - src =stm32_cryp_next_in (cryp, src,1 ); - -stm32_cryp_write (cryp,CRYP_DIN , *(u32 *)d8); - i++; - - cryp->total_in -=min_t (size_t,2 , cryp->total_in); - }else { -/* Build the two first u32 of B1 */ - d8[0 ] =0xFF ; - d8[1 ] =0xFE ; - d8[2 ] = alen &0xFF000000 ; - d8[3 ] = alen &0x00FF0000 ; - -stm32_cryp_write (cryp,CRYP_DIN , *(u32 *)d8); - i++; - - d8[0 ] = alen &0x0000FF00 ; - d8[1 ] = alen &0x000000FF ; - d8[2 ] = *((u8 *)src); - src =stm32_cryp_next_in (cryp, src,1 ); - d8[3 ] = *((u8 *)src); - src =stm32_cryp_next_in (cryp, src,1 ); - -stm32_cryp_write (cryp,CRYP_DIN , *(u32 *)d8); - i++; - - cryp->total_in -=min_t (size_t,2 , cryp->total_in); - } - } + written =min_t (size_t,AES_BLOCK_SIZE , cryp->header_in); -/* Write next u32 */ -for (; i <AES_BLOCK_32 ; i++) { -/* Build an u32 */ -memset (d8,0 ,sizeof (u32)); -for (k =0 ; k <sizeof (u32); k++) { - d8[k] = *((u8 *)src); - src =stm32_cryp_next_in (cryp, src,1 ); - - cryp->total_in -=min_t (size_t,1 , cryp->total_in); -if ((cryp->total_in_save - cryp->total_in) == alen) -break ; - } +scatterwalk_copychunks (block, &cryp->in_walk, written,0 ); +for (i =0 ; i <AES_BLOCK_32 ; i++) +stm32_cryp_write (cryp,CRYP_DIN , block[i]); -stm32_cryp_write (cryp,CRYP_DIN , *(u32 *)d8); - -if ((cryp->total_in_save - cryp->total_in) == alen) { -/* Write padding if needed */ -for (j = i +1 ; j <AES_BLOCK_32 ; j++) -stm32_cryp_write (cryp,CRYP_DIN ,0 ); - -/* Wait for completion */ - err =stm32_cryp_wait_busy (cryp); -if (err) { -dev_err (cryp->dev,"Timeout (ccm header)\n" ); -return stm32_cryp_finish_req (cryp, err); - } - -if (stm32_cryp_get_input_text_len (cryp)) { -/* Phase 3 : payload */ - cfg =stm32_cryp_read (cryp,CRYP_CR ); - cfg &= ~CR_CRYPEN ; -stm32_cryp_write (cryp,CRYP_CR , cfg); - - cfg &= ~CR_PH_MASK ; - cfg |=CR_PH_PAYLOAD ; - cfg |=CR_CRYPEN ; -stm32_cryp_write (cryp,CRYP_CR , cfg); - }else { -/* Phase 4 : tag */ -stm32_cryp_write (cryp,CRYP_IMSCR ,0 ); -stm32_cryp_finish_req (cryp,0 ); - } + cryp->header_in -= written; -break ; - } - } +stm32_crypt_gcmccm_end_header (cryp); }static irqreturn_t stm32_cryp_irq_thread (int irq,void *arg) {struct stm32_cryp *cryp = arg;u32 ph; +u32 it_mask =stm32_cryp_read (cryp,CRYP_IMSCR );if (cryp->irq_status &MISR_OUT )/* Output FIFO IRQ: read data */ -if (unlikely (stm32_cryp_irq_read_data (cryp))) { -/* All bytes processed, finish */ -stm32_cryp_write (cryp,CRYP_IMSCR ,0 ); -stm32_cryp_finish_req (cryp,0 ); -return IRQ_HANDLED ; - } +stm32_cryp_irq_read_data (cryp);if (cryp->irq_status &MISR_IN ) { -if (is_gcm (cryp)) { - ph =stm32_cryp_read (cryp,CRYP_CR ) &CR_PH_MASK ; -if (unlikely (ph ==CR_PH_HEADER )) -/* Write Header */ -stm32_cryp_irq_write_gcm_header (cryp); -else -/* Input FIFO IRQ: write data */ -stm32_cryp_irq_write_data (cryp); - cryp->gcm_ctr++; - }else if (is_ccm (cryp)) { +if (is_gcm (cryp) ||is_ccm (cryp)) { ph =stm32_cryp_read (cryp,CRYP_CR ) &CR_PH_MASK ;if (unlikely (ph ==CR_PH_HEADER ))/* Write Header */ -stm32_cryp_irq_write_ccm_header (cryp); +stm32_cryp_irq_write_gcmccm_header (cryp);else /* Input FIFO IRQ: write data */ stm32_cryp_irq_write_data (cryp); +if (is_gcm (cryp)) + cryp->gcm_ctr++; }else {/* Input FIFO IRQ: write data */ stm32_cryp_irq_write_data (cryp); } } +/* Mask useless interrupts */ +if (!cryp->payload_in && !cryp->header_in) + it_mask &= ~IMSCR_IN ; +if (!cryp->payload_out) + it_mask &= ~IMSCR_OUT ; +stm32_cryp_write (cryp,CRYP_IMSCR , it_mask); + +if (!cryp->payload_in && !cryp->header_in && !cryp->payload_out) +stm32_cryp_finish_req (cryp,0 ); +return IRQ_HANDLED ; }
@@ -1851,7 +1547,7 @@ static struct skcipher_alg crypto_algs[] = { .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .base.cra_alignmask = 0xf, + .base.cra_alignmask = 0, .base.cra_module = THIS_MODULE, .init = stm32_cryp_init_tfm,
@@ -1868,7 +1564,7 @@ static struct skcipher_alg crypto_algs[] = { .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = AES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .base.cra_alignmask = 0xf, + .base.cra_alignmask = 0, .base.cra_module = THIS_MODULE, .init = stm32_cryp_init_tfm,
@@ -1886,7 +1582,7 @@ static struct skcipher_alg crypto_algs[] = { .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = 1, .base.cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .base.cra_alignmask = 0xf, + .base.cra_alignmask = 0, .base.cra_module = THIS_MODULE, .init = stm32_cryp_init_tfm,
@@ -1904,7 +1600,7 @@ static struct skcipher_alg crypto_algs[] = { .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .base.cra_alignmask = 0xf, + .base.cra_alignmask = 0, .base.cra_module = THIS_MODULE, .init = stm32_cryp_init_tfm,
@@ -1921,7 +1617,7 @@ static struct skcipher_alg crypto_algs[] = { .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .base.cra_alignmask = 0xf, + .base.cra_alignmask = 0, .base.cra_module = THIS_MODULE, .init = stm32_cryp_init_tfm,
@@ -1939,7 +1635,7 @@ static struct skcipher_alg crypto_algs[] = { .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .base.cra_alignmask = 0xf, + .base.cra_alignmask = 0, .base.cra_module = THIS_MODULE, .init = stm32_cryp_init_tfm,
@@ -1956,7 +1652,7 @@ static struct skcipher_alg crypto_algs[] = { .base.cra_flags = CRYPTO_ALG_ASYNC, .base.cra_blocksize = DES_BLOCK_SIZE, .base.cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .base.cra_alignmask = 0xf, + .base.cra_alignmask = 0, .base.cra_module = THIS_MODULE, .init = stm32_cryp_init_tfm,
@@ -1986,7 +1682,7 @@ static struct aead_alg aead_algs[] = { .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = 1, .cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .cra_alignmask = 0xf, + .cra_alignmask = 0, .cra_module = THIS_MODULE, }, },
@@ -2006,7 +1702,7 @@ static struct aead_alg aead_algs[] = { .cra_flags = CRYPTO_ALG_ASYNC, .cra_blocksize = 1, .cra_ctxsize = sizeof(struct stm32_cryp_ctx), - .cra_alignmask = 0xf, + .cra_alignmask = 0, .cra_module = THIS_MODULE, }, },
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 237/846 crypto: stm32 - Revert broken pm_runtime_resume_and_get changes
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 3d6b661330a7954d8136df98160d525eb04dcd6a ]
We should not call pm_runtime_resume_and_get where the reference count is expected to be incremented unconditionally. This patch reverts these calls to the original unconditional get_sync call.
--- drivers/crypto/stm32/stm32-cryp.c | 3 ++- drivers/crypto/stm32/stm32-hash.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/crypto/stm32/stm32-cryp.c +2 -1
@@ -529,7 +529,8 @@ static int stm32_cryp_hw_init(struct stm32_cryp *cryp) {int ret;u32 cfg, hw_mode; -pm_runtime_resume_and_get (cryp->dev); + +pm_runtime_get_sync (cryp->dev);/* Disable interrupt */ stm32_cryp_write (cryp,CRYP_IMSCR ,0 );
drivers/crypto/stm32/stm32-hash.c +3 -3
@@ -813,7 +813,7 @@ static void stm32_hash_finish_req(struct ahash_request *req, int err)static int stm32_hash_hw_init (struct stm32_hash_dev *hdev,struct stm32_hash_request_ctx *rctx) { -pm_runtime_resume_and_get (hdev->dev); +pm_runtime_get_sync (hdev->dev);if (!(HASH_FLAGS_INIT & hdev->flags)) {stm32_hash_write (hdev,HASH_CR ,HASH_CR_INIT );
@@ -962,7 +962,7 @@ static int stm32_hash_export(struct ahash_request *req, void *out)u32 *preg;unsigned int i; -pm_runtime_resume_and_get (hdev->dev); +pm_runtime_get_sync (hdev->dev);while ((stm32_hash_read (hdev,HASH_SR ) &HASH_SR_BUSY ))cpu_relax ();
@@ -1000,7 +1000,7 @@ static int stm32_hash_import(struct ahash_request *req, const void *in) preg = rctx->hw_context; -pm_runtime_resume_and_get (hdev->dev); +pm_runtime_get_sync (hdev->dev);stm32_hash_write (hdev,HASH_IMR , *preg++);stm32_hash_write (hdev,HASH_STR , *preg++);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 238/846 crypto: hisilicon/qm - fix incorrect return value of hisi_qm_resume()
In reply to Greg Kroah-HartmanFrom: Weili Qian <[email protected]>
[ Upstream commit 3f9dd4c802b96626e869b2d29c8e401dabadd23e ]
When hisi_qm_resume() returns 0, it indicates that the device has started successfully. If the device fails to start, hisi_qm_resume() needs to return the actual error code to the caller instead of 0.
--- drivers/crypto/hisilicon/qm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/hisilicon/qm.c +1 -1
@@ -5986,7 +5986,7 @@ int hisi_qm_resume(struct device *dev)if (ret)pci_err (pdev,"failed to start qm(%d)\n" , ret); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (hisi_qm_resume);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 239/846 ath11k: Fix deleting uninitialized kernel timer during fragment cache flush
In reply to Greg Kroah-HartmanFrom: Rameshkumar Sundaram <[email protected]>
[ Upstream commit ba53ee7f7f38cf0592b8be1dcdabaf8f7535f8c1 ]
frag_timer will be created & initialized for stations when they associate and will be deleted during every key installation while flushing old fragments.
For AP interface self peer will be created and Group keys will be installed for this peer, but there will be no real Station entry & hence frag_timer won't be created and initialized, deleting such uninitialized kernel timers causes below warnings and backtraces printed with CONFIG_DEBUG_OBJECTS_TIMERS enabled.
[ 177.828008] ODEBUG: assert_init not available (active state 0) object type: timer_list hint: 0x0 [ 177.836833] WARNING: CPU: 3 PID: 188 at lib/debugobjects.c:508 debug_print_object+0xb0/0xf0 [ 177.845185] Modules linked in: ath11k_pci ath11k qmi_helpers qrtr_mhi qrtr ns mhi [ 177.852679] CPU: 3 PID: 188 Comm: hostapd Not tainted 5.14.0-rc3-32919-g4034139e1838-dirty #14 [ 177.865805] pstate: 60000005 (nZCv daif -PAN -UAO -TCO BTYPE=--) [ 177.871804] pc : debug_print_object+0xb0/0xf0 [ 177.876155] lr : debug_print_object+0xb0/0xf0 [ 177.880505] sp : ffffffc01169b5a0 [ 177.883810] x29: ffffffc01169b5a0 x28: ffffff80081c2320 x27: ffffff80081c4078 [ 177.890942] x26: ffffff8003fe8f28 x25: ffffff8003de9890 x24: ffffffc01134d738 [ 177.898075] x23: ffffffc010948f20 x22: ffffffc010b2d2e0 x21: ffffffc01169b628 [ 177.905206] x20: ffffffc01134d700 x19: ffffffc010c80d98 x18: 00000000000003f6 [ 177.912339] x17: 203a657079742074 x16: 63656a626f202930 x15: 0000000000000152 [ 177.919471] x14: 0000000000000152 x13: 00000000ffffffea x12: ffffffc010d732e0 [ 177.926603] x11: 0000000000000003 x10: ffffffc010d432a0 x9 : ffffffc010d432f8 [ 177.933735] x8 : 000000000002ffe8 x7 : c0000000ffffdfff x6 : 0000000000000001 [ 177.940866] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 00000000ffffffff [ 177.947997] x2 : ffffffc010c93240 x1 : ffffff80023624c0 x0 : 0000000000000054 [ 177.955130] Call trace: [ 177.957567] debug_print_object+0xb0/0xf0 [ 177.961570] debug_object_assert_init+0x124/0x178 [ 177.966269] try_to_del_timer_sync+0x1c/0x70 [ 177.970536] del_timer_sync+0x30/0x50 [ 177.974192] ath11k_peer_frags_flush+0x34/0x68 [ath11k] [ 177.979439] ath11k_mac_op_set_key+0x1e4/0x338 [ath11k] [ 177.984673] ieee80211_key_enable_hw_accel+0xc8/0x3d0 [ 177.989722] ieee80211_key_replace+0x360/0x740 [ 177.994160] ieee80211_key_link+0x16c/0x210 [ 177.998337] ieee80211_add_key+0x138/0x338 [ 178.002426] nl80211_new_key+0xfc/0x258 [ 178.006257] genl_family_rcv_msg_doit.isra.17+0xd8/0x120 [ 178.011565] genl_rcv_msg+0xd8/0x1c8 [ 178.015134] netlink_rcv_skb+0x38/0xf8 [ 178.018877] genl_rcv+0x34/0x48 [ 178.022012] netlink_unicast+0x174/0x230 [ 178.025928] netlink_sendmsg+0x188/0x388 [ 178.029845] ____sys_sendmsg+0x218/0x250 [ 178.033763] ___sys_sendmsg+0x68/0x90 [ 178.037418] __sys_sendmsg+0x44/0x88 [ 178.040988] __arm64_sys_sendmsg+0x20/0x28 [ 178.045077] invoke_syscall.constprop.5+0x54/0xe0 [ 178.049776] do_el0_svc+0x74/0xc0 [ 178.053084] el0_svc+0x10/0x18 [ 178.056133] el0t_64_sync_handler+0x88/0xb0 [ 178.060310] el0t_64_sync+0x148/0x14c [ 178.063966] ---[ end trace 8a5cf0bf9d34a058 ]---
Add changes to not to delete frag timer for peers during group key installation.
Tested on: IPQ8074 hw2.0 AHB WLAN.HK.2.5.0.1-01092-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -1
@@ -2791,7 +2791,7 @@ static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,/* flush the fragments cache during key (re)install to * ensure all frags in the new frag list belong to the same key. */ -if (peer && cmd ==SET_KEY ) +if (peer && sta && cmd ==SET_KEY )ath11k_peer_frags_flush (ar, peer);spin_unlock_bh (&ab->base_lock);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 240/846 spi: Fix incorrect cs_setup delay handling
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
[ Upstream commit 95c07247399536f83b89dc60cfe7b279d17e69f6 ]
Move the cs_setup delay to the end of spi_set_cs.
Quoted 1 line
From
include/linux/spi/spi.h:
* @cs_setup: delay to be introduced by the controller after CS is asserted
The cs_setup delay needs to happen *after* CS is asserted, that is, at the end of spi_set_cs, not at the beginning. Otherwise we're just delaying before the SPI transaction starts at all, which isn't very useful.
No drivers use this right now, but that is likely to change soon with an upcoming Apple SPI HID transport driver.
--- drivers/spi/spi.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/spi/spi.c +6 -7
@@ -868,12 +868,9 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) spi->controller->last_cs_enable = enable; spi->controller->last_cs_mode_high = spi->mode &SPI_CS_HIGH ; -if (spi->cs_gpiod ||gpio_is_valid (spi->cs_gpio) || - !spi->controller->set_cs_timing) { -if (activate) -spi_delay_exec (&spi->cs_setup,NULL ); -else -spi_delay_exec (&spi->cs_hold,NULL ); +if ((spi->cs_gpiod ||gpio_is_valid (spi->cs_gpio) || + !spi->controller->set_cs_timing) && !activate) { +spi_delay_exec (&spi->cs_hold,NULL ); }if (spi->mode &SPI_CS_HIGH )
@@ -915,7 +912,9 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)if (spi->cs_gpiod ||gpio_is_valid (spi->cs_gpio) || !spi->controller->set_cs_timing) { -if (!activate) +if (activate) +spi_delay_exec (&spi->cs_setup,NULL ); +else spi_delay_exec (&spi->cs_inactive,NULL ); } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 241/846 ARM: dts: gemini: NAS4220-B: fis-index-block with 128 KiB sectors
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
[ Upstream commit 4754eab7e5a78bdefe7a960c5c260c95ebbb5fa6 ]
Steven Maddox reported in the OpenWrt bugzilla, that his RaidSonic IB-NAS4220-B was no longer booting with the new OpenWrt 21.02 (uses linux 5.10's device-tree). However, it was working with the previous OpenWrt 19.07 series (uses 4.14).
|[ 5.548038] No RedBoot partition table detected in 30000000.flash |[ 5.618553] Searching for RedBoot partition table in 30000000.flash at offset 0x0 |[ 5.739093] No RedBoot partition table detected in 30000000.flash |... |[ 7.039504] Waiting for root device /dev/mtdblock3...
The provided bootlog shows that the RedBoot partition parser was looking for the partition table "at offset 0x0". Which is strange since the comment in the device-tree says it should be at 0xfe0000.
Further digging on the internet led to a review site that took some useful PCB pictures of their review unit back in February 2009. Their picture shows a Spansion S29GL128N11TFI01 flash chip.
Quoted 1 line
From Spansion's Datasheet:
"S29GL128N: One hundred twenty-eight 64 Kword (128 Kbyte) sectors" Steven also provided a "cat /sys/class/mtd/mtd0/erasesize" from his
unit: "131072".
With the 128 KiB Sector/Erasesize in mind. This patch changes the fis-index-block property to (0xfe0000 / 0x20000) = 0x7f.
Bugzilla: https://bugs.openwrt.org/index.php?do=details&task_id=4137
--- arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/gemini-nas4220b.dts +1 -1
@@ -84,7 +84,7 @@ partitions { compatible = "redboot-fis"; /* Eraseblock at 0xfe0000 */ - fis-index-block = <0x1fc>; + fis-index-block = <0x7f>; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 242/846 perf/arm-cmn: Fix CPU hotplug unregistration
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit 56c7c6eaf3eb8ac1ec40d56096c0f2b27250da5f ]
Attempting to migrate the PMU context after we've unregistered the PMU device, or especially if we never successfully registered it in the first place, is a woefully bad idea. It's also fundamentally pointless anyway. Make sure to unregister an instance from the hotplug handler *without* invoking the teardown callback.
--- drivers/perf/arm-cmn.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/perf/arm-cmn.c +3 -2
@@ -1561,7 +1561,8 @@ static int arm_cmn_probe(struct platform_device *pdev) err =perf_pmu_register (&cmn->pmu, name,-1 );if (err) -cpuhp_state_remove_instance (arm_cmn_hp_state, &cmn->cpuhp_node); +cpuhp_state_remove_instance_nocalls (arm_cmn_hp_state, &cmn->cpuhp_node); +return err; }
@@ -1572,7 +1573,7 @@ static int arm_cmn_remove(struct platform_device *pdev)writel_relaxed (0 , cmn->dtc[0 ].base +CMN_DT_DTC_CTL );perf_pmu_unregister (&cmn->pmu); -cpuhp_state_remove_instance (arm_cmn_hp_state, &cmn->cpuhp_node); +cpuhp_state_remove_instance_nocalls (arm_cmn_hp_state, &cmn->cpuhp_node);return 0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 243/846 media: dw2102: Fix use after free
In reply to Greg Kroah-HartmanFrom: Anton Vasilyev <[email protected]>
[ Upstream commit 589a9f0eb799f77de2c09583bf5bad221fa5d685 ]
dvb_usb_device_init stores parts of properties at d->props and d->desc and uses it on dvb_usb_device_exit. Free of properties on module probe leads to use after free.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204597
The patch makes properties static instead of allocated on heap to prevent memleak and use after free.
Also fixes s421_properties.devices initialization to have 2 element instead of 6 copied from p7500_properties.
--- drivers/media/usb/dvb-usb/dw2102.c | 338 ++++++++++++++++++----------- 1 file changed, 215 insertions(+), 123 deletions(-)
drivers/media/usb/dvb-usb/dw2102.c +215 -123
@@ -2150,46 +2150,153 @@ static struct dvb_usb_device_properties s6x0_properties = { } }; -static const struct dvb_usb_device_description d1100 = { -"Prof 1100 USB " , - {&dw2102_table[PROF_1100 ],NULL }, - {NULL }, -}; +static struct dvb_usb_device_properties p1100_properties = { + .caps =DVB_USB_IS_AN_I2C_ADAPTER , + .usb_ctrl =DEVICE_SPECIFIC , + .size_of_priv =sizeof (struct dw2102_state ), + .firmware =P1100_FIRMWARE , + .no_reconnect =1 , -static const struct dvb_usb_device_description d660 = { -"TeVii S660 USB" , - {&dw2102_table[TEVII_S660 ],NULL }, - {NULL }, -}; + .i2c_algo = &s6x0_i2c_algo, + .rc.core = { + .rc_interval =150 , + .rc_codes =RC_MAP_TBS_NEC , + .module_name ="dw2102" , + .allowed_protos =RC_PROTO_BIT_NEC , + .rc_query = prof_rc_query, + }, -static const struct dvb_usb_device_description d480_1 = { -"TeVii S480.1 USB" , - {&dw2102_table[TEVII_S480_1 ],NULL }, - {NULL }, + .generic_bulk_ctrl_endpoint =0x81 , + .num_adapters =1 , + .download_firmware = dw2102_load_firmware, + .read_mac_address = s6x0_read_mac_address, + .adapter = { + { + .num_frontends =1 , + .fe = {{ + .frontend_attach = stv0288_frontend_attach, + .stream = { + .type =USB_BULK , + .count =8 , + .endpoint =0x82 , + .u = { + .bulk = { + .buffersize =4096 , + } + } + }, + } }, + } + }, + .num_device_descs =1 , + .devices = { + {"Prof 1100 USB " , + {&dw2102_table[PROF_1100 ],NULL }, + {NULL }, + }, + } }; -static const struct dvb_usb_device_description d480_2 = { -"TeVii S480.2 USB" , - {&dw2102_table[TEVII_S480_2 ],NULL }, - {NULL }, -}; +static struct dvb_usb_device_properties s660_properties = { + .caps =DVB_USB_IS_AN_I2C_ADAPTER , + .usb_ctrl =DEVICE_SPECIFIC , + .size_of_priv =sizeof (struct dw2102_state ), + .firmware =S660_FIRMWARE , + .no_reconnect =1 , -static const struct dvb_usb_device_description d7500 = { -"Prof 7500 USB DVB-S2" , - {&dw2102_table[PROF_7500 ],NULL }, - {NULL }, -}; + .i2c_algo = &s6x0_i2c_algo, + .rc.core = { + .rc_interval =150 , + .rc_codes =RC_MAP_TEVII_NEC , + .module_name ="dw2102" , + .allowed_protos =RC_PROTO_BIT_NEC , + .rc_query = dw2102_rc_query, + }, -static const struct dvb_usb_device_description d421 = { -"TeVii S421 PCI" , - {&dw2102_table[TEVII_S421 ],NULL }, - {NULL }, + .generic_bulk_ctrl_endpoint =0x81 , + .num_adapters =1 , + .download_firmware = dw2102_load_firmware, + .read_mac_address = s6x0_read_mac_address, + .adapter = { + { + .num_frontends =1 , + .fe = {{ + .frontend_attach = ds3000_frontend_attach, + .stream = { + .type =USB_BULK , + .count =8 , + .endpoint =0x82 , + .u = { + .bulk = { + .buffersize =4096 , + } + } + }, + } }, + } + }, + .num_device_descs =3 , + .devices = { + {"TeVii S660 USB" , + {&dw2102_table[TEVII_S660 ],NULL }, + {NULL }, + }, + {"TeVii S480.1 USB" , + {&dw2102_table[TEVII_S480_1 ],NULL }, + {NULL }, + }, + {"TeVii S480.2 USB" , + {&dw2102_table[TEVII_S480_2 ],NULL }, + {NULL }, + }, + } }; -static const struct dvb_usb_device_description d632 = { -"TeVii S632 USB" , - {&dw2102_table[TEVII_S632 ],NULL }, - {NULL }, +static struct dvb_usb_device_properties p7500_properties = { + .caps =DVB_USB_IS_AN_I2C_ADAPTER , + .usb_ctrl =DEVICE_SPECIFIC , + .size_of_priv =sizeof (struct dw2102_state ), + .firmware =P7500_FIRMWARE , + .no_reconnect =1 , + + .i2c_algo = &s6x0_i2c_algo, + .rc.core = { + .rc_interval =150 , + .rc_codes =RC_MAP_TBS_NEC , + .module_name ="dw2102" , + .allowed_protos =RC_PROTO_BIT_NEC , + .rc_query = prof_rc_query, + }, + + .generic_bulk_ctrl_endpoint =0x81 , + .num_adapters =1 , + .download_firmware = dw2102_load_firmware, + .read_mac_address = s6x0_read_mac_address, + .adapter = { + { + .num_frontends =1 , + .fe = {{ + .frontend_attach = prof_7500_frontend_attach, + .stream = { + .type =USB_BULK , + .count =8 , + .endpoint =0x82 , + .u = { + .bulk = { + .buffersize =4096 , + } + } + }, + } }, + } + }, + .num_device_descs =1 , + .devices = { + {"Prof 7500 USB DVB-S2" , + {&dw2102_table[PROF_7500 ],NULL }, + {NULL }, + }, + } };static struct dvb_usb_device_properties su3000_properties = {
@@ -2273,6 +2380,59 @@ static struct dvb_usb_device_properties su3000_properties = { } }; +static struct dvb_usb_device_properties s421_properties = { + .caps =DVB_USB_IS_AN_I2C_ADAPTER , + .usb_ctrl =DEVICE_SPECIFIC , + .size_of_priv =sizeof (struct dw2102_state ), + .power_ctrl = su3000_power_ctrl, + .num_adapters =1 , + .identify_state = su3000_identify_state, + .i2c_algo = &su3000_i2c_algo, + + .rc.core = { + .rc_interval =150 , + .rc_codes =RC_MAP_SU3000 , + .module_name ="dw2102" , + .allowed_protos =RC_PROTO_BIT_RC5 , + .rc_query = su3000_rc_query, + }, + + .read_mac_address = su3000_read_mac_address, + + .generic_bulk_ctrl_endpoint =0x01 , + + .adapter = { + { + .num_frontends =1 , + .fe = {{ + .streaming_ctrl = su3000_streaming_ctrl, + .frontend_attach = m88rs2000_frontend_attach, + .stream = { + .type =USB_BULK , + .count =8 , + .endpoint =0x82 , + .u = { + .bulk = { + .buffersize =4096 , + } + } + } + } }, + } + }, + .num_device_descs =2 , + .devices = { + {"TeVii S421 PCI" , + { &dw2102_table[TEVII_S421 ],NULL }, + {NULL }, + }, + {"TeVii S632 USB" , + { &dw2102_table[TEVII_S632 ],NULL }, + {NULL }, + }, + } +}; +static struct dvb_usb_device_properties t220_properties = { .caps =DVB_USB_IS_AN_I2C_ADAPTER , .usb_ctrl =DEVICE_SPECIFIC ,
@@ -2390,101 +2550,33 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {static int dw2102_probe (struct usb_interface *intf,const struct usb_device_id *id) { -int retval = -ENOMEM ; -struct dvb_usb_device_properties *p1100; -struct dvb_usb_device_properties *s660; -struct dvb_usb_device_properties *p7500; -struct dvb_usb_device_properties *s421; - - p1100 =kmemdup (&s6x0_properties, -sizeof (struct dvb_usb_device_properties ),GFP_KERNEL ); -if (!p1100) - goto err0; - -/* copy default structure */ -/* fill only different fields */ - p1100->firmware =P1100_FIRMWARE ; - p1100->devices[0 ] = d1100; - p1100->rc.core.rc_query = prof_rc_query; - p1100->rc.core.rc_codes =RC_MAP_TBS_NEC ; - p1100->adapter->fe[0 ].frontend_attach = stv0288_frontend_attach; - - s660 =kmemdup (&s6x0_properties, -sizeof (struct dvb_usb_device_properties ),GFP_KERNEL ); -if (!s660) - goto err1; - - s660->firmware =S660_FIRMWARE ; - s660->num_device_descs =3 ; - s660->devices[0 ] = d660; - s660->devices[1 ] = d480_1; - s660->devices[2 ] = d480_2; - s660->adapter->fe[0 ].frontend_attach = ds3000_frontend_attach; - - p7500 =kmemdup (&s6x0_properties, -sizeof (struct dvb_usb_device_properties ),GFP_KERNEL ); -if (!p7500) - goto err2; - - p7500->firmware =P7500_FIRMWARE ; - p7500->devices[0 ] = d7500; - p7500->rc.core.rc_query = prof_rc_query; - p7500->rc.core.rc_codes =RC_MAP_TBS_NEC ; - p7500->adapter->fe[0 ].frontend_attach = prof_7500_frontend_attach; - - - s421 =kmemdup (&su3000_properties, -sizeof (struct dvb_usb_device_properties ),GFP_KERNEL ); -if (!s421) - goto err3; - - s421->num_device_descs =2 ; - s421->devices[0 ] = d421; - s421->devices[1 ] = d632; - s421->adapter->fe[0 ].frontend_attach = m88rs2000_frontend_attach; - -if (0 ==dvb_usb_device_init (intf, &dw2102_properties, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, &dw2104_properties, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, &dw3101_properties, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, &s6x0_properties, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, p1100, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, s660, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, p7500, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, s421, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, &su3000_properties, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, &t220_properties, -THIS_MODULE ,NULL , adapter_nr) || -0 ==dvb_usb_device_init (intf, &tt_s2_4600_properties, -THIS_MODULE ,NULL , adapter_nr)) { - -/* clean up copied properties */ -kfree (s421); -kfree (p7500); -kfree (s660); -kfree (p1100); +if (!(dvb_usb_device_init (intf, &dw2102_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &dw2104_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &dw3101_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &s6x0_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &p1100_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &s660_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &p7500_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &s421_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &su3000_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &t220_properties, +THIS_MODULE ,NULL , adapter_nr) && +dvb_usb_device_init (intf, &tt_s2_4600_properties, +THIS_MODULE ,NULL , adapter_nr))) {return 0 ; } - retval = -ENODEV ; -kfree (s421); -err3: -kfree (p7500); -err2: -kfree (s660); -err1: -kfree (p1100); -err0: -return retval; +return -ENODEV ; }static void dw2102_disconnect (struct usb_interface *intf)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 244/846 media: msi001: fix possible null-ptr-deref in msi001_probe()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 3d5831a40d3464eea158180eb12cbd81c5edfb6a ]
I got a null-ptr-deref report:
BUG: kernel NULL pointer dereference, address: 0000000000000060 ... RIP: 0010:v4l2_ctrl_auto_cluster+0x57/0x270 ... Call Trace: msi001_probe+0x13b/0x24b [msi001] spi_probe+0xeb/0x130
...
do_syscall_64+0x35/0xb0
In msi001_probe(), if the creation of control for bandwidth_auto fails, there will be a null-ptr-deref issue when it is used in v4l2_ctrl_auto_cluster().
Check dev->hdl.error before v4l2_ctrl_auto_cluster() to fix this bug.
--- drivers/media/tuners/msi001.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/tuners/msi001.c +7 -0
@@ -442,6 +442,13 @@ static int msi001_probe(struct spi_device *spi) V4L2_CID_RF_TUNER_BANDWIDTH_AUTO, 0, 1, 1, 1); dev->bandwidth =v4l2_ctrl_new_std (&dev->hdl, &msi001_ctrl_ops,V4L2_CID_RF_TUNER_BANDWIDTH ,200000 ,8000000 ,1 ,200000 ); +if (dev->hdl.error) { + ret = dev->hdl.error; +dev_err (&spi->dev,"Could not initialize controls\n" ); +/* control init failed, free handler */ + goto err_ctrl_handler_free; + } +v4l2_ctrl_auto_cluster (2 , &dev->bandwidth_auto,0 , false); dev->lna_gain =v4l2_ctrl_new_std (&dev->hdl, &msi001_ctrl_ops,V4L2_CID_RF_TUNER_LNA_GAIN ,0 ,1 ,1 ,1 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 245/846 media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 43f0633f89947df57fe0b5025bdd741768007708 ]
The return value of dma_set_coherent_mask() is not always 0. To catch the exception in case that dma is not support the mask.
--- drivers/media/platform/coda/imx-vdoa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/platform/coda/imx-vdoa.c +5 -1
@@ -287,7 +287,11 @@ static int vdoa_probe(struct platform_device *pdev)struct resource *res;int ret; -dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (32 )); + ret =dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (32 )); +if (ret) { +dev_err (&pdev->dev,"DMA enable failed\n" ); +return ret; + } vdoa =devm_kzalloc (&pdev->dev,sizeof (*vdoa),GFP_KERNEL );if (!vdoa)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 246/846 ath11k: Fix a NULL pointer dereference in ath11k_mac_op_hw_scan()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit eccd25136386a04ebf46a64f3a34e8e0fab6d9e1 ]
In ath11k_mac_op_hw_scan(), the return value of kzalloc() is directly used in memcpy(), which may lead to a NULL pointer dereference on failure of kzalloc().
Fix this bug by adding a check of arg.extraie.ptr.
This bug was found by a static analyzer. The analysis employs differential checking to identify inconsistent security operations (e.g., checks or kfrees) between two code paths and confirms that the inconsistent operations are not recovered in the current function or the callers, so they constitute bugs.
Note that, as a bug found by static analysis, it can be a false positive or hard to trigger. Multiple researchers have cross-reviewed the bug.
Builds with CONFIG_ATH11K=m show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/net/wireless/ath/ath11k/mac.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +5 -2
@@ -2580,9 +2580,12 @@ static int ath11k_mac_op_hw_scan(struct ieee80211_hw *hw, arg.scan_id =ATH11K_SCAN_ID ;if (req->ie_len) { + arg.extraie.ptr =kmemdup (req->ie, req->ie_len,GFP_KERNEL ); +if (!arg.extraie.ptr) { + ret = -ENOMEM ; + goto exit; + } arg.extraie.len = req->ie_len; - arg.extraie.ptr =kzalloc (req->ie_len,GFP_KERNEL ); -memcpy (arg.extraie.ptr, req->ie, req->ie_len); }if (req->n_ssids) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 247/846 net: dsa: hellcreek: Fix insertion of static FDB entries
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit 4db4c3ea56978086ca367a355e440de17d534827 ]
The insertion of static FDB entries ignores the pass_blocked bit. That bit is evaluated with regards to STP. Add the missing functionality.
--- drivers/net/dsa/hirschmann/hellcreek.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/dsa/hirschmann/hellcreek.c +5 -2
@@ -710,8 +710,9 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek,u16 meta =0 ;dev_dbg (hellcreek->dev,"Add static FDB entry: MAC=%pM, MASK=0x%02x, " -"OBT=%d, REPRIO_EN=%d, PRIO=%d\n" , entry->mac, entry->portmask, - entry->is_obt, entry->reprio_en, entry->reprio_tc); +"OBT=%d, PASS_BLOCKED=%d, REPRIO_EN=%d, PRIO=%d\n" , entry->mac, + entry->portmask, entry->is_obt, entry->pass_blocked, + entry->reprio_en, entry->reprio_tc);/* Add mac address */ hellcreek_write (hellcreek, entry->mac[1 ] | (entry->mac[0 ] <<8 ),HR_FDBWDH );
@@ -722,6 +723,8 @@ static int __hellcreek_fdb_add(struct hellcreek *hellcreek, meta |= entry->portmask <<HR_FDBWRM0_PORTMASK_SHIFT ;if (entry->is_obt) meta |=HR_FDBWRM0_OBT ; +if (entry->pass_blocked) + meta |=HR_FDBWRM0_PASS_BLOCKED ;if (entry->reprio_en) { meta |=HR_FDBWRM0_REPRIO_EN ; meta |= entry->reprio_tc <<HR_FDBWRM0_REPRIO_TC_SHIFT ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 248/846 net: dsa: hellcreek: Add STP forwarding rule
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit b7ade35eb53a2455f737a623c24e4b24455b2271 ]
Treat STP as management traffic. STP traffic is designated for the CPU port only. In addition, STP traffic has to pass blocked ports.
--- drivers/net/dsa/hirschmann/hellcreek.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/dsa/hirschmann/hellcreek.c +14 -0
@@ -1074,6 +1074,17 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1, }; +static struct hellcreek_fdb_entry stp = { +/* MAC: 01-80-C2-00-00-00 */ + .mac = {0x01 ,0x80 ,0xc2 ,0x00 ,0x00 ,0x00 }, + .portmask =0x03 ,/* Management ports */ + .age =0 , + .is_obt =0 , + .pass_blocked =1 , + .is_static =1 , + .reprio_tc =6 , + .reprio_en =1 , + };int ret;mutex_lock (&hellcreek->reg_lock);
@@ -1081,6 +1092,9 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)if (ret) goto out; ret =__hellcreek_fdb_add (hellcreek, &p2p); +if (ret) + goto out; + ret =__hellcreek_fdb_add (hellcreek, &stp); out:mutex_unlock (&hellcreek->reg_lock);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 249/846 net: dsa: hellcreek: Allow PTP P2P measurements on blocked ports
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit cad1798d2d0811ded37d1e946c6796102e58013b ]
Allow PTP peer delay measurements on blocked ports by STP. In case of topology changes the PTP stack can directly start with the correct delays.
--- drivers/net/dsa/hirschmann/hellcreek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/hirschmann/hellcreek.c +1 -1
@@ -1069,7 +1069,7 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .portmask = 0x03, /* Management ports */ .age = 0, .is_obt = 0, - .pass_blocked = 0, + .pass_blocked = 1, .is_static = 1, .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 250/846 net: dsa: hellcreek: Add missing PTP via UDP rules
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit 6cf01e451599da630ff1af529d61c5e4db4550ab ]
The switch supports PTP for UDP transport too. Therefore, add the missing static FDB entries to ensure correct forwarding of these packets.
--- drivers/net/dsa/hirschmann/hellcreek.c | 64 ++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 4 deletions(-)
drivers/net/dsa/hirschmann/hellcreek.c +60 -4
@@ -1052,7 +1052,7 @@ static void hellcreek_setup_tc_identity_mapping(struct hellcreek *hellcreek)static int hellcreek_setup_fdb (struct hellcreek *hellcreek) { -static struct hellcreek_fdb_entry ptp = { +static struct hellcreek_fdb_entry l2_ptp = {/* MAC: 01-1B-19-00-00-00 */ .mac = {0x01 ,0x1b ,0x19 ,0x00 ,0x00 ,0x00 }, .portmask =0x03 ,/* Management ports */
@@ -1063,7 +1063,29 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1, }; -static struct hellcreek_fdb_entry p2p = { +static struct hellcreek_fdb_entry udp4_ptp = { +/* MAC: 01-00-5E-00-01-81 */ + .mac = {0x01 ,0x00 ,0x5e ,0x00 ,0x01 ,0x81 }, + .portmask =0x03 ,/* Management ports */ + .age =0 , + .is_obt =0 , + .pass_blocked =0 , + .is_static =1 , + .reprio_tc =6 , + .reprio_en =1 , + }; +static struct hellcreek_fdb_entry udp6_ptp = { +/* MAC: 33-33-00-00-01-81 */ + .mac = {0x33 ,0x33 ,0x00 ,0x00 ,0x01 ,0x81 }, + .portmask =0x03 ,/* Management ports */ + .age =0 , + .is_obt =0 , + .pass_blocked =0 , + .is_static =1 , + .reprio_tc =6 , + .reprio_en =1 , + }; +static struct hellcreek_fdb_entry l2_p2p = {/* MAC: 01-80-C2-00-00-0E */ .mac = {0x01 ,0x80 ,0xc2 ,0x00 ,0x00 ,0x0e }, .portmask =0x03 ,/* Management ports */
@@ -1074,6 +1096,28 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek) .reprio_tc = 6, /* TC: 6 as per IEEE 802.1AS */ .reprio_en = 1, }; +static struct hellcreek_fdb_entry udp4_p2p = { +/* MAC: 01-00-5E-00-00-6B */ + .mac = {0x01 ,0x00 ,0x5e ,0x00 ,0x00 ,0x6b }, + .portmask =0x03 ,/* Management ports */ + .age =0 , + .is_obt =0 , + .pass_blocked =1 , + .is_static =1 , + .reprio_tc =6 , + .reprio_en =1 , + }; +static struct hellcreek_fdb_entry udp6_p2p = { +/* MAC: 33-33-00-00-00-6B */ + .mac = {0x33 ,0x33 ,0x00 ,0x00 ,0x00 ,0x6b }, + .portmask =0x03 ,/* Management ports */ + .age =0 , + .is_obt =0 , + .pass_blocked =1 , + .is_static =1 , + .reprio_tc =6 , + .reprio_en =1 , + };static struct hellcreek_fdb_entry stp = {/* MAC: 01-80-C2-00-00-00 */ .mac = {0x01 ,0x80 ,0xc2 ,0x00 ,0x00 ,0x00 },
@@ -1088,10 +1132,22 @@ static int hellcreek_setup_fdb(struct hellcreek *hellcreek)int ret;mutex_lock (&hellcreek->reg_lock); - ret =__hellcreek_fdb_add (hellcreek, &ptp); + ret =__hellcreek_fdb_add (hellcreek, &l2_ptp); +if (ret) + goto out; + ret =__hellcreek_fdb_add (hellcreek, &udp4_ptp); +if (ret) + goto out; + ret =__hellcreek_fdb_add (hellcreek, &udp6_ptp); +if (ret) + goto out; + ret =__hellcreek_fdb_add (hellcreek, &l2_p2p); +if (ret) + goto out; + ret =__hellcreek_fdb_add (hellcreek, &udp4_p2p);if (ret) goto out; - ret =__hellcreek_fdb_add (hellcreek, &p2p); + ret =__hellcreek_fdb_add (hellcreek, &udp6_p2p);if (ret) goto out; ret =__hellcreek_fdb_add (hellcreek, &stp);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 251/846 arm64: dts: qcom: c630: Fix soundcard setup
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit c02b360ca67ebeb9de07b47b2fe53f964c2561d1 ]
Currently Soundcard has 1 rx device for headset and SoundWire Speaker Playback.
This setup has issues, ex if we try to play on headset the audio stream is also sent to SoundWire Speakers and we will hear sound in both headsets and speakers.
Make a separate device for Speakers and Headset so that the streams are different and handled properly.
--- .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +27 -0
@@ -518,6 +518,10 @@ dai@1 { reg = <1>; }; + + dai@2 { + reg = <2>; + }; }; &sound {
@@ -530,6 +534,7 @@ "SpkrLeft IN", "SPK1 OUT", "SpkrRight IN", "SPK2 OUT", "MM_DL1", "MultiMedia1 Playback", + "MM_DL3", "MultiMedia3 Playback", "MultiMedia2 Capture", "MM_UL2"; mm1-dai-link {
@@ -546,6 +551,13 @@ }; }; + mm3-dai-link { + link-name = "MultiMedia3"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + slim-dai-link { link-name = "SLIM Playback"; cpu {
@@ -575,6 +587,21 @@ sound-dai = <&wcd9340 1>; }; }; + + slim-wcd-dai-link { + link-name = "SLIM WCD Playback"; + cpu { + sound-dai = <&q6afedai SLIMBUS_1_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <&wcd9340 2>; + }; + }; }; &tlmm {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 252/846 arm64: dts: qcom: ipq6018: Fix gpio-ranges property
In reply to Greg Kroah-HartmanFrom: Baruch Siach <[email protected]>
[ Upstream commit 72cb4c48a46a7cfa58eb5842c0d3672ddd5bd9ad ]
There must be three parameters in gpio-ranges property. Fixes this not very helpful error message:
OF: /soc/pinctrl@1000000: (null) = 3 found 3
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +1 -1
@@ -221,7 +221,7 @@ interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; #gpio-cells = <2>; - gpio-ranges = <&tlmm 0 80>; + gpio-ranges = <&tlmm 0 0 80>; interrupt-controller; #interrupt-cells = <2>;
Signature · 1 line
2.34.1