6.12.31-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainerPATCH 248/626 net: pktgen: fix mpls maximum labels list parsing
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Seiderer <[email protected]>
[ Upstream commit 2b15a0693f70d1e8119743ee89edbfb1271b3ea8 ]
Fix mpls maximum labels list parsing up to MAX_MPLS_LABELS entries (instead of up to MAX_MPLS_LABELS - 1).
Addresses the following:
$ echo "mpls 00000f00,00000f01,00000f02,00000f03,00000f04,00000f05,00000f06,00000f07,00000f08,00000f09,00000f0a,00000f0b,00000f0c,00000f0d,00000f0e,00000f0f" > /proc/net/pktgen/lo\@0 -bash: echo: write error: Argument list too long
--- net/core/pktgen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/core/pktgen.c +4 -2
@@ -898,6 +898,10 @@ static ssize_t get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev) pkt_dev->nr_labels =0 ; do { __u32 tmp; + + if (n >= MAX_MPLS_LABELS) + return -E2BIG; + len = hex32_arg(&buffer[i], 8, &tmp); if (len <= 0) return len;
@@ -909,8 +913,6 @@ static ssize_t get_labels(const char __user *buffer, struct pktgen_dev *pkt_dev)return -EFAULT ; i++; n++; -if (n >=MAX_MPLS_LABELS ) -return -E2BIG ; }while (c ==',' ); pkt_dev->nr_labels = n;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 249/626 perf/hw_breakpoint: Return EOPNOTSUPP for unsupported breakpoint type
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saket Kumar Bhaskar <[email protected]>
[ Upstream commit 061c991697062f3bf87b72ed553d1d33a0e370dd ]
Currently, __reserve_bp_slot() returns -ENOSPC for unsupported breakpoint types on the architecture. For example, powerpc does not support hardware instruction breakpoints. This causes the perf_skip BPF selftest to fail, as neither ENOENT nor EOPNOTSUPP is returned by perf_event_open for unsupported breakpoint types. As a result, the test that should be skipped for this arch is not correctly identified.
To resolve this, hw_breakpoint_event_init() should exit early by checking for unsupported breakpoint types using hw_breakpoint_slots_cached() and return the appropriate error (-EOPNOTSUPP).
--- kernel/events/hw_breakpoint.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/events/hw_breakpoint.c +3 -2
@@ -950,9 +950,10 @@ static int hw_breakpoint_event_init(struct perf_event *bp)return -ENOENT ;/* -* no branch sampling for breakpoint events +* Check if breakpoint type is supported before proceeding. +* Also, no branch sampling for breakpoint events. */ -if (has_branch_stack (bp)) +if (!hw_breakpoint_slots_cached (find_slot_idx (bp->attr.bp_type)) ||has_branch_stack (bp))return -EOPNOTSUPP ; err =register_perf_hw_breakpoint (bp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 250/626 ALSA: hda/realtek: Enable PC beep passthrough for HP EliteBook 855 G7
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej S. Szmigiero <[email protected]>
[ Upstream commit aa85822c611aef7cd4dc17d27121d43e21bb82f0 ]
PC speaker works well on this platform in BIOS and in Linux until sound card drivers are loaded. Then it stops working.
There seems to be a beep generator node at 0x1a in this CODEC (ALC269_TYPE_ALC215) but it seems to be only connected to capture mixers at nodes 0x22 and 0x23.
If I unmute the mixer input for 0x1a at node 0x23 and start recording from its "ALC285 Analog" capture device I can clearly hear beeps in that recording.
So the beep generator is indeed working properly, however I wasn't able to figure out any way to connect it to speakers.
However, the bits in the "Passthrough Control" register (0x36) seems to work at least partially: by zeroing "B" and "h" and setting "S" I can at least make the PIT PC speaker output appear either in this laptop speakers or headphones (depending on whether they are connected or not).
There are some caveats, however:
* If the CODEC gets runtime-suspended the beeps stop so it needs HDA beep device for keeping it awake during beeping.
* If the beep generator node is generating any beep the PC beep passthrough seems to be temporarily inhibited, so the HDA beep device has to be prevented from using the actual beep generator node - but the beep device is still necessary due to the previous point.
* In contrast with other platforms here beep amplification has to be disabled otherwise the beeps output are WAY louder than they were on pure BIOS setup.
Unless someone (from Realtek probably) knows how to make the beep generator node output appear in speakers / headphones using PC beep passthrough seems to be the only way to make PC speaker beeping actually work on this platform.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/hda_beep.c | 15 +++++++++------ sound/pci/hda/patch_realtek.c | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 7 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -195,6 +195,7 @@ struct hda_codec {/* beep device */ struct hda_beep *beep;unsigned int beep_mode; +bool beep_just_power_on;/* widget capabilities cache */ u32 *wcaps;
sound/pci/hda/hda_beep.c +9 -6
@@ -31,8 +31,9 @@ static void generate_tone(struct hda_beep *beep, int tone) beep->power_hook (beep, true); beep->playing =1 ; } -snd_hda_codec_write (codec, beep->nid,0 , -AC_VERB_SET_BEEP_CONTROL , tone); +if (!codec->beep_just_power_on) +snd_hda_codec_write (codec, beep->nid,0 , +AC_VERB_SET_BEEP_CONTROL , tone);if (!tone && beep->playing) { beep->playing =0 ;if (beep->power_hook)
@@ -212,10 +213,12 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)struct hda_beep *beep;int err; -if (!snd_hda_get_bool_hint (codec,"beep" )) -return 0 ;/* disabled explicitly by hints */ -if (codec->beep_mode ==HDA_BEEP_MODE_OFF ) -return 0 ;/* disabled by module option */ +if (!codec->beep_just_power_on) { +if (!snd_hda_get_bool_hint (codec,"beep" )) +return 0 ;/* disabled explicitly by hints */ +if (codec->beep_mode ==HDA_BEEP_MODE_OFF ) +return 0 ;/* disabled by module option */ + } beep =kzalloc (sizeof (*beep),GFP_KERNEL );if (beep ==NULL )
sound/pci/hda/patch_realtek.c +33 -1
@@ -28,6 +28,7 @@#include <sound/hda_codec.h> #include "hda_local.h" #include "hda_auto_parser.h" +#include "hda_beep.h" #include "hda_jack.h" #include "hda_generic.h" #include "hda_component.h"
@@ -7036,6 +7037,30 @@ static void alc285_fixup_hp_envy_x360(struct hda_codec *codec, } } +static void alc285_fixup_hp_beep (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { + codec->beep_just_power_on = true; + }else if (action ==HDA_FIXUP_ACT_INIT ) { +#ifdef CONFIG_SND_HDA_INPUT_BEEP +/* +* Just enable loopback to internal speaker and headphone jack. +* Disable amplification to get about the same beep volume as +* was on pure BIOS setup before loading the driver. +*/ +alc_update_coef_idx (codec,0x36 ,0x7070 ,BIT (13 )); + +snd_hda_enable_beep_device (codec,1 ); + +#if !IS_ENABLED (CONFIG_INPUT_PCSPKR ) +dev_warn_once (hda_codec_dev (codec), +"enable CONFIG_INPUT_PCSPKR to get PC beeps\n" ); +#endif +#endif + } +} +/* for hda_fixup_thinkpad_acpi() */ #include "thinkpad_helper.c"
@@ -7806,6 +7831,7 @@ enum {ALC285_FIXUP_HP_GPIO_LED ,ALC285_FIXUP_HP_MUTE_LED ,ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED , +ALC285_FIXUP_HP_BEEP_MICMUTE_LED ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ,ALC236_FIXUP_HP_GPIO_LED , ALC236_FIXUP_HP_MUTE_LED,
@@ -9395,6 +9421,12 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_hp_spectre_x360_mute_led, }, + [ALC285_FIXUP_HP_BEEP_MICMUTE_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_hp_beep, + .chained = true, + .chain_id = ALC285_FIXUP_HP_MUTE_LED, + }, [ALC236_FIXUP_HP_MUTE_LED_COEFBIT2] = { .type = HDA_FIXUP_FUNC, .v.func = alc236_fixup_hp_mute_led_coefbit2,
@@ -10493,7 +10525,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x8730 ,"HP ProBook 445 G7" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8735 ,"HP ProBook 435 G7" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8736 ,"HP" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ), -SND_PCI_QUIRK (0x103c ,0x8760 ,"HP" ,ALC285_FIXUP_HP_MUTE_LED ), +SND_PCI_QUIRK (0x103c ,0x8760 ,"HP EliteBook 8{4,5}5 G7" ,ALC285_FIXUP_HP_BEEP_MICMUTE_LED ),SND_PCI_QUIRK (0x103c ,0x876e ,"HP ENVY x360 Convertible 13-ay0xxx" ,ALC245_FIXUP_HP_X360_MUTE_LEDS ),SND_PCI_QUIRK (0x103c ,0x877a ,"HP" ,ALC285_FIXUP_HP_MUTE_LED ), SND_PCI_QUIRK(0x103c, 0x877d, "HP", ALC236_FIXUP_HP_MUTE_LED),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 251/626 scsi: logging: Fix scsi_logging_level bounds
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Bouchinet <[email protected]>
[ Upstream commit 2cef5b4472c602e6c5a119aca869d9d4050586f3 ]
Bound scsi_logging_level sysctl writings between SYSCTL_ZERO and SYSCTL_INT_MAX.
The proc_handler has thus been updated to proc_dointvec_minmax.
--- drivers/scsi/scsi_sysctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/scsi_sysctl.c +3 -1
@@ -17,7 +17,9 @@ static struct ctl_table scsi_table[] = { .data = &scsi_logging_level, .maxlen = sizeof(scsi_logging_level), .mode = 0644, - .proc_handler = proc_dointvec }, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_INT_MAX }, };static struct ctl_table_header *scsi_table_header;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 252/626 ipv4: fib: Move fib_valid_key_len() to rtm_to_fib_config().
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 254ba7e6032d3fc738050d500b0c1d8197af90ca ]
fib_valid_key_len() is called in the beginning of fib_table_insert() or fib_table_delete() to check if the prefix length is valid.
fib_table_insert() and fib_table_delete() are called from 3 paths
- ip_rt_ioctl()
- inet_rtm_newroute() / inet_rtm_delroute()
- fib_magic()
In the first ioctl() path, rtentry_to_fib_config() checks the prefix length with bad_mask(). Also, fib_magic() always passes the correct
prefix: 32 or ifa->ifa_prefixlen, which is already validated.
Let's move fib_valid_key_len() to the rtnetlink path, rtm_to_fib_config().
While at it, 2 direct returns in rtm_to_fib_config() are changed to goto to match other places in the same function
--- net/ipv4/fib_frontend.c | 18 ++++++++++++++++-- net/ipv4/fib_trie.c | 22 ---------------------- 2 files changed, 16 insertions(+), 24 deletions(-)
net/ipv4/fib_frontend.c +16 -2
@@ -829,19 +829,33 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb, } } +if (cfg->fc_dst_len >32 ) { +NL_SET_ERR_MSG (extack,"Invalid prefix length" ); + err = -EINVAL ; + goto errout; + } + +if (cfg->fc_dst_len <32 && (ntohl (cfg->fc_dst) << cfg->fc_dst_len)) { +NL_SET_ERR_MSG (extack,"Invalid prefix for given prefix length" ); + err = -EINVAL ; + goto errout; + } +if (cfg->fc_nh_id) {if (cfg->fc_oif || cfg->fc_gw_family || cfg->fc_encap || cfg->fc_mp) {NL_SET_ERR_MSG (extack,"Nexthop specification and nexthop id are mutually exclusive" ); -return -EINVAL ; + err = -EINVAL ; + goto errout; } }if (has_gw && has_via) {NL_SET_ERR_MSG (extack,"Nexthop configuration can not contain both GATEWAY and VIA" ); -return -EINVAL ; + err = -EINVAL ; + goto errout; }if (!cfg->fc_table)
net/ipv4/fib_trie.c +0 -22
@@ -1193,22 +1193,6 @@ static int fib_insert_alias(struct trie *t, struct key_vector *tp,return 0 ; } -static bool fib_valid_key_len (u32 key,u8 plen,struct netlink_ext_ack *extack) -{ -if (plen >KEYLENGTH ) { -NL_SET_ERR_MSG (extack,"Invalid prefix length" ); -return false; - } - -if ((plen <KEYLENGTH ) && (key << plen)) { -NL_SET_ERR_MSG (extack, -"Invalid prefix for given prefix length" ); -return false; - } - -return true; -} -static void fib_remove_alias (struct trie *t,struct key_vector *tp,struct key_vector *l,struct fib_alias *old);
@@ -1229,9 +1213,6 @@ int fib_table_insert(struct net *net, struct fib_table *tb, key =ntohl (cfg->fc_dst); -if (!fib_valid_key_len (key, plen, extack)) -return -EINVAL ; -pr_debug ("Insert table=%u %08x/%d\n" , tb->tb_id, key, plen); fi =fib_create_info (cfg, extack);
@@ -1723,9 +1704,6 @@ int fib_table_delete(struct net *net, struct fib_table *tb, key =ntohl (cfg->fc_dst); -if (!fib_valid_key_len (key, plen, extack)) -return -EINVAL ; - l =fib_find_node (t, &tp, key);if (!l)return -ESRCH ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 253/626 drm/rockchip: vop2: Add uv swap for cluster window
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit e7aae9f6d762139f8d2b86db03793ae0ab3dd802 ]
The Cluster windows of upcoming VOP on rk3576 also support linear YUV support, we need to set uv swap bit for it.
As the VOP2_WIN_UV_SWA register defined on rk3568/rk3588 is 0xffffffff, so this register will not be touched on these two platforms.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +2 -4
@@ -1432,10 +1432,8 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, rb_swap =vop2_win_rb_swap (fb->format->format);vop2_win_write (win,VOP2_WIN_RB_SWAP , rb_swap); -if (!vop2_cluster_window (win)) { - uv_swap =vop2_win_uv_swap (fb->format->format); -vop2_win_write (win,VOP2_WIN_UV_SWAP , uv_swap); - } + uv_swap =vop2_win_uv_swap (fb->format->format); +vop2_win_write (win,VOP2_WIN_UV_SWAP , uv_swap);if (fb->format->is_yuv) {vop2_win_write (win,VOP2_WIN_UV_VIR ,DIV_ROUND_UP (fb->pitches[1 ],4 ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 254/626 block: mark bounce buffering as incompatible with integrity
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 5fd0268a8806d35dcaf89139bfcda92be51b2b2f ]
None of the few drivers still using the legacy block layer bounce buffering support integrity metadata. Explicitly mark the features as incompatible and stop creating the slab and mempool for integrity buffers for the bounce bio_set.
--- block/blk-settings.c | 5 +++++ block/bounce.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-)
block/blk-settings.c +5 -0
@@ -124,6 +124,11 @@ static int blk_validate_integrity_limits(struct queue_limits *lim)return 0 ; } +if (lim->features &BLK_FEAT_BOUNCE_HIGH ) { +pr_warn ("no bounce buffer support for integrity metadata\n" ); +return -EINVAL ; + } +if (!IS_ENABLED (CONFIG_BLK_DEV_INTEGRITY )) {pr_warn ("integrity support disabled.\n" );return -EINVAL ;
block/bounce.c +0 -2
@@ -41,8 +41,6 @@ static void init_bounce_bioset(void) ret =bioset_init (&bounce_bio_set,BIO_POOL_SIZE ,0 ,BIOSET_NEED_BVECS );BUG_ON (ret); -if (bioset_integrity_create (&bounce_bio_set,BIO_POOL_SIZE )) -BUG_ON (1 ); ret =bioset_init (&bounce_bio_split,BIO_POOL_SIZE ,0 ,0 );BUG_ON (ret);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 255/626 ublk: complete command synchronously on error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Caleb Sander Mateos <[email protected]>
[ Upstream commit 603f9be21c1894e462416e3324962d6c9c2b95f8 ]
In case of an error, ublk's ->uring_cmd() functions currently return -EIOCBQUEUED and immediately call io_uring_cmd_done(). -EIOCBQUEUED and io_uring_cmd_done() are intended for asynchronous completions. For synchronous completions, the ->uring_cmd() function can just return the negative return code directly. This skips io_uring_cmd_del_cancelable(), and deferring the completion to task work. So return the error code directly from __ublk_ch_uring_cmd() and ublk_ctrl_uring_cmd().
Update ublk_ch_uring_cmd_cb(), which currently ignores the return value from __ublk_ch_uring_cmd(), to call io_uring_cmd_done() for synchronous completions.
--- drivers/block/ublk_drv.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/block/ublk_drv.c +6 -5
@@ -1881,10 +1881,9 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,return -EIOCBQUEUED ; out: -io_uring_cmd_done (cmd, ret,0 , issue_flags);pr_devel ("%s: complete: cmd op %d, tag %d ret %x io_flags %x\n" , __func__, cmd_op, tag, ret, io->flags); -return -EIOCBQUEUED ; +return ret; } static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
@@ -1940,7 +1939,10 @@ static inline int ublk_ch_uring_cmd_local(struct io_uring_cmd *cmd,static void ublk_ch_uring_cmd_cb (struct io_uring_cmd *cmd,unsigned int issue_flags) { -ublk_ch_uring_cmd_local (cmd, issue_flags); +int ret =ublk_ch_uring_cmd_local (cmd, issue_flags); + +if (ret != -EIOCBQUEUED ) +io_uring_cmd_done (cmd, ret,0 , issue_flags); }static int ublk_ch_uring_cmd (struct io_uring_cmd *cmd,unsigned int issue_flags)
@@ -3065,10 +3067,9 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,if (ub)ublk_put_device (ub); out: -io_uring_cmd_done (cmd, ret,0 , issue_flags);pr_devel ("%s: cmd done ret %d cmd_op %x, dev id %d qid %d\n" , __func__, ret, cmd->cmd_op, header->dev_id, header->queue_id); -return -EIOCBQUEUED ; +return ret; }static const struct file_operations ublk_ctl_fops = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 256/626 media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 990262fdfce24d6055df9711424343d94d829e6a ]
Do not process unknown data types.
--- drivers/media/usb/uvc/uvc_v4l2.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/usb/uvc/uvc_v4l2.c +6 -0
@@ -106,6 +106,12 @@ static int uvc_ioctl_xu_ctrl_map(struct uvc_video_chain *chain,struct uvc_control_mapping *map;int ret; +if (xmap->data_type >UVC_CTRL_DATA_TYPE_BITMASK ) { +uvc_dbg (chain->dev,CONTROL , +"Unsupported UVC data type %u\n" , xmap->data_type); +return -EINVAL ; + } + map =kzalloc (sizeof (*map),GFP_KERNEL );if (map ==NULL )return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 257/626 media: uvcvideo: Handle uvc menu translation inside uvc_get_le_value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 9109a0b4cb10fd681e9c6e9a4497a6fec5b91c39 ]
map->get() gets a value from an uvc_control in "UVC format" and converts it to a value that can be consumed by v4l2.
Instead of using a special get function for V4L2_CTRL_TYPE_MENU, we were converting from uvc_get_le_value in two different places.
Move the conversion to uvc_get_le_value().
--- drivers/media/usb/uvc/uvc_ctrl.c | 77 +++++++++++++------------------- 1 file changed, 32 insertions(+), 45 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +32 -45
@@ -862,6 +862,25 @@ static inline void uvc_clear_bit(u8 *data, int bit) data[bit >>3 ] &= ~(1 << (bit &7 )); } +static s32 uvc_menu_to_v4l2_menu (struct uvc_control_mapping *mapping,s32 val) +{ +unsigned int i; + +for (i =0 ;BIT (i) <= mapping->menu_mask; ++i) { +u32 menu_value; + +if (!test_bit (i, &mapping->menu_mask)) +continue ; + + menu_value =uvc_mapping_get_menu_value (mapping, i); + +if (menu_value == val) +return i; + } + +return val; +} +/* * Extract the bit string specified by mapping->offset and mapping->size * from the little-endian data stored at 'data' and return the result as
@@ -896,6 +915,16 @@ static s32 uvc_get_le_value(struct uvc_control_mapping *mapping,if (mapping->data_type ==UVC_CTRL_DATA_TYPE_SIGNED ) value |= -(value & (1 << (mapping->size -1 ))); +/* If it is a menu, convert from uvc to v4l2. */ +if (mapping->v4l2_type !=V4L2_CTRL_TYPE_MENU ) +return value; + +switch (query) { +case UVC_GET_CUR : +case UVC_GET_DEF : +return uvc_menu_to_v4l2_menu (mapping, value); + } +return value; }
@@ -1060,32 +1089,6 @@ static int uvc_ctrl_populate_cache(struct uvc_video_chain *chain,return 0 ; } -static s32 __uvc_ctrl_get_value (struct uvc_control_mapping *mapping, -const u8 *data) -{ -s32 value = mapping->get (mapping,UVC_GET_CUR , data); - -if (mapping->v4l2_type ==V4L2_CTRL_TYPE_MENU ) { -unsigned int i; - -for (i =0 ;BIT (i) <= mapping->menu_mask; ++i) { -u32 menu_value; - -if (!test_bit (i, &mapping->menu_mask)) -continue ; - - menu_value =uvc_mapping_get_menu_value (mapping, i); - -if (menu_value == value) { - value = i; -break ; - } - } - } - -return value; -} -static int __uvc_ctrl_load_cur (struct uvc_video_chain *chain,struct uvc_control *ctrl) {
@@ -1136,8 +1139,8 @@ static int __uvc_ctrl_get(struct uvc_video_chain *chain,if (ret <0 )return ret; - *value =__uvc_ctrl_get_value (mapping, -uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT )); + *value = mapping->get (mapping,UVC_GET_CUR , +uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT ));return 0 ; }
@@ -1287,7 +1290,6 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, {struct uvc_control_mapping *master_map =NULL ;struct uvc_control *master_ctrl =NULL ; -unsigned int i;memset (v4l2_ctrl,0 ,sizeof (*v4l2_ctrl)); v4l2_ctrl->id = mapping->id;
@@ -1330,21 +1332,6 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, v4l2_ctrl->minimum =ffs (mapping->menu_mask) -1 ; v4l2_ctrl->maximum =fls (mapping->menu_mask) -1 ; v4l2_ctrl->step =1 ; - -for (i =0 ;BIT (i) <= mapping->menu_mask; ++i) { -u32 menu_value; - -if (!test_bit (i, &mapping->menu_mask)) -continue ; - - menu_value =uvc_mapping_get_menu_value (mapping, i); - -if (menu_value == v4l2_ctrl->default_value) { - v4l2_ctrl->default_value = i; -break ; - } - } -return 0 ;case V4L2_CTRL_TYPE_BOOLEAN :
@@ -1627,7 +1614,7 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain,uvc_ctrl_set_handle (handle, ctrl,NULL );list_for_each_entry (mapping, &ctrl->info.mappings, list) { -s32 value =__uvc_ctrl_get_value (mapping, data); +s32 value = mapping->get (mapping,UVC_GET_CUR , data);/* * handle may be NULL here if the device sends auto-update
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 258/626 clk: imx8mp: inform CCF of maximum frequency of clocks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit 06a61b5cb6a8638fa8823cd09b17233b29696fa2 ]
The IMX8MPCEC datasheet lists maximum frequencies allowed for different modules. Some of these limits are universal, but some depend on whether the SoC is operating in nominal or in overdrive mode.
The imx8mp.dtsi currently assumes overdrive mode and configures some clocks in accordance with this. Boards wishing to make use of nominal mode will need to override some of the clock rates manually.
As operating the clocks outside of their allowed range can lead to difficult to debug issues, it makes sense to register the maximum rates allowed in the driver, so the CCF can take them into account.
--- drivers/clk/imx/clk-imx8mp.c | 151 +++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+)
drivers/clk/imx/clk-imx8mp.c +151 -0
@@ -8,6 +8,7 @@#include <linux/err.h> #include <linux/io.h> #include <linux/module.h> +#include <linux/units.h> #include <linux/of_address.h> #include <linux/platform_device.h> #include <linux/slab.h>
@@ -406,11 +407,151 @@ static const char * const imx8mp_clkout_sels[] = {"audio_pll1_out", "audio_pll2_static struct clk_hw **hws;static struct clk_hw_onecell_data *clk_hw_data; +struct imx8mp_clock_constraints { +unsigned int clkid; +u32 maxrate; +}; + +/* +* Below tables are taken from IMX8MPCEC Rev. 2.1, 07/2023 +* Table 13. Maximum frequency of modules. +* Probable typos fixed are marked with a comment. +*/ +static const struct imx8mp_clock_constraints imx8mp_clock_common_constraints[] = { + {IMX8MP_CLK_A53_DIV ,1000 *HZ_PER_MHZ }, + {IMX8MP_CLK_ENET_AXI ,266666667 },/* Datasheet claims 266MHz */ + {IMX8MP_CLK_NAND_USDHC_BUS ,266666667 },/* Datasheet claims 266MHz */ + {IMX8MP_CLK_MEDIA_APB ,200 *HZ_PER_MHZ }, + {IMX8MP_CLK_HDMI_APB ,133333333 },/* Datasheet claims 133MHz */ + {IMX8MP_CLK_ML_AXI ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_AHB ,133333333 }, + {IMX8MP_CLK_IPG_ROOT ,66666667 }, + {IMX8MP_CLK_AUDIO_AHB ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_DISP2_PIX ,170 *HZ_PER_MHZ }, + {IMX8MP_CLK_DRAM_ALT ,666666667 }, + {IMX8MP_CLK_DRAM_APB ,200 *HZ_PER_MHZ }, + {IMX8MP_CLK_CAN1 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_CAN2 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_PCIE_AUX ,10 *HZ_PER_MHZ }, + {IMX8MP_CLK_I2C5 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_I2C6 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_SAI1 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_SAI2 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_SAI3 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_SAI5 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_SAI6 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_ENET_QOS ,125 *HZ_PER_MHZ }, + {IMX8MP_CLK_ENET_QOS_TIMER ,200 *HZ_PER_MHZ }, + {IMX8MP_CLK_ENET_REF ,125 *HZ_PER_MHZ }, + {IMX8MP_CLK_ENET_TIMER ,125 *HZ_PER_MHZ }, + {IMX8MP_CLK_ENET_PHY_REF ,125 *HZ_PER_MHZ }, + {IMX8MP_CLK_NAND ,500 *HZ_PER_MHZ }, + {IMX8MP_CLK_QSPI ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_USDHC1 ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_USDHC2 ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_I2C1 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_I2C2 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_I2C3 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_I2C4 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_UART1 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_UART2 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_UART3 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_UART4 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_ECSPI1 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_ECSPI2 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_PWM1 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_PWM2 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_PWM3 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_PWM4 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_GPT1 ,100 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPT2 ,100 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPT3 ,100 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPT4 ,100 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPT5 ,100 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPT6 ,100 *HZ_PER_MHZ }, + {IMX8MP_CLK_WDOG ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_IPP_DO_CLKO1 ,200 *HZ_PER_MHZ }, + {IMX8MP_CLK_IPP_DO_CLKO2 ,200 *HZ_PER_MHZ }, + {IMX8MP_CLK_HDMI_REF_266M ,266 *HZ_PER_MHZ }, + {IMX8MP_CLK_USDHC3 ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_MIPI_PHY1_REF ,300 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_DISP1_PIX ,250 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_CAM2_PIX ,277 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_LDB ,595 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_MIPI_TEST_BYTE ,200 *HZ_PER_MHZ }, + {IMX8MP_CLK_ECSPI3 ,80 *HZ_PER_MHZ }, + {IMX8MP_CLK_PDM ,200 *HZ_PER_MHZ }, + {IMX8MP_CLK_SAI7 ,66666667 },/* Datasheet claims 66MHz */ + {IMX8MP_CLK_MAIN_AXI ,400 *HZ_PER_MHZ }, + {/* Sentinel */ } +}; + +static const struct imx8mp_clock_constraints imx8mp_clock_nominal_constraints[] = { + {IMX8MP_CLK_M7_CORE ,600 *HZ_PER_MHZ }, + {IMX8MP_CLK_ML_CORE ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU3D_CORE ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU3D_SHADER_CORE ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU2D_CORE ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_AUDIO_AXI_SRC ,600 *HZ_PER_MHZ }, + {IMX8MP_CLK_HSIO_AXI ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_ISP ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_BUS ,600 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_AXI ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_HDMI_AXI ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU_AXI ,600 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU_AHB ,300 *HZ_PER_MHZ }, + {IMX8MP_CLK_NOC ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_NOC_IO ,600 *HZ_PER_MHZ }, + {IMX8MP_CLK_ML_AHB ,300 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_G1 ,600 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_G2 ,500 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_CAM1_PIX ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_VC8000E ,400 *HZ_PER_MHZ },/* Datasheet claims 500MHz */ + {IMX8MP_CLK_DRAM_CORE ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_GIC ,400 *HZ_PER_MHZ }, + {/* Sentinel */ } +}; + +static const struct imx8mp_clock_constraints imx8mp_clock_overdrive_constraints[] = { + {IMX8MP_CLK_M7_CORE ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_ML_CORE ,1000 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU3D_CORE ,1000 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU3D_SHADER_CORE ,1000 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU2D_CORE ,1000 *HZ_PER_MHZ }, + {IMX8MP_CLK_AUDIO_AXI_SRC ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_HSIO_AXI ,500 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_ISP ,500 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_BUS ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_AXI ,500 *HZ_PER_MHZ }, + {IMX8MP_CLK_HDMI_AXI ,500 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU_AXI ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_GPU_AHB ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_NOC ,1000 *HZ_PER_MHZ }, + {IMX8MP_CLK_NOC_IO ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_ML_AHB ,400 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_G1 ,800 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_G2 ,700 *HZ_PER_MHZ }, + {IMX8MP_CLK_MEDIA_CAM1_PIX ,500 *HZ_PER_MHZ }, + {IMX8MP_CLK_VPU_VC8000E ,500 *HZ_PER_MHZ },/* Datasheet claims 400MHz */ + {IMX8MP_CLK_DRAM_CORE ,1000 *HZ_PER_MHZ }, + {IMX8MP_CLK_GIC ,500 *HZ_PER_MHZ }, + {/* Sentinel */ } +}; + +static void imx8mp_clocks_apply_constraints (const struct imx8mp_clock_constraints constraints[]) +{ +const struct imx8mp_clock_constraints *constr; + +for (constr = constraints; constr->clkid; constr++) +clk_hw_set_rate_range (hws[constr->clkid],0 , constr->maxrate); +} +static int imx8mp_clocks_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct device_node *np;void __iomem *anatop_base, *ccm_base; +const char *opmode;int err; np =of_find_compatible_node (NULL ,NULL ,"fsl,imx8mp-anatop" );
@@ -715,6 +856,16 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)imx_check_clk_hws (hws,IMX8MP_CLK_END ); +imx8mp_clocks_apply_constraints (imx8mp_clock_common_constraints); + + err =of_property_read_string (np,"fsl,operating-mode" , &opmode); +if (!err) { +if (!strcmp (opmode,"nominal" )) +imx8mp_clocks_apply_constraints (imx8mp_clock_nominal_constraints); +else if (!strcmp (opmode,"overdrive" )) +imx8mp_clocks_apply_constraints (imx8mp_clock_overdrive_constraints); + } + err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, clk_hw_data);if (err <0 ) {dev_err (dev,"failed to register hws for i.MX8MP\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 259/626 x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 98fdaeb296f51ef08e727a7cc72e5b5c864c4f4d ]
Change the default value of spectre v2 in user mode to respect the CONFIG_MITIGATION_SPECTRE_V2 config option.
Currently, user mode spectre v2 is set to auto
(SPECTRE_V2_USER_CMD_AUTO) by default, even ifCONFIG_MITIGATION_SPECTRE_V2 is disabled.
Set the spectre_v2 value to auto (SPECTRE_V2_USER_CMD_AUTO) if the Spectre v2 config (CONFIG_MITIGATION_SPECTRE_V2) is enabled, otherwise set the value to none (SPECTRE_V2_USER_CMD_NONE).
Important to say the command line argument "spectre_v2_user" overwrites the default value in both cases.
When CONFIG_MITIGATION_SPECTRE_V2 is not set, users have the flexibility to opt-in for specific mitigations independently. In this scenario, setting spectre_v2= will not enable spectre_v2_user=, and command line options spectre_v2_user and spectre_v2 are independent when CONFIG_MITIGATION_SPECTRE_V2=n.
--- Documentation/admin-guide/kernel-parameters.txt | 2 ++ arch/x86/kernel/cpu/bugs.c | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +2 -0
@@ -6261,6 +6261,8 @@ Selecting 'on' will also enable the mitigation against user space to user space task attacks. + Selecting specific mitigation does not force enable + user mitigations. Selecting 'off' will disable both the kernel and the user space protections.
arch/x86/kernel/cpu/bugs.c +7 -3
@@ -1442,9 +1442,13 @@ static __ro_after_init enum spectre_v2_mitigation_cmd spectre_v2_cmd;static enum spectre_v2_user_cmd __init spectre_v2_parse_user_cmdline (void ) { +enum spectre_v2_user_cmd mode;char arg[20 ];int ret, i; + mode =IS_ENABLED (CONFIG_MITIGATION_SPECTRE_V2 ) ? +SPECTRE_V2_USER_CMD_AUTO :SPECTRE_V2_USER_CMD_NONE ; +switch (spectre_v2_cmd) {case SPECTRE_V2_CMD_NONE :return SPECTRE_V2_USER_CMD_NONE ;
@@ -1457,7 +1461,7 @@ spectre_v2_parse_user_cmdline(void) ret =cmdline_find_option (boot_command_line,"spectre_v2_user" , arg,sizeof (arg));if (ret <0 ) -return SPECTRE_V2_USER_CMD_AUTO ; +return mode;for (i =0 ; i <ARRAY_SIZE (v2_user_options); i++) {if (match_option (arg, ret, v2_user_options[i].option)) {
@@ -1467,8 +1471,8 @@ spectre_v2_parse_user_cmdline(void) } } -pr_err ("Unknown user space protection option (%s). Switching to AUTO select\n" , arg); -return SPECTRE_V2_USER_CMD_AUTO ; +pr_err ("Unknown user space protection option (%s). Switching to default\n" , arg); +return mode; }static inline bool spectre_v2_in_ibrs_mode (enum spectre_v2_mitigation mode)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 260/626 hwmon: (gpio-fan) Add missing mutex locks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
[ Upstream commit 9fee7d19bab635f89223cc40dfd2c8797fdc4988 ]
set_fan_speed() is expected to be called with fan_data->lock being locked. Add locking for proper synchronization.
--- drivers/hwmon/gpio-fan.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/hwmon/gpio-fan.c +15 -1
@@ -393,7 +393,12 @@ static int gpio_fan_set_cur_state(struct thermal_cooling_device *cdev,if (state >= fan_data->num_speed)return -EINVAL ; +mutex_lock (&fan_data->lock); +set_fan_speed (fan_data, state); + +mutex_unlock (&fan_data->lock); +return 0 ; }
@@ -489,7 +494,11 @@ MODULE_DEVICE_TABLE(of, of_gpio_fan_match);static void gpio_fan_stop (void *data) { +struct gpio_fan_data *fan_data = data; + +mutex_lock (&fan_data->lock);set_fan_speed (data,0 ); +mutex_unlock (&fan_data->lock); }static int gpio_fan_probe (struct platform_device *pdev)
@@ -562,7 +571,9 @@ static int gpio_fan_suspend(struct device *dev)if (fan_data->gpios) { fan_data->resume_speed = fan_data->speed_index; +mutex_lock (&fan_data->lock);set_fan_speed (fan_data,0 ); +mutex_unlock (&fan_data->lock); }return 0 ;
@@ -572,8 +583,11 @@ static int gpio_fan_resume(struct device *dev) {struct gpio_fan_data *fan_data =dev_get_drvdata (dev); -if (fan_data->gpios) +if (fan_data->gpios) { +mutex_lock (&fan_data->lock);set_fan_speed (fan_data, fan_data->resume_speed); +mutex_unlock (&fan_data->lock); + }return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 261/626 ARM: at91: pm: fix at91_suspend_finish for ZQ calibration
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Bin <[email protected]>
[ Upstream commit bc4722c3598d0e2c2dbf9609a3d3198993093e2b ]
For sama7g5 and sama7d65 backup mode, we encountered a "ZQ calibrate error" during recalibrating the impedance in BootStrap.
We found that the impedance value saved in at91_suspend_finish() before the DDR entered self-refresh mode did not match the resistor values. The ZDATA field in the DDR3PHY_ZQ0CR0 register uses a modified gray code to select the different impedance setting.
But these gray code are incorrect, a workaournd from design team fixed the bug in the calibration logic. The ZDATA contains four independent impedance elements, but the algorithm combined the four elements into one. The elements were fixed using properly shifted offsets.
--- arch/arm/mach-at91/pm.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
arch/arm/mach-at91/pm.c +11 -10
@@ -545,11 +545,12 @@ extern u32 at91_pm_suspend_in_sram_sz;static int at91_suspend_finish (unsigned long val) { -unsigned char modified_gray_code[] = { -0x00 ,0x01 ,0x02 ,0x03 ,0x06 ,0x07 ,0x04 ,0x05 ,0x0c ,0x0d , -0x0e ,0x0f ,0x0a ,0x0b ,0x08 ,0x09 ,0x18 ,0x19 ,0x1a ,0x1b , -0x1e ,0x1f ,0x1c ,0x1d ,0x14 ,0x15 ,0x16 ,0x17 ,0x12 ,0x13 , -0x10 ,0x11 , +/* SYNOPSYS workaround to fix a bug in the calibration logic */ +unsigned char modified_fix_code[] = { +0x00 ,0x01 ,0x01 ,0x06 ,0x07 ,0x0c ,0x06 ,0x07 ,0x0b ,0x18 , +0x0a ,0x0b ,0x0c ,0x0d ,0x0d ,0x0a ,0x13 ,0x13 ,0x12 ,0x13 , +0x14 ,0x15 ,0x15 ,0x12 ,0x18 ,0x19 ,0x19 ,0x1e ,0x1f ,0x14 , +0x1e ,0x1f , };unsigned int tmp, index;int i;
@@ -560,25 +561,25 @@ static int at91_suspend_finish(unsigned long val)* restore the ZQ0SR0 with the value saved here. But the * calibration is buggy and restoring some values from ZQ0SR0 * is forbidden and risky thus we need to provide processed -* values for these (modified gray code values). +* values for these. */ tmp =readl (soc_pm.data.ramc_phy +DDR3PHY_ZQ0SR0 );/* Store pull-down output impedance select. */ index = (tmp >>DDR3PHY_ZQ0SR0_PDO_OFF ) &0x1f ; - soc_pm.bu->ddr_phy_calibration[0 ] = modified_gray_code[index]; + soc_pm.bu->ddr_phy_calibration[0 ] = modified_fix_code[index] <<DDR3PHY_ZQ0SR0_PDO_OFF ;/* Store pull-up output impedance select. */ index = (tmp >>DDR3PHY_ZQ0SR0_PUO_OFF ) &0x1f ; - soc_pm.bu->ddr_phy_calibration[0 ] |= modified_gray_code[index]; + soc_pm.bu->ddr_phy_calibration[0 ] |= modified_fix_code[index] <<DDR3PHY_ZQ0SR0_PUO_OFF ;/* Store pull-down on-die termination impedance select. */ index = (tmp >>DDR3PHY_ZQ0SR0_PDODT_OFF ) &0x1f ; - soc_pm.bu->ddr_phy_calibration[0 ] |= modified_gray_code[index]; + soc_pm.bu->ddr_phy_calibration[0 ] |= modified_fix_code[index] <<DDR3PHY_ZQ0SR0_PDODT_OFF ;/* Store pull-up on-die termination impedance select. */ index = (tmp >>DDR3PHY_ZQ0SRO_PUODT_OFF ) &0x1f ; - soc_pm.bu->ddr_phy_calibration[0 ] |= modified_gray_code[index]; + soc_pm.bu->ddr_phy_calibration[0 ] |= modified_fix_code[index] <<DDR3PHY_ZQ0SRO_PUODT_OFF ;/* * The 1st 8 words of memory might get corrupted in the process
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 262/626 drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 8c9da7cd0bbcc90ab444454fecf535320456a312 ]
In preparation for adding support for newer DPI instances which do support direct-pin but do not have any H_FRE_CON register, like the one found in MT8195 and MT8188, add a branch to check if the reg_h_fre_con variable was declared in the mtk_dpi_conf structure for the probed SoC DPI version.
As a note, this is useful specifically only for cases in which the support_direct_pin variable is true, so mt8195-dpintf is not affected by any issue.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +3 -2
@@ -410,12 +410,13 @@ static void mtk_dpi_config_swap_input(struct mtk_dpi *dpi, bool enable)static void mtk_dpi_config_2n_h_fre (struct mtk_dpi *dpi) { -mtk_dpi_mask (dpi, dpi->conf->reg_h_fre_con,H_FRE_2N ,H_FRE_2N ); +if (dpi->conf->reg_h_fre_con) +mtk_dpi_mask (dpi, dpi->conf->reg_h_fre_con,H_FRE_2N ,H_FRE_2N ); }static void mtk_dpi_config_disable_edge (struct mtk_dpi *dpi) { -if (dpi->conf->edge_sel_en) +if (dpi->conf->edge_sel_en && dpi->conf->reg_h_fre_con)mtk_dpi_mask (dpi, dpi->conf->reg_h_fre_con,0 ,EDGE_SEL_EN ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 263/626 fpga: altera-cvp: Increase credit timeout
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuhanh Murugasen Krishnan <[email protected]>
[ Upstream commit 0f05886a40fdc55016ba4d9ae0a9c41f8312f15b ]
Increase the timeout for SDM (Secure device manager) data credits from 20ms to 40ms. Internal stress tests running at 500 loops failed with the current timeout of 20ms. At the start of a FPGA configuration, the CVP host driver reads the transmit credits from SDM. It then sends bitstream FPGA data to SDM based on the total credits. Each credit allows the CVP host driver to send 4kBytes of data. There are situations whereby, the SDM did not respond in time during testing.
--- drivers/fpga/altera-cvp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/altera-cvp.c +1 -1
@@ -52,7 +52,7 @@/* V2 Defines */ #define VSE_CVP_TX_CREDITS 0x49/* 8bit */ -#define V2_CREDIT_TIMEOUT_US 20000 +#define V2_CREDIT_TIMEOUT_US 40000#define V2_CHECK_CREDIT_US 10#define V2_POLL_TIMEOUT_US 1000000#define V2_USER_TIMEOUT_US 500000
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 264/626 perf: arm_pmuv3: Call kvm_vcpu_pmu_resync_el0() before enabling counters
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring (Arm) <[email protected]>
[ Upstream commit 04bd15c4cbc3f7bd2399d1baab958c5e738dbfc9 ]
Counting events related to setup of the PMU is not desired, but kvm_vcpu_pmu_resync_el0() is called just after the PMU counters have been enabled. Move the call to before enabling the counters.
--- drivers/perf/arm_pmuv3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/perf/arm_pmuv3.c +2 -2
@@ -816,10 +816,10 @@ static void armv8pmu_start(struct arm_pmu *cpu_pmu)else armv8pmu_disable_user_access (); +kvm_vcpu_pmu_resync_el0 (); +/* Enable all counters */ armv8pmu_pmcr_write (armv8pmu_pmcr_read () |ARMV8_PMU_PMCR_E ); - -kvm_vcpu_pmu_resync_el0 (); }static void armv8pmu_stop (struct arm_pmu *cpu_pmu)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 265/626 soc: apple: rtkit: Use high prio work queue
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Janne Grunau <[email protected]>
[ Upstream commit 22af2fac88fa5dbc310bfe7d0b66d4de3ac47305 ]
rtkit messages as communication with the DCP firmware for framebuffer swaps or input events are time critical so use WQ_HIGHPRI to prevent user space CPU load to increase latency.
With kwin_wayland 6's explicit sync mode user space load was able to delay the IOMFB rtkit communication enough to miss vsync for surface swaps. Minimal test scenario is constantly resizing a glxgears Xwayland window.
--- drivers/soc/apple/rtkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/apple/rtkit.c +1 -1
@@ -667,7 +667,7 @@ struct apple_rtkit *apple_rtkit_init(struct device *dev, void *cookie, rtk->mbox->rx = apple_rtkit_rx; rtk->mbox->cookie = rtk; - rtk->wq =alloc_ordered_workqueue ("rtkit-%s" ,WQ_MEM_RECLAIM , + rtk->wq =alloc_ordered_workqueue ("rtkit-%s" ,WQ_HIGHPRI |WQ_MEM_RECLAIM ,dev_name (rtk->dev));if (!rtk->wq) { ret = -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 266/626 soc: apple: rtkit: Implement OSLog buffers properly
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit a06398687065e0c334dc5fc4d2778b5b87292e43 ]
Apparently nobody can figure out where the old logic came from, but it seems like it has never been actually used on any supported firmware to this day. OSLog buffers were apparently never requested.
But starting with 13.3, we actually need this implemented properly for MTP (and later AOP) to work, so let's actually do that.
--- drivers/soc/apple/rtkit-internal.h | 1 + drivers/soc/apple/rtkit.c | 56 ++++++++++++++++++------------ 2 files changed, 35 insertions(+), 22 deletions(-)
drivers/soc/apple/rtkit-internal.h +1 -0
@@ -44,6 +44,7 @@ struct apple_rtkit {struct apple_rtkit_shmem ioreport_buffer;struct apple_rtkit_shmem crashlog_buffer; +struct apple_rtkit_shmem oslog_buffer;struct apple_rtkit_shmem syslog_buffer;char *syslog_msg_buffer;
drivers/soc/apple/rtkit.c +34 -22
105 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 267/626 wifi: ath12k: Report proper tx completion status to mac80211
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vinith Kumar R <[email protected]>
[ Upstream commit d2d9c9b8de725e1006d3aa3d18678a732f5d3584 ]
Currently Tx completion for few exception packets are received from firmware and the tx status updated to mac80211. The tx status values of HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP and HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL are considered as tx failure and reported as tx failure to mac80211. But these failure status is due to internal firmware tx drop and these packets were not tried to transmit in the air.
In case of mesh this invalid tx status report might trigger mpath broken issue due to increase in mpath fail average.
So do not report these tx status as tx failure instead free the skb by calling ieee80211_free_txskb(), and that will be accounted as dropped frame.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_tx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/dp_tx.c +2 -2
@@ -557,13 +557,13 @@ ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab,switch (wbm_status) {case HAL_WBM_REL_HTT_TX_COMP_STATUS_OK : -case HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP : -case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL : ts.acked = (wbm_status ==HAL_WBM_REL_HTT_TX_COMP_STATUS_OK ); ts.ack_rssi =le32_get_bits (status_desc->info2,HTT_TX_WBM_COMP_INFO2_ACK_RSSI );ath12k_dp_tx_htt_tx_complete_buf (ab, msdu, tx_ring, &ts);break ; +case HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP : +case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL :case HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ :case HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT :ath12k_dp_tx_free_txbuf (ab, msdu, mac_id, tx_ring);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 268/626 PCI: brcmstb: Expand inbound window size up to 64GB
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanimir Varbanov <[email protected]>
[ Upstream commit 25a98c727015638baffcfa236e3f37b70cedcf87 ]
The BCM2712 memory map can support up to 64GB of system memory, thus expand the inbound window size in calculation helper function.
The change is safe for the currently supported SoCs that have smaller inbound window sizes.
--- drivers/pci/controller/pcie-brcmstb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +2 -2
@@ -309,8 +309,8 @@ static int brcm_pcie_encode_ibar_size(u64 size)if (log2_in >=12 && log2_in <=15 )/* Covers 4KB to 32KB (inclusive) */ return (log2_in -12 ) +0x1c ; -else if (log2_in >=16 && log2_in <=35 ) -/* Covers 64KB to 32GB, (inclusive) */ +else if (log2_in >=16 && log2_in <=36 ) +/* Covers 64KB to 64GB, (inclusive) */ return log2_in -15 ;/* Something is awry so disable */ return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 269/626 PCI: brcmstb: Add a softdep to MIP MSI-X driver
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanimir Varbanov <[email protected]>
[ Upstream commit 2294059118c550464dd8906286324d90c33b152b ]
Then the brcmstb PCIe driver and MIP MSI-X interrupt controller drivers are built as modules there could be a race in probing.
To avoid this, add a softdep to MIP driver to guarantee that MIP driver will be load first.
--- drivers/pci/controller/pcie-brcmstb.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/controller/pcie-brcmstb.c +1 -0
@@ -1947,3 +1947,4 @@ module_platform_driver(brcm_pcie_driver);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Broadcom STB PCIe RC driver" );MODULE_AUTHOR ("Broadcom" ); +MODULE_SOFTDEP ("pre: irq_bcm2712_mip" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 270/626 firmware: arm_ffa: Set dma_mask for ffa devices
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viresh Kumar <[email protected]>
[ Upstream commit cc0aac7ca17e0ea3ca84b552fc79f3e86fd07f53 ]
Set dma_mask for FFA devices, otherwise DMA allocation using the device pointer lead to following warning:
WARNING: CPU: 1 PID: 1 at kernel/dma/mapping.c:597 dma_alloc_attrs+0xe0/0x124
Message-Id: <e3dd8042ac680bd74b6580c25df855d092079c18.1737107520.git.viresh.kumar@linaro.org>
--- drivers/firmware/arm_ffa/bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/firmware/arm_ffa/bus.c +1 -0
@@ -212,6 +212,7 @@ ffa_device_register(const struct ffa_partition_info *part_info, dev = &ffa_dev->dev; dev->bus = &ffa_bus_type; dev->release = ffa_release_device; + dev->dma_mask = &dev->coherent_dma_mask;dev_set_name (&ffa_dev->dev,"arm-ffa-%d" , id); ffa_dev->id = id;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 271/626 drm/xe/vf: Retry sending MMIO request to GUC on timeout error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satyanarayana K V P <[email protected]>
[ Upstream commit ba757a65d2a28d46a8ccf50538f4f05036983f1b ]
Add support to allow retrying the sending of MMIO requests from the VF to the GUC in the event of an error. During the suspend/resume process, VFs begin resuming only after the PF has resumed. Although the PF resumes, the GUC reset and provisioning occur later in a separate worker process.
When there are a large number of VFs, some may attempt to resume before the PF has completed its provisioning. Therefore, if a MMIO request from a VF fails during this period, we will retry sending the request up to GUC_RESET_VF_STATE_RETRY_MAX times, which is set to a maximum of 10 attempts.
--- drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_gt_sriov_vf.c +8 -1
@@ -46,12 +46,19 @@ static int guc_action_vf_reset(struct xe_guc *guc)return ret >0 ? -EPROTO : ret; } +#define GUC_RESET_VF_STATE_RETRY_MAX 10static int vf_reset_guc_state (struct xe_gt *gt) { +unsigned int retry =GUC_RESET_VF_STATE_RETRY_MAX ;struct xe_guc *guc = >->uc.guc;int err; - err =guc_action_vf_reset (guc); +do { + err =guc_action_vf_reset (guc); +if (!err || err != -ETIMEDOUT ) +break ; + }while (--retry); +if (unlikely (err))xe_gt_sriov_err (gt,"Failed to reset GuC state (%pe)\n" ,ERR_PTR (err));return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 272/626 drm/xe/pf: Create a link between PF and VF devices
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satyanarayana K V P <[email protected]>
[ Upstream commit 8c0aff7d92e2be25717669eb65a81a89740a24f2 ]
When both PF and VF devices are enabled on the host, they resume simultaneously during system resume.
However, the PF must finish provisioning the VF before any VFs can successfully resume.
Establish a parent-child device link between the PF and VF devices to ensure the correct order of resumption.
V4 -> V5:
- Added missing break in the error condition.
V3 -> V4:
- Made xe_pci_pf_get_vf_dev() as a static function and updated input parameter types.
- Updated xe_sriov_warn() to xe_sriov_abort() when VF device cannot be found.
V2 -> V3:
- Added function documentation for xe_pci_pf_get_vf_dev().
- Added assertion if not called from PF.
V1 -> V2:
- Added a helper function to get VF pci_dev.
- Updated xe_sriov_notice() to xe_sriov_warn() if vf pci_dev is not found.
--- drivers/gpu/drm/xe/xe_pci_sriov.c | 51 +++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
drivers/gpu/drm/xe/xe_pci_sriov.c +51 -0
@@ -62,6 +62,55 @@ static void pf_reset_vfs(struct xe_device *xe, unsigned int num_vfs)xe_gt_sriov_pf_control_trigger_flr (gt, n); } +static struct pci_dev *xe_pci_pf_get_vf_dev (struct xe_device *xe,unsigned int vf_id) +{ +struct pci_dev *pdev =to_pci_dev (xe->drm.dev); + +xe_assert (xe,IS_SRIOV_PF (xe)); + +/* caller must use pci_dev_put() */ +return pci_get_domain_bus_and_slot (pci_domain_nr (pdev->bus), + pdev->bus->number, +pci_iov_virtfn_devfn (pdev, vf_id)); +} + +static void pf_link_vfs (struct xe_device *xe,int num_vfs) +{ +struct pci_dev *pdev_pf =to_pci_dev (xe->drm.dev); +struct device_link *link; +struct pci_dev *pdev_vf; +unsigned int n; + +/* +* When both PF and VF devices are enabled on the host, during system +* resume they are resuming in parallel. +* +* But PF has to complete the provision of VF first to allow any VFs to +* successfully resume. +* +* Create a parent-child device link between PF and VF devices that will +* enforce correct resume order. +*/ +for (n =1 ; n <= num_vfs; n++) { + pdev_vf =xe_pci_pf_get_vf_dev (xe, n -1 ); + +/* unlikely, something weird is happening, abort */ +if (!pdev_vf) { +xe_sriov_err (xe,"Cannot find VF%u device, aborting link%s creation!\n" , + n,str_plural (num_vfs)); +break ; + } + + link =device_link_add (&pdev_vf->dev, &pdev_pf->dev, +DL_FLAG_AUTOREMOVE_CONSUMER ); +/* unlikely and harmless, continue with other VFs */ +if (!link) +xe_sriov_notice (xe,"Failed linking VF%u\n" , n); + +pci_dev_put (pdev_vf); + } +} +static int pf_enable_vfs (struct xe_device *xe,int num_vfs) {struct pci_dev *pdev =to_pci_dev (xe->drm.dev);
@@ -92,6 +141,8 @@ static int pf_enable_vfs(struct xe_device *xe, int num_vfs)if (err <0 ) goto failed; +pf_link_vfs (xe, num_vfs); +xe_sriov_info (xe,"Enabled %u of %u VF%s\n" , num_vfs, total_vfs,str_plural (total_vfs));return num_vfs;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 273/626 net/mlx5: Avoid report two health errors on same syndrome
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moshe Shemesh <[email protected]>
[ Upstream commit b5d7b2f04ebcff740f44ef4d295b3401aeb029f4 ]
In case health counter has not increased for few polling intervals, miss counter will reach max misses threshold and health report will be triggered for FW health reporter. In case syndrome found on same health poll another health report will be triggered.
Avoid two health reports on same syndrome by marking this syndrome as already known.
--- drivers/net/ethernet/mellanox/mlx5/core/health.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/health.c +1 -0
@@ -799,6 +799,7 @@ static void poll_health(struct timer_list *t) health->prev = count;if (health->miss_counter ==MAX_MISSES ) {mlx5_core_err (dev,"device's health compromised - reached miss count\n" ); + health->synd =ioread8 (&h->synd);print_health_info (dev);queue_work (health->wq, &health->report_work); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 274/626 selftests/net: have `gro.sh -t` return a correct exit code
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kevin Krakauer <[email protected]>
[ Upstream commit 784e6abd99f24024a8998b5916795f0bec9d2fd9 ]
Modify gro.sh to return a useful exit code when the -t flag is used. It formerly returned 0 no matter what.
Tested: Ran gro.sh -t large and verified that test failures return 1.
--- tools/testing/selftests/net/gro.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/net/gro.sh +2 -1
@@ -100,5 +100,6 @@ trap cleanup EXIT if [[ "${test}" == "all" ]]; then run_all_tests else - run_test "${proto}" "${test}" + exit_code=$(run_test "${proto}" "${test}") + exit $exit_code fi;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 275/626 pinctrl: sophgo: avoid to modify untouched bit when setting cv1800 pinconf
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Inochi Amaoto <[email protected]>
[ Upstream commit ef1a5121ae3da02372fcb66d9632ed3d47ad5637 ]
When setting pinconf configuration for cv1800 SoC, the driver just writes the value. It may zero some bits of the pinconf register and cause some unexpected error. Add a mask to avoid this.
--- drivers/pinctrl/sophgo/pinctrl-cv18xx.c | 33 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/pinctrl/sophgo/pinctrl-cv18xx.c +23 -10
@@ -574,10 +574,10 @@ static int cv1800_pinconf_compute_config(struct cv1800_pinctrl *pctrl,struct cv1800_pin *pin, unsigned long *configs, unsigned int num_configs, - u32 *value) + u32 *value, u32 *mask) { int i; -u32 v =0 ; +u32 v =0 , m =0 ;enum cv1800_pin_io_type type;int ret;
@@ -596,10 +596,12 @@ static int cv1800_pinconf_compute_config(struct cv1800_pinctrl *pctrl,case PIN_CONFIG_BIAS_PULL_DOWN : v &= ~PIN_IO_PULLDOWN ; v |=FIELD_PREP (PIN_IO_PULLDOWN , arg); + m |=PIN_IO_PULLDOWN ;break ;case PIN_CONFIG_BIAS_PULL_UP : v &= ~PIN_IO_PULLUP ; v |=FIELD_PREP (PIN_IO_PULLUP , arg); + m |=PIN_IO_PULLUP ;break ;case PIN_CONFIG_DRIVE_STRENGTH_UA : ret =cv1800_pinctrl_oc2reg (pctrl, pin, arg);
@@ -607,6 +609,7 @@ static int cv1800_pinconf_compute_config(struct cv1800_pinctrl *pctrl,return ret; v &= ~PIN_IO_DRIVE ; v |=FIELD_PREP (PIN_IO_DRIVE , ret); + m |=PIN_IO_DRIVE ;break ;case PIN_CONFIG_INPUT_SCHMITT_UV : ret =cv1800_pinctrl_schmitt2reg (pctrl, pin, arg);
@@ -614,6 +617,7 @@ static int cv1800_pinconf_compute_config(struct cv1800_pinctrl *pctrl,return ret; v &= ~PIN_IO_SCHMITT ; v |=FIELD_PREP (PIN_IO_SCHMITT , ret); + m |=PIN_IO_SCHMITT ;break ;case PIN_CONFIG_POWER_SOURCE :/* Ignore power source as it is always fixed */
@@ -621,10 +625,12 @@ static int cv1800_pinconf_compute_config(struct cv1800_pinctrl *pctrl,case PIN_CONFIG_SLEW_RATE : v &= ~PIN_IO_OUT_FAST_SLEW ; v |=FIELD_PREP (PIN_IO_OUT_FAST_SLEW , arg); + m |=PIN_IO_OUT_FAST_SLEW ;break ;case PIN_CONFIG_BIAS_BUS_HOLD : v &= ~PIN_IO_BUS_HOLD ; v |=FIELD_PREP (PIN_IO_BUS_HOLD , arg); + m |=PIN_IO_BUS_HOLD ;break ;default :return -ENOTSUPP ;
@@ -632,17 +638,19 @@ static int cv1800_pinconf_compute_config(struct cv1800_pinctrl *pctrl, } *value = v; + *mask = m;return 0 ; }static int cv1800_pin_set_config (struct cv1800_pinctrl *pctrl,unsigned int pin_id, -u32 value) +u32 value,u32 mask) {struct cv1800_pin *pin =cv1800_get_pin (pctrl, pin_id);unsigned long flags;void __iomem *addr; +u32 reg;if (!pin)return -EINVAL ;
@@ -650,7 +658,10 @@ static int cv1800_pin_set_config(struct cv1800_pinctrl *pctrl, addr =cv1800_pinctrl_get_component_addr (pctrl, &pin->conf);raw_spin_lock_irqsave (&pctrl->lock, flags); -writel (value, addr); + reg =readl (addr); + reg &= ~mask; + reg |= value; +writel (reg, addr);raw_spin_unlock_irqrestore (&pctrl->lock, flags);return 0 ;
@@ -662,16 +673,17 @@ static int cv1800_pconf_set(struct pinctrl_dev *pctldev, {struct cv1800_pinctrl *pctrl =pinctrl_dev_get_drvdata (pctldev);struct cv1800_pin *pin =cv1800_get_pin (pctrl, pin_id); -u32 value; +u32 value, mask;if (!pin)return -ENODEV ;if (cv1800_pinconf_compute_config (pctrl, pin, - configs, num_configs, &value)) + configs, num_configs, + &value, &mask))return -ENOTSUPP ; -return cv1800_pin_set_config (pctrl, pin_id, value); +return cv1800_pin_set_config (pctrl, pin_id, value, mask); } static int cv1800_pconf_group_set(struct pinctrl_dev *pctldev,
@@ -682,7 +694,7 @@ static int cv1800_pconf_group_set(struct pinctrl_dev *pctldev,struct cv1800_pinctrl *pctrl =pinctrl_dev_get_drvdata (pctldev);const struct group_desc *group;const struct cv1800_pin_mux_config *pinmuxs; -u32 value; +u32 value, mask;int i; group =pinctrl_generic_get_group (pctldev, gsel);
@@ -692,11 +704,12 @@ static int cv1800_pconf_group_set(struct pinctrl_dev *pctldev, pinmuxs = group->data;if (cv1800_pinconf_compute_config (pctrl, pinmuxs[0 ].pin, - configs, num_configs, &value)) + configs, num_configs, + &value, &mask))return -ENOTSUPP ;for (i =0 ; i < group->grp.npins; i++) -cv1800_pin_set_config (pctrl, group->grp.pins[i], value); +cv1800_pin_set_config (pctrl, group->grp.pins[i], value, mask);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 276/626 drm/amdkfd: KFD release_work possible circular locking
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philip Yang <[email protected]>
[ Upstream commit 1b9366c601039d60546794c63fbb83ce8e53b978 ]
If waiting for gpu reset done in KFD release_work, thers is WARNING:
possible circular locking dependency detected
#2 kfd_create_process
kfd_process_mutex
flush kfd release work
#1 kfd release work
wait for amdgpu reset work
#0 amdgpu_device_gpu_reset
kgd2kfd_pre_reset
kfd_process_mutex
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock((work_completion)(&p->release_work));
lock((wq_completion)kfd_process_wq);
lock((work_completion)(&p->release_work));lock((wq_completion)amdgpu-reset-dev);
To fix this, KFD create process move flush release work outside kfd_process_mutex.
--- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_process.c +8 -8
@@ -842,6 +842,14 @@ struct kfd_process *kfd_create_process(struct task_struct *thread)return ERR_PTR (-EINVAL ); } +/* If the process just called exec(3), it is possible that the +* cleanup of the kfd_process (following the release of the mm +* of the old process image) is still in the cleanup work queue. +* Make sure to drain any job before trying to recreate any +* resource for this process. +*/ +flush_workqueue (kfd_process_wq); +/* * take kfd processes mutex before starting of process creation * so there won't be a case where two threads of the same process
@@ -860,14 +868,6 @@ struct kfd_process *kfd_create_process(struct task_struct *thread)if (process) {pr_debug ("Process already found\n" ); }else { -/* If the process just called exec(3), it is possible that the -* cleanup of the kfd_process (following the release of the mm -* of the old process image) is still in the cleanup work queue. -* Make sure to drain any job before trying to recreate any -* resource for this process. -*/ -flush_workqueue (kfd_process_wq); - process =create_process (thread);if (IS_ERR (process)) goto out;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 277/626 drm/xe: xe_gen_wa_oob: replace program_invocation_short_name
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Gomez <[email protected]>
[ Upstream commit 89eb42b5539f6ae6a0cabcb39e5b6fcc83c106a1 ]
program_invocation_short_name may not be available in other systems. Instead, replace it with the argv[0] to pass the executable name.
Fixes build error when program_invocation_short_name is not available:
drivers/gpu/drm/xe/xe_gen_wa_oob.c:34:3: error: use of
undeclared identifier 'program_invocation_short_name' 34 |program_invocation_short_name); | ^ 1 error
generated.
--- drivers/gpu/drm/xe/xe_gen_wa_oob.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_gen_wa_oob.c +3 -3
@@ -28,10 +28,10 @@"\n" \"#endif\n" -static void print_usage(FILE *f) +static void print_usage(FILE *f, const char *progname) {fprintf (f,"usage: %s <input-rule-file> <generated-c-source-file> <generated-c-header-file>\n" , - program_invocation_short_name); + progname); } static void print_parse_error(const char *err_msg, const char *line,
@@ -144,7 +144,7 @@ int main(int argc, const char *argv[])if (argc <3 ) {fprintf (stderr,"ERROR: wrong arguments\n" ); -print_usage (stderr); +print_usage (stderr, argv[0 ]);return 1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 278/626 leds: pwm-multicolor: Add check for fwnode_property_read_u32
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuanjun Gong <[email protected]>
[ Upstream commit 6d91124e7edc109f114b1afe6d00d85d0d0ac174 ]
Add a check to the return value of fwnode_property_read_u32() in case it fails.
--- drivers/leds/rgb/leds-pwm-multicolor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/leds/rgb/leds-pwm-multicolor.c +4 -1
@@ -135,8 +135,11 @@ static int led_pwm_mc_probe(struct platform_device *pdev)/* init the multicolor's LED class device */ cdev = &priv->mc_cdev.led_cdev; -fwnode_property_read_u32 (mcnode,"max-brightness" , + ret =fwnode_property_read_u32 (mcnode,"max-brightness" , &cdev->max_brightness); +if (ret) + goto release_mcnode; + cdev->flags =LED_CORE_SUSPENDRESUME ; cdev->brightness_set_blocking = led_pwm_mc_set;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 279/626 net: ethernet: mtk_ppe_offload: Allow QinQ, double ETH_P_8021Q only
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Woudstra <[email protected]>
[ Upstream commit 7fe0353606d77a32c4c7f2814833dd1c043ebdd2 ]
mtk_foe_entry_set_vlan() in mtk_ppe.c already supports double vlan tagging, but mtk_flow_offload_replace() in mtk_ppe_offload.c only allows for 1 vlan tag, optionally in combination with pppoe and dsa tags.
However, mtk_foe_entry_set_vlan() only allows for setting the vlan id. The protocol cannot be set, it is always ETH_P_8021Q, for inner and outer tag. This patch adds QinQ support to mtk_flow_offload_replace(), only in the case that both inner and outer tags are ETH_P_8021Q.
Only PPPoE-in-Q (as before) and Q-in-Q are allowed. A combination of PPPoE and Q-in-Q is not allowed.
--- .../net/ethernet/mediatek/mtk_ppe_offload.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/net/ethernet/mediatek/mtk_ppe_offload.c +11 -11
@@ -34,8 +34,10 @@ struct mtk_flow_data {u16 vlan_in;struct { -u16 id; -__be16 proto; +struct { +u16 id; +__be16 proto; + } vlans[2 ];u8 num; } vlan;struct {
@@ -349,18 +351,19 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f,case FLOW_ACTION_CSUM :break ;case FLOW_ACTION_VLAN_PUSH : -if (data.vlan.num ==1 || +if (data.vlan.num + data.pppoe.num ==2 || act->vlan.proto !=htons (ETH_P_8021Q ))return -EOPNOTSUPP ; - data.vlan.id = act->vlan.vid; - data.vlan.proto = act->vlan.proto; + data.vlan.vlans[data.vlan.num].id = act->vlan.vid; + data.vlan.vlans[data.vlan.num].proto = act->vlan.proto; data.vlan.num++;break ;case FLOW_ACTION_VLAN_POP :break ;case FLOW_ACTION_PPPOE_PUSH : -if (data.pppoe.num ==1 ) +if (data.pppoe.num ==1 || + data.vlan.num ==2 )return -EOPNOTSUPP ; data.pppoe.sid = act->pppoe.sid;
@@ -450,12 +453,9 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f,if (offload_type ==MTK_PPE_PKT_TYPE_BRIDGE ) foe.bridge.vlan = data.vlan_in; -if (data.vlan.num ==1 ) { -if (data.vlan.proto !=htons (ETH_P_8021Q )) -return -EOPNOTSUPP ; +for (i =0 ; i < data.vlan.num; i++) +mtk_foe_entry_set_vlan (eth, &foe, data.vlan.vlans[i].id); -mtk_foe_entry_set_vlan (eth, &foe, data.vlan.id); - }if (data.pppoe.num ==1 )mtk_foe_entry_set_pppoe (eth, &foe, data.pppoe.sid);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 280/626 net: xgene-v2: remove incorrect ACPI_PTR annotation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 01358e8fe922f716c05d7864ac2213b2440026e7 ]
Building with W=1 shows a warning about xge_acpi_match being unused when CONFIG_ACPI is disabled:
drivers/net/ethernet/apm/xgene-v2/main.c:723:36: error: unused variable 'xge_acpi_match' [-Werror,-Wunused-const-variable]
--- drivers/net/ethernet/apm/xgene-v2/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/apm/xgene-v2/main.c +1 -3
@@ -9,8 +9,6 @@#include "main.h" -static const struct acpi_device_id xge_acpi_match[]; -static int xge_get_resources (struct xge_pdata *pdata) {struct platform_device *pdev;
@@ -731,7 +729,7 @@ MODULE_DEVICE_TABLE(acpi, xge_acpi_match);static struct platform_driver xge_driver = { .driver = { .name ="xgene-enet-v2" , - .acpi_match_table =ACPI_PTR (xge_acpi_match), + .acpi_match_table = xge_acpi_match, }, .probe = xge_probe, .remove_new = xge_remove,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 281/626 bonding: report duplicate MAC address in all situations
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 28d68d396a1cd21591e8c6d74afbde33a7ea107e ]
Normally, a bond uses the MAC address of the first added slave as the bond’s MAC address. And the bond will set active slave’s MAC address to bond’s address if fail_over_mac is set to none (0) or follow (2).
When the first slave is removed, the bond will still use the removed slave’s MAC address, which can lead to a duplicate MAC address and potentially cause issues with the switch. To avoid confusion, let's warn the user in all situations, including when fail_over_mac is set to 2 or not in active-backup mode.
--- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -2542,7 +2542,7 @@ static int __bond_release_one(struct net_device *bond_dev,RCU_INIT_POINTER (bond->current_arp_slave,NULL ); -if (!all && (!bond->params.fail_over_mac || +if (!all && (bond->params.fail_over_mac !=BOND_FOM_ACTIVE ||BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP )) {if (ether_addr_equal_64bits (bond_dev->dev_addr, slave->perm_hwaddr) &&bond_has_slaves (bond))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 282/626 wifi: ath12k: Improve BSS discovery with hidden SSID in 6 GHz band
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ramasamy Kaliappan <[email protected]>
[ Upstream commit 27d38bdfd416f4db70e09c3bef3b030c86fd235a ]
Currently, sometimes, the station is unable to identify the configured AP SSID in its scan results when the AP is not broadcasting its name publicly and has a hidden SSID.
Currently, channel dwell time for an ath12k station is 30 ms. Sometimes, station can send broadcast probe request to AP close to the end of dwell time. In some of these cases, before AP sends a response to the received probe request, the dwell time on the station side would come to an end. So, the station will move to scan next channel and will not be able to acknowledge the unicast probe response.
Resolve this issue by increasing station's channel dwell time to 70 ms, so that the it remains on the same channel for a longer period. This would increase the station's chance of receiving probe response from the AP. The station will then send a response acknowledgment back to the AP, thus leading to successful scan and BSS discovery.
With an increased dwell time, scan would take longer than it takes now. But, this fix is an improvement for hidden SSID scan issue.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +2 -2
@@ -2206,8 +2206,8 @@ void ath12k_wmi_start_scan_init(struct ath12k *ar, arg->dwell_time_active =50 ; arg->dwell_time_active_2g =0 ; arg->dwell_time_passive =150 ; - arg->dwell_time_active_6g =40 ; - arg->dwell_time_passive_6g =30 ; + arg->dwell_time_active_6g =70 ; + arg->dwell_time_passive_6g =70 ; arg->min_rest_time =50 ; arg->max_rest_time =500 ; arg->repeat_probe_time =0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 283/626 soc: ti: k3-socinfo: Do not use syscon helper to build regmap
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Davis <[email protected]>
[ Upstream commit a5caf03188e44388e8c618dcbe5fffad1a249385 ]
The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself.
This will not work going forward and so we should create our regmap the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function.
--- drivers/soc/ti/k3-socinfo.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/soc/ti/k3-socinfo.c +12 -1
@@ -105,6 +105,12 @@ k3_chipinfo_variant_to_sr(unsigned int partno, unsigned int variant,return -ENODEV ; } +static const struct regmap_config k3_chipinfo_regmap_cfg = { + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , +}; +static int k3_chipinfo_probe (struct platform_device *pdev) {struct device_node *node = pdev->dev.of_node;
@@ -112,13 +118,18 @@ static int k3_chipinfo_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct soc_device *soc_dev;struct regmap *regmap; +void __iomem *base;u32 partno_id;u32 variant;u32 jtag_id;u32 mfg;int ret; - regmap =device_node_to_regmap (node); + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + regmap =regmap_init_mmio (dev, base, &k3_chipinfo_regmap_cfg);if (IS_ERR (regmap))return PTR_ERR (regmap);
Signature · 1 line
2.39.5
Re: [PATCH 6.12 283/626] soc: ti: k3-socinfo: Do not use syscon helper to build regmap
Quoted 1 line · Greg Kroah-Hartman
6.12-stable review patch. If anyone has any objections, please let
me know.
Preparation for future development, does not fix a bug. Sasha should not be picking these up.
BR,
Pavel
Quoted 60 lines
From: Andrew Davis <[email protected]>
[ Upstream commit
a5caf03188e44388e8c618dcbe5fffad1a249385]The syscon helper
device_node_to_regmap()is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead usesdevice_node_to_regmap()on its own node as a hacky way to create a regmap for itself.This will not work going forward and so we should create our regmap the normal way by defining our
regmap_config, fetching our memory resource, then using the normalregmap_init_mmio()function.Signed-off-by Andrew Davis <[email protected]>Signed-off-by Nishanth Menon <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/soc/ti/k3-socinfo.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)drivers/soc/ti/k3-socinfo.c +12
-1@@ -105,6 +105,12 @@ k3_chipinfo_variant_to_sr(unsigned int partno, unsigned int variant,return -ENODEV ; } +static const struct regmap_config k3_chipinfo_regmap_cfg = { + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , +}; +static int k3_chipinfo_probe (struct platform_device *pdev) {struct device_node *node = pdev->dev.of_node;@@ -112,13 +118,18 @@ static int k3_chipinfo_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct soc_device *soc_dev;struct regmap *regmap; +void __iomem *base;u32 partno_id;u32 variant;u32 jtag_id;u32 mfg;int ret; - regmap =device_node_to_regmap (node); + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + regmap =regmap_init_mmio (dev, base, &k3_chipinfo_regmap_cfg);if (IS_ERR (regmap))return PTR_ERR (regmap);
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 284/626 bpf: Search and add kfuncs in struct_ops prologue and epilogue
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amery Hung <[email protected]>
[ Upstream commit d519594ee2445d7cd1ad51f4db4cee58f8213400 ]
Currently, add_kfunc_call() is only invoked once before the main verification loop. Therefore, the verifier could not find the bpf_kfunc_btf_tab of a new kfunc call which is not seen in user defined struct_ops operators but introduced in gen_prologue or gen_epilogue during do_misc_fixup(). Fix this by searching kfuncs in the patching instruction buffer and add them to prog->aux->kfunc_tab.
--- kernel/bpf/verifier.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +24 -1
@@ -2987,6 +2987,21 @@ bpf_jit_find_kfunc_model(const struct bpf_prog *prog,return res ? &res->func_model :NULL ; } +static int add_kfunc_in_insns (struct bpf_verifier_env *env, +struct bpf_insn *insn,int cnt) +{ +int i, ret; + +for (i =0 ; i < cnt; i++, insn++) { +if (bpf_pseudo_kfunc_call (insn)) { + ret =add_kfunc_call (env, insn->imm, insn->off); +if (ret <0 ) +return ret; + } + } +return 0 ; +} +static int add_subprog_and_kfunc (struct bpf_verifier_env *env) {struct bpf_subprog_info *subprog = env->subprog_info;
@@ -19768,7 +19783,7 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env) {struct bpf_subprog_info *subprogs = env->subprog_info;const struct bpf_verifier_ops *ops = env->ops; -int i, cnt, size, ctx_field_size, delta =0 , epilogue_cnt =0 ; +int i, cnt, size, ctx_field_size, ret, delta =0 , epilogue_cnt =0 ;const int insn_cnt = env->prog->len;struct bpf_insn *epilogue_buf = env->epilogue_buf;struct bpf_insn *insn_buf = env->insn_buf;
@@ -19797,6 +19812,10 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)return -ENOMEM ; env->prog = new_prog; delta += cnt -1 ; + + ret =add_kfunc_in_insns (env, epilogue_buf, epilogue_cnt -1 ); +if (ret <0 ) +return ret; } }
@@ -19817,6 +19836,10 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env) env->prog = new_prog; delta += cnt -1 ; + + ret =add_kfunc_in_insns (env, insn_buf, cnt -1 ); +if (ret <0 ) +return ret; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 285/626 Octeontx2-af: RPM: Register driver with PCI subsys IDs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hariprasad Kelam <[email protected]>
[ Upstream commit fc9167192f29485be5621e2e9c8208b717b65753 ]
Although the PCI device ID and Vendor ID for the RPM (MAC) block have remained the same across Octeon CN10K and the next-generation CN20K silicon, Hardware architecture has changed (NIX mapped RPMs and RFOE Mapped RPMs).
Add PCI Subsystem IDs to the device table to ensure that this driver can be probed from NIX mapped RPM devices only.
--- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 14 ++++++++++++-- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/cgx.c +12 -2
@@ -66,8 +66,18 @@ static int cgx_fwi_link_change(struct cgx *cgx, int lmac_id, bool en);/* Supported devices */ static const struct pci_device_id cgx_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_OCTEONTX2_CGX ) }, - {PCI_DEVICE (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10K_RPM ) }, - {PCI_DEVICE (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10KB_RPM ) }, + {PCI_DEVICE_SUB (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10K_RPM , +PCI_ANY_ID ,PCI_SUBSYS_DEVID_CN10K_A ) }, + {PCI_DEVICE_SUB (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10K_RPM , +PCI_ANY_ID ,PCI_SUBSYS_DEVID_CNF10K_A ) }, + {PCI_DEVICE_SUB (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10K_RPM , +PCI_ANY_ID ,PCI_SUBSYS_DEVID_CNF10K_B ) }, + {PCI_DEVICE_SUB (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10KB_RPM , +PCI_ANY_ID ,PCI_SUBSYS_DEVID_CN10K_B ) }, + {PCI_DEVICE_SUB (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10KB_RPM , +PCI_ANY_ID ,PCI_SUBSYS_DEVID_CN20KA ) }, + {PCI_DEVICE_SUB (PCI_VENDOR_ID_CAVIUM ,PCI_DEVID_CN10KB_RPM , +PCI_ANY_ID ,PCI_SUBSYS_DEVID_CNF20KA ) }, {0 , }/* end of table */ };
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +2 -0
@@ -30,6 +30,8 @@#define PCI_SUBSYS_DEVID_CNF10K_A 0xBA00#define PCI_SUBSYS_DEVID_CNF10K_B 0xBC00#define PCI_SUBSYS_DEVID_CN10K_B 0xBD00 +#define PCI_SUBSYS_DEVID_CN20KA 0xC220 +#define PCI_SUBSYS_DEVID_CNF20KA 0xC320/* PCI BAR nos */ #define PCI_AF_REG_BAR_NUM 0
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 286/626 x86/build: Fix broken copy command in genimage.sh when making isoimage
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nir Lichtman <[email protected]>
[ Upstream commit e451630226bd09dc730eedb4e32cab1cc7155ae8 ]
Problem: Currently when running the "make isoimage" command there is an error related to wrong parameters passed to the cp command:
"cp: missing destination file operand after 'arch/x86/boot/isoimage/'"
This is caused because FDINITRDS is an empty array.
Solution: Check if FDINITRDS is empty before executing the "cp" command, similar to how it is done in the case of hdimage.
--- arch/x86/boot/genimage.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/boot/genimage.sh +4 -1
@@ -22,6 +22,7 @@ # This script requires: # bash # syslinux +# genisoimage # mtools (for fdimage* and hdimage) # edk2/OVMF (for hdimage) #
@@ -251,7 +252,9 @@ geniso() { cp "$isolinux" "$ldlinux" "$tmp_dir" cp "$FBZIMAGE" "$tmp_dir"/linux echo default linux "$KCMDLINE" > "$tmp_dir"/isolinux.cfg - cp "${FDINITRDS[@]}" "$tmp_dir"/ + if [ ${#FDINITRDS[@]} -gt 0 ]; then + cp "${FDINITRDS[@]}" "$tmp_dir"/ + fi genisoimage -J -r -appid 'LINUX_BOOT' -input-charset=utf-8 \ -quiet -o "$FIMAGE" -b isolinux.bin \ -c boot.cat -no-emul-boot -boot-load-size 4 \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 287/626 drm/amd/display: handle max_downscale_src_width fail check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihan Zhu <[email protected]>
[ Upstream commit 02a940da2ccc0cc0299811379580852b405a0ea2 ]
[WHY]
If max_downscale_src_width check fails, we exit early from TAP calculation and left a NULL value to the scaling data structure to cause the zero divide in the DML validation.
[HOW]
Call set default TAP calculation before early exit in get_optimal_number_of_taps due to max downscale limit exceed.
--- drivers/gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c +6 -5
@@ -425,11 +425,6 @@ bool dpp3_get_optimal_number_of_taps(int min_taps_y, min_taps_c;enum lb_memory_config lb_config; -if (scl_data->viewport.width > scl_data->h_active && - dpp->ctx->dc->debug.max_downscale_src_width !=0 && - scl_data->viewport.width > dpp->ctx->dc->debug.max_downscale_src_width) -return false; -/* * Set default taps if none are provided * From programming guide: taps = min{ ceil(2*H_RATIO,1), 8} for downscaling
@@ -467,6 +462,12 @@ bool dpp3_get_optimal_number_of_taps(else scl_data->taps.h_taps_c = in_taps->h_taps_c; +// Avoid null data in the scl data with this early return, proceed non-adaptive calcualtion first +if (scl_data->viewport.width > scl_data->h_active && + dpp->ctx->dc->debug.max_downscale_src_width !=0 && + scl_data->viewport.width > dpp->ctx->dc->debug.max_downscale_src_width) +return false; +/*Ensure we can support the requested number of vtaps*/ min_taps_y =dc_fixpt_ceil (scl_data->ratios.vert); min_taps_c =dc_fixpt_ceil (scl_data->ratios.vert_c);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 288/626 drm/amd/display: fix dcn4x init failed
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charlene Liu <[email protected]>
[ Upstream commit 23ef388a84c72b0614a6c10f866ffeac7e807719 ]
[why]
failed due to cmdtable not created.
switch atombios cmdtable as default.
--- drivers/gpu/drm/amd/display/dc/bios/command_table2.c | 9 --------- .../gpu/drm/amd/display/dc/bios/command_table_helper2.c | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/amd/display/dc/bios/command_table2.c +0 -9
@@ -101,7 +101,6 @@ static void init_dig_encoder_control(struct bios_parser *bp) bp->cmd_tbl.dig_encoder_control = encoder_control_digx_v1_5;break ;default : -dm_output_to_console ("Don't have dig_encoder_control for v%d\n" , version); bp->cmd_tbl.dig_encoder_control = encoder_control_fallback;break ; }
@@ -238,7 +237,6 @@ static void init_transmitter_control(struct bios_parser *bp) bp->cmd_tbl.transmitter_control = transmitter_control_v1_7;break ;default : -dm_output_to_console ("Don't have transmitter_control for v%d\n" , crev); bp->cmd_tbl.transmitter_control = transmitter_control_fallback;break ; }
@@ -408,8 +406,6 @@ static void init_set_pixel_clock(struct bios_parser *bp) bp->cmd_tbl.set_pixel_clock = set_pixel_clock_v7;break ;default : -dm_output_to_console ("Don't have set_pixel_clock for v%d\n" , -BIOS_CMD_TABLE_PARA_REVISION (setpixelclock)); bp->cmd_tbl.set_pixel_clock = set_pixel_clock_fallback;break ; }
@@ -554,7 +550,6 @@ static void init_set_crtc_timing(struct bios_parser *bp) set_crtc_using_dtd_timing_v3;break ;default : -dm_output_to_console ("Don't have set_crtc_timing for v%d\n" , dtd_version); bp->cmd_tbl.set_crtc_timing =NULL ;break ; }
@@ -671,8 +666,6 @@ static void init_enable_crtc(struct bios_parser *bp) bp->cmd_tbl.enable_crtc = enable_crtc_v1;break ;default : -dm_output_to_console ("Don't have enable_crtc for v%d\n" , -BIOS_CMD_TABLE_PARA_REVISION (enablecrtc)); bp->cmd_tbl.enable_crtc =NULL ;break ; }
@@ -864,8 +857,6 @@ static void init_set_dce_clock(struct bios_parser *bp) bp->cmd_tbl.set_dce_clock = set_dce_clock_v2_1;break ;default : -dm_output_to_console ("Don't have set_dce_clock for v%d\n" , -BIOS_CMD_TABLE_PARA_REVISION (setdceclock)); bp->cmd_tbl.set_dce_clock =NULL ;break ; }
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c +1 -2
@@ -87,8 +87,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2(return true;default : -/* Unsupported DCE */ -BREAK_TO_DEBUGGER (); + *h =dal_cmd_tbl_helper_dce112_get_table2 ();return false; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 289/626 drm/amd/display: Fix mismatch type comparison
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Assadian, Navid <[email protected]>
[ Upstream commit 26873260d394b1e33cdd720154aedf0af95327f9 ]
The mismatch type comparison/assignment may cause data loss. Since the values are always non-negative, it is safe to use unsigned variables to resolve the mismatch.
--- drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 4 ++-- drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/spl/dc_spl.c +2 -2
@@ -875,8 +875,8 @@ static bool spl_get_optimal_number_of_taps( bool *enable_isharp) {int num_part_y, num_part_c; -int max_taps_y, max_taps_c; -int min_taps_y, min_taps_c; +unsigned int max_taps_y, max_taps_c; +unsigned int min_taps_y, min_taps_c;enum lb_memory_config lb_config;bool skip_easf = false;
drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h +1 -1
@@ -479,7 +479,7 @@ struct spl_sharpness_range { };struct adaptive_sharpness {bool enable; -int sharpness_level; +unsigned int sharpness_level;struct spl_sharpness_range sharpness_range; };enum linear_light_scaling {// convert it in translation logic
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 290/626 ASoC: mediatek: mt8188: Treat DMIC_GAINx_CUR as non-volatile
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit 7d87bde21c73731ddaf15e572020f80999c38ee3 ]
The DMIC_GAINx_CUR registers contain the current (as in present) gain of each DMIC. During capture, this gain will ramp up until a target value is reached, and therefore the register is volatile since it is updated automatically by hardware.
However, after capture the register's value returns to the value that was written to it. So reading these registers returns the current gain, and writing configures the initial gain for every capture.
Quoted 1 line
From an audio configuration perspective, reading the instantaneous gain
is not really useful. Instead, reading back the initial gain that was configured is the desired behavior. For that reason, consider the DMIC_GAINx_CUR registers as non-volatile, so the regmap's cache can be used to retrieve the values, rather than requiring pm runtime resuming the device.
--- sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 4 ---- 1 file changed, 4 deletions(-)
sound/soc/mediatek/mt8188/mt8188-afe-pcm.c +0 -4
@@ -2855,10 +2855,6 @@ static bool mt8188_is_volatile_reg(struct device *dev, unsigned int reg)case AFE_DMIC3_SRC_DEBUG_MON0 :case AFE_DMIC3_UL_SRC_MON0 :case AFE_DMIC3_UL_SRC_MON1 : -case DMIC_GAIN1_CUR : -case DMIC_GAIN2_CUR : -case DMIC_GAIN3_CUR : -case DMIC_GAIN4_CUR :case ETDM_IN1_MONITOR :case ETDM_IN2_MONITOR :case ETDM_OUT1_MONITOR :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 291/626 ASoC: mediatek: mt8188: Add reference for dmic clocks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit bf1800073f4d55f08191b034c86b95881e99b6fd ]
Add the names for the dmic clocks, aud_afe_dmic* and aud_dmic_hires*, so they can be acquired and enabled by the platform driver.
--- sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 8 ++++++++ sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 8 ++++++++ 2 files changed, 16 insertions(+)
sound/soc/mediatek/mt8188/mt8188-afe-clk.c +8 -0
@@ -58,7 +58,15 @@ static const char *aud_clks[MT8188_CLK_NUM] = { [MT8188_CLK_AUD_ADC] = "aud_adc", [MT8188_CLK_AUD_DAC_HIRES] = "aud_dac_hires", [MT8188_CLK_AUD_A1SYS_HP] = "aud_a1sys_hp", + [MT8188_CLK_AUD_AFE_DMIC1] = "aud_afe_dmic1", + [MT8188_CLK_AUD_AFE_DMIC2] = "aud_afe_dmic2", + [MT8188_CLK_AUD_AFE_DMIC3] = "aud_afe_dmic3", + [MT8188_CLK_AUD_AFE_DMIC4] = "aud_afe_dmic4", [MT8188_CLK_AUD_ADC_HIRES] = "aud_adc_hires", + [MT8188_CLK_AUD_DMIC_HIRES1] = "aud_dmic_hires1", + [MT8188_CLK_AUD_DMIC_HIRES2] = "aud_dmic_hires2", + [MT8188_CLK_AUD_DMIC_HIRES3] = "aud_dmic_hires3", + [MT8188_CLK_AUD_DMIC_HIRES4] = "aud_dmic_hires4", [MT8188_CLK_AUD_I2SIN] = "aud_i2sin", [MT8188_CLK_AUD_TDM_IN] = "aud_tdm_in", [MT8188_CLK_AUD_I2S_OUT] = "aud_i2s_out",
sound/soc/mediatek/mt8188/mt8188-afe-clk.h +8 -0
@@ -54,7 +54,15 @@ enum {MT8188_CLK_AUD_ADC ,MT8188_CLK_AUD_DAC_HIRES ,MT8188_CLK_AUD_A1SYS_HP , +MT8188_CLK_AUD_AFE_DMIC1 , +MT8188_CLK_AUD_AFE_DMIC2 , +MT8188_CLK_AUD_AFE_DMIC3 , +MT8188_CLK_AUD_AFE_DMIC4 ,MT8188_CLK_AUD_ADC_HIRES , +MT8188_CLK_AUD_DMIC_HIRES1 , +MT8188_CLK_AUD_DMIC_HIRES2 , +MT8188_CLK_AUD_DMIC_HIRES3 , +MT8188_CLK_AUD_DMIC_HIRES4 ,MT8188_CLK_AUD_I2SIN ,MT8188_CLK_AUD_TDM_IN , MT8188_CLK_AUD_I2S_OUT,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 292/626 x86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Waiman Long <[email protected]>
[ Upstream commit fe37c699ae3eed6e02ee55fbf5cb9ceb7fcfd76c ]
Depending on the type of panics, it was found that the __register_nmi_handler() function can be called in NMI context from nmi_shootdown_cpus() leading to a lockdep splat:
WARNING: inconsistent lock state
inconsistent {INITIAL USE} -> {IN-NMI} usage.
lock(&nmi_desc[0].lock);
<Interrupt>
lock(&nmi_desc[0].lock); Call Trace:
_raw_spin_lock_irqsave
__register_nmi_handler
nmi_shootdown_cpus
kdump_nmi_shootdown_cpus
native_machine_crash_shutdown
__crash_kexecIn this particular case, the following panic message was printed before:
Kernel panic - not syncing: Fatal hardware error!
This message seemed to be given out from __ghes_panic() running in NMI context.
The __register_nmi_handler() function which takes the nmi_desc lock with irq disabled shouldn't be called from NMI context as this can lead to deadlock.
The nmi_shootdown_cpus() function can only be invoked once. After the first invocation, all other CPUs should be stuck in the newly added crash_nmi_callback() and cannot respond to a second NMI.
Fix it by adding a new emergency NMI handler to the nmi_desc structure and provide a new set_emergency_nmi_handler() helper to set crash_nmi_callback() in any context. The new emergency handler will preempt other handlers in the linked list. That will eliminate the need to take any lock and serve the panic in NMI use case.
--- arch/x86/include/asm/nmi.h | 2 ++ arch/x86/kernel/nmi.c | 42 ++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/reboot.c | 10 +++------ 3 files changed, 47 insertions(+), 7 deletions(-)
arch/x86/include/asm/nmi.h +2 -0
@@ -56,6 +56,8 @@ int __register_nmi_handler(unsigned int, struct nmiaction *);void unregister_nmi_handler (unsigned int ,const char *); +void set_emergency_nmi_handler (unsigned int type,nmi_handler_t handler); +void stop_nmi (void );void restart_nmi (void );void local_touch_nmi (void );
arch/x86/kernel/nmi.c +42 -0
65 lines not on this page · raw message
arch/x86/kernel/reboot.c +3 -7
@@ -926,15 +926,11 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) shootdown_callback = callback;atomic_set (&waiting_for_crash_ipi,num_online_cpus () -1 ); -/* Would it be better to replace the trap vector here? */ -if (register_nmi_handler (NMI_LOCAL , crash_nmi_callback, -NMI_FLAG_FIRST ,"crash" )) -return ;/* Return what? */ +/* -* Ensure the new callback function is set before sending -* out the NMI +* Set emergency handler to preempt other handlers. */ -wmb (); +set_emergency_nmi_handler (NMI_LOCAL , crash_nmi_callback);apic_send_IPI_allbutself (NMI_VECTOR );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 293/626 vhost-scsi: Return queue full for page alloc failures during copy
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Christie <[email protected]>
[ Upstream commit 891b99eab0f89dbe08d216f4ab71acbeaf7a3102 ]
This has us return queue full if we can't allocate a page during the copy operation so the initiator can retry.
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/vhost/scsi.c +9 -6
@@ -762,7 +762,7 @@ vhost_scsi_copy_iov_to_sgl(struct vhost_scsi_cmd *cmd, struct iov_iter *iter,size_t len =iov_iter_count (iter);unsigned int nbytes =0 ;struct page *page; -int i; +int i, ret;if (cmd->tvc_data_direction ==DMA_FROM_DEVICE ) { cmd->saved_iter_addr = dup_iter(&cmd->saved_iter, iter,
@@ -775,6 +775,7 @@ vhost_scsi_copy_iov_to_sgl(struct vhost_scsi_cmd *cmd, struct iov_iter *iter, page =alloc_page (GFP_KERNEL );if (!page) { i--; + ret = -ENOMEM ; goto err; }
@@ -782,8 +783,10 @@ vhost_scsi_copy_iov_to_sgl(struct vhost_scsi_cmd *cmd, struct iov_iter *iter,sg_set_page (&sg[i], page, nbytes,0 );if (cmd->tvc_data_direction ==DMA_TO_DEVICE && -copy_page_from_iter (page,0 , nbytes, iter) != nbytes) +copy_page_from_iter (page,0 , nbytes, iter) != nbytes) { + ret = -EFAULT ; goto err; + } len -= nbytes; }
@@ -798,7 +801,7 @@ vhost_scsi_copy_iov_to_sgl(struct vhost_scsi_cmd *cmd, struct iov_iter *iter,for (; i >=0 ; i--)__free_page (sg_page (&sg[i]));kfree (cmd->saved_iter_addr); -return -ENOMEM ; +return ret; } static int
@@ -1282,9 +1285,9 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) " %d\n", cmd, exp_data_len, prot_bytes, data_direction);if (data_direction !=DMA_NONE ) { -if (unlikely (vhost_scsi_mapal (cmd, prot_bytes, - &prot_iter, exp_data_len, - &data_iter))) { + ret =vhost_scsi_mapal (cmd, prot_bytes, &prot_iter, + exp_data_len, &data_iter); +if (unlikely (ret)) {vq_err (vq,"Failed to map iov to sgl\n" );vhost_scsi_release_cmd_res (&cmd->tvc_se_cmd); goto err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 294/626 vdpa/mlx5: Fix mlx5_vdpa_get_config() endianness on big-endian machines
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Shkolnyy <[email protected]>
[ Upstream commit 439252e167ac45a5d46f573aac1da7d8f3e051ad ]
mlx5_vdpa_dev_add() doesn’t initialize mvdev->actual_features. It’s initialized later by mlx5_vdpa_set_driver_features(). However, mlx5_vdpa_get_config() depends on the VIRTIO_F_VERSION_1 flag in actual_features, to return data with correct endianness. When it’s called before mlx5_vdpa_set_driver_features(), the data are incorrectly returned as big-endian on big-endian machines, while QEMU then interprets them as little-endian.
The fix is to initialize this VIRTIO_F_VERSION_1 as early as possible, especially considering that mlx5_vdpa_dev_add() insists on this flag to always be set anyway.
Message-Id: <[email protected]>
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +3 -0
@@ -3884,6 +3884,9 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, ndev->mvdev.max_vqs = max_vqs; mvdev = &ndev->mvdev; mvdev->mdev = mdev; +/* cpu_to_mlx5vdpa16() below depends on this flag */ + mvdev->actual_features = + (device_features &BIT_ULL (VIRTIO_F_VERSION_1 )); ndev->vqs =kcalloc (max_vqs,sizeof (*ndev->vqs),GFP_KERNEL ); ndev->event_cbs =kcalloc (max_vqs +1 ,sizeof (*ndev->event_cbs),GFP_KERNEL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 295/626 cpuidle: menu: Avoid discarding useful information
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 85975daeaa4d6ec560bfcd354fc9c08ad7f38888 ]
When giving up on making a high-confidence prediction, get_typical_interval() always returns UINT_MAX which means that the next idle interval prediction will be based entirely on the time till the next timer. However, the information represented by the most recent intervals may not be completely useless in those cases.
Namely, the largest recent idle interval is an upper bound on the recently observed idle duration, so it is reasonable to assume that the next idle duration is unlikely to exceed it. Moreover, this is still true after eliminating the suspected outliers if the sample set still under consideration is at least as large as 50% of the maximum sample set size.
Accordingly, make get_typical_interval() return the current maximum recent interval value in that case instead of UINT_MAX.
--- drivers/cpuidle/governors/menu.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/cpuidle/governors/menu.c +12 -1
@@ -239,8 +239,19 @@ static unsigned int get_typical_interval(struct menu_device *data)* This can deal with workloads that have long pauses interspersed * with sporadic activity with a bunch of short pauses. */ -if ((divisor *4 ) <=INTERVALS *3 ) +if (divisor *4 <=INTERVALS *3 ) { +/* +* If there are sufficiently many data points still under +* consideration after the outliers have been eliminated, +* returning without a prediction would be a mistake because it +* is likely that the next interval will not exceed the current +* maximum, so return the latter in that case. +*/ +if (divisor >=INTERVALS /2 ) +return max; +return UINT_MAX ; + } thresh = max -1 ; goto again;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 296/626 media: adv7180: Disable test-pattern control on adv7180
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Söderlund <[email protected]>
[ Upstream commit a980bc5f56b0292336e408f657f79e574e8067c0 ]
The register that enables selecting a test-pattern to be outputted in free-run mode (FREE_RUN_PAT_SEL[2:0]) is only available on adv7280 based devices, not the adv7180 based ones.
Add a flag to mark devices that are capable of generating test-patterns, and those that are not. And only register the control on supported devices.
--- drivers/media/i2c/adv7180.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
drivers/media/i2c/adv7180.c +22 -12
@@ -195,6 +195,7 @@ struct adv7180_state;#define ADV7180_FLAG_V2 BIT(1)#define ADV7180_FLAG_MIPI_CSI2 BIT(2)#define ADV7180_FLAG_I2P BIT(3) +#define ADV7180_FLAG_TEST_PATTERN BIT(4)struct adv7180_chip_info {unsigned int flags;
@@ -682,11 +683,15 @@ static int adv7180_init_controls(struct adv7180_state *state) ADV7180_HUE_MAX, 1, ADV7180_HUE_DEF);v4l2_ctrl_new_custom (&state->ctrl_hdl, &adv7180_ctrl_fast_switch,NULL ); -v4l2_ctrl_new_std_menu_items (&state->ctrl_hdl, &adv7180_ctrl_ops, -V4L2_CID_TEST_PATTERN , -ARRAY_SIZE (test_pattern_menu) -1 , -0 ,ARRAY_SIZE (test_pattern_menu) -1 , - test_pattern_menu); +if (state->chip_info->flags &ADV7180_FLAG_TEST_PATTERN ) { +v4l2_ctrl_new_std_menu_items (&state->ctrl_hdl, + &adv7180_ctrl_ops, +V4L2_CID_TEST_PATTERN , +ARRAY_SIZE (test_pattern_menu) -1 , +0 , +ARRAY_SIZE (test_pattern_menu) -1 , + test_pattern_menu); + } state->sd.ctrl_handler = &state->ctrl_hdl;if (state->ctrl_hdl.error) {
@@ -1221,7 +1226,7 @@ static const struct adv7180_chip_info adv7182_info = { };static const struct adv7180_chip_info adv7280_info = { - .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_I2P , + .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_I2P |ADV7180_FLAG_TEST_PATTERN , .valid_input_mask =BIT (ADV7182_INPUT_CVBS_AIN1 ) |BIT (ADV7182_INPUT_CVBS_AIN2 ) | BIT(ADV7182_INPUT_CVBS_AIN3) |
@@ -1235,7 +1240,8 @@ static const struct adv7180_chip_info adv7280_info = { };static const struct adv7180_chip_info adv7280_m_info = { - .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 |ADV7180_FLAG_I2P , + .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 |ADV7180_FLAG_I2P | +ADV7180_FLAG_TEST_PATTERN , .valid_input_mask =BIT (ADV7182_INPUT_CVBS_AIN1 ) |BIT (ADV7182_INPUT_CVBS_AIN2 ) | BIT(ADV7182_INPUT_CVBS_AIN3) |
@@ -1256,7 +1262,8 @@ static const struct adv7180_chip_info adv7280_m_info = { };static const struct adv7180_chip_info adv7281_info = { - .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 , + .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 | +ADV7180_FLAG_TEST_PATTERN , .valid_input_mask =BIT (ADV7182_INPUT_CVBS_AIN1 ) |BIT (ADV7182_INPUT_CVBS_AIN2 ) | BIT(ADV7182_INPUT_CVBS_AIN7) |
@@ -1271,7 +1278,8 @@ static const struct adv7180_chip_info adv7281_info = { };static const struct adv7180_chip_info adv7281_m_info = { - .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 , + .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 | +ADV7180_FLAG_TEST_PATTERN , .valid_input_mask =BIT (ADV7182_INPUT_CVBS_AIN1 ) |BIT (ADV7182_INPUT_CVBS_AIN2 ) | BIT(ADV7182_INPUT_CVBS_AIN3) |
@@ -1291,7 +1299,8 @@ static const struct adv7180_chip_info adv7281_m_info = { };static const struct adv7180_chip_info adv7281_ma_info = { - .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 , + .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 | +ADV7180_FLAG_TEST_PATTERN , .valid_input_mask =BIT (ADV7182_INPUT_CVBS_AIN1 ) |BIT (ADV7182_INPUT_CVBS_AIN2 ) | BIT(ADV7182_INPUT_CVBS_AIN3) |
@@ -1316,7 +1325,7 @@ static const struct adv7180_chip_info adv7281_ma_info = { };static const struct adv7180_chip_info adv7282_info = { - .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_I2P , + .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_I2P |ADV7180_FLAG_TEST_PATTERN , .valid_input_mask =BIT (ADV7182_INPUT_CVBS_AIN1 ) |BIT (ADV7182_INPUT_CVBS_AIN2 ) | BIT(ADV7182_INPUT_CVBS_AIN7) |
@@ -1331,7 +1340,8 @@ static const struct adv7180_chip_info adv7282_info = { };static const struct adv7180_chip_info adv7282_m_info = { - .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 |ADV7180_FLAG_I2P , + .flags =ADV7180_FLAG_V2 |ADV7180_FLAG_MIPI_CSI2 |ADV7180_FLAG_I2P | +ADV7180_FLAG_TEST_PATTERN , .valid_input_mask =BIT (ADV7182_INPUT_CVBS_AIN1 ) |BIT (ADV7182_INPUT_CVBS_AIN2 ) | BIT(ADV7182_INPUT_CVBS_AIN3) |
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 297/626 media: tc358746: improve calculation of the D-PHY timing registers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthias Fend <[email protected]>
[ Upstream commit 78d7265e2e1ce349e7f3c6a085f2b66d7b73f4ca ]
When calculating D-PHY registers, using data rates that are not multiples of 16 can lead to precision loss in division operations. This can result in register values that produce timing violations against the MIPI standard.
An example:cfg->hs_clk_rate = 294MHzhf_clk = 18
If the desired value in cfg->init is 100us, which is the minimum allowed value, then the LINEINITCNT register is calculated as 1799. But since the actual clock is 18.375MHz instead of 18MHz, this setting results in a time that is shorter than 100us and thus violates the standard. The correct value for LINEINITCNT would be 1837.
Improve the precision of calculations by using Hz instead of MHz as unit.
--- drivers/media/i2c/tc358746.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/media/i2c/tc358746.c +7 -12
@@ -460,24 +460,20 @@ static int tc358746_apply_misc_config(struct tc358746 *tc358746)return err; } -/* Use MHz as base so the div needs no u64 */ -static u32 tc358746_cfg_to_cnt (unsigned int cfg_val, -unsigned int clk_mhz, -unsigned int time_base) +static u32 tc358746_cfg_to_cnt (unsigned long cfg_val,unsigned long clk_hz, +unsigned long long time_base) { -return DIV_ROUND_UP (cfg_val * clk_mhz, time_base); +return div64_u64 ((u64 )cfg_val * clk_hz + time_base -1 , time_base); } -static u32 tc358746_ps_to_cnt (unsigned int cfg_val, -unsigned int clk_mhz) +static u32 tc358746_ps_to_cnt (unsigned long cfg_val,unsigned long clk_hz) { -return tc358746_cfg_to_cnt (cfg_val, clk_mhz,USEC_PER_SEC ); +return tc358746_cfg_to_cnt (cfg_val, clk_hz,PSEC_PER_SEC ); } -static u32 tc358746_us_to_cnt (unsigned int cfg_val, -unsigned int clk_mhz) +static u32 tc358746_us_to_cnt (unsigned long cfg_val,unsigned long clk_hz) { -return tc358746_cfg_to_cnt (cfg_val, clk_mhz,1 ); +return tc358746_cfg_to_cnt (cfg_val, clk_hz,USEC_PER_SEC ); }static int tc358746_apply_dphy_config (struct tc358746 *tc358746)
@@ -492,7 +488,6 @@ static int tc358746_apply_dphy_config(struct tc358746 *tc358746)/* The hs_byte_clk is also called SYSCLK in the excel sheet */ hs_byte_clk = cfg->hs_clk_rate /8 ; - hs_byte_clk /=HZ_PER_MHZ ; hf_clk = hs_byte_clk /2 ; val =tc358746_us_to_cnt (cfg->init, hf_clk) -1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 298/626 net/mlx5e: Add correct match to check IPSec syndromes for switchdev mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit 85e4a808af2545fefaf18c8fe50071b06fcbdabc ]
In commit dddb49b63d86 ("net/mlx5e: Add IPsec and ASO syndromes check in HW"), IPSec and ASO syndromes checks after decryption for the specified ASO object were added. But they are correct only for eswith in legacy mode. For switchdev mode, metadata register c1 is used to save the mapped id (not ASO object id). So, need to change the match accordingly for the check rules in status table.
--- .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 28 ++++++++++++++----- .../mellanox/mlx5/core/esw/ipsec_fs.c | 13 +++++++++ .../mellanox/mlx5/core/esw/ipsec_fs.h | 5 ++++ include/linux/mlx5/eswitch.h | 2 ++ 4 files changed, 41 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c +21 -7
@@ -165,6 +165,25 @@ static void ipsec_rx_status_pass_destroy(struct mlx5e_ipsec *ipsec,#endif } +static void ipsec_rx_rule_add_match_obj (struct mlx5e_ipsec_sa_entry *sa_entry, +struct mlx5e_ipsec_rx *rx, +struct mlx5_flow_spec *spec) +{ +struct mlx5e_ipsec *ipsec = sa_entry->ipsec; + +if (rx == ipsec->rx_esw) { +mlx5_esw_ipsec_rx_rule_add_match_obj (sa_entry, spec); + }else { +MLX5_SET_TO_ONES (fte_match_param, spec->match_criteria, + misc_parameters_2.metadata_reg_c_2); +MLX5_SET (fte_match_param, spec->match_value, + misc_parameters_2.metadata_reg_c_2, + sa_entry->ipsec_obj_id |BIT (31 )); + + spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS_2 ; + } +} +static int rx_add_rule_drop_auth_trailer (struct mlx5e_ipsec_sa_entry *sa_entry,struct mlx5e_ipsec_rx *rx) {
@@ -200,11 +219,8 @@ static int rx_add_rule_drop_auth_trailer(struct mlx5e_ipsec_sa_entry *sa_entry,MLX5_SET_TO_ONES (fte_match_param, spec->match_criteria, misc_parameters_2.ipsec_syndrome);MLX5_SET (fte_match_param, spec->match_value, misc_parameters_2.ipsec_syndrome,1 ); -MLX5_SET_TO_ONES (fte_match_param, spec->match_criteria, misc_parameters_2.metadata_reg_c_2); -MLX5_SET (fte_match_param, spec->match_value, - misc_parameters_2.metadata_reg_c_2, - sa_entry->ipsec_obj_id |BIT (31 )); spec->match_criteria_enable =MLX5_MATCH_MISC_PARAMETERS_2 ; +ipsec_rx_rule_add_match_obj (sa_entry, rx, spec); rule =mlx5_add_flow_rules (ft, spec, &flow_act, &dest,1 );if (IS_ERR (rule)) { err =PTR_ERR (rule);
@@ -281,10 +297,8 @@ static int rx_add_rule_drop_replay(struct mlx5e_ipsec_sa_entry *sa_entry, structMLX5_SET_TO_ONES (fte_match_param, spec->match_criteria, misc_parameters_2.metadata_reg_c_4);MLX5_SET (fte_match_param, spec->match_value, misc_parameters_2.metadata_reg_c_4,1 ); -MLX5_SET_TO_ONES (fte_match_param, spec->match_criteria, misc_parameters_2.metadata_reg_c_2); -MLX5_SET (fte_match_param, spec->match_value, misc_parameters_2.metadata_reg_c_2, - sa_entry->ipsec_obj_id |BIT (31 )); spec->match_criteria_enable =MLX5_MATCH_MISC_PARAMETERS_2 ; +ipsec_rx_rule_add_match_obj (sa_entry, rx, spec); rule =mlx5_add_flow_rules (ft, spec, &flow_act, &dest,1 );if (IS_ERR (rule)) { err =PTR_ERR (rule);
drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c +13 -0
@@ -85,6 +85,19 @@ int mlx5_esw_ipsec_rx_setup_modify_header(struct mlx5e_ipsec_sa_entry *sa_entry,return err; } +void mlx5_esw_ipsec_rx_rule_add_match_obj (struct mlx5e_ipsec_sa_entry *sa_entry, +struct mlx5_flow_spec *spec) +{ +MLX5_SET (fte_match_param, spec->match_criteria, + misc_parameters_2.metadata_reg_c_1, +ESW_IPSEC_RX_MAPPED_ID_MATCH_MASK ); +MLX5_SET (fte_match_param, spec->match_value, + misc_parameters_2.metadata_reg_c_1, + sa_entry->rx_mapped_id <<ESW_ZONE_ID_BITS ); + + spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS_2 ; +} +void mlx5_esw_ipsec_rx_id_mapping_remove (struct mlx5e_ipsec_sa_entry *sa_entry) {struct mlx5e_ipsec *ipsec = sa_entry->ipsec;
drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h +5 -0
@@ -20,6 +20,8 @@ int mlx5_esw_ipsec_rx_ipsec_obj_id_search(struct mlx5e_priv *priv, u32 id,void mlx5_esw_ipsec_tx_create_attr_set (struct mlx5e_ipsec *ipsec,struct mlx5e_ipsec_tx_create_attr *attr);void mlx5_esw_ipsec_restore_dest_uplink (struct mlx5_core_dev *mdev); +void mlx5_esw_ipsec_rx_rule_add_match_obj (struct mlx5e_ipsec_sa_entry *sa_entry, +struct mlx5_flow_spec *spec);#else static inline void mlx5_esw_ipsec_rx_create_attr_set (struct mlx5e_ipsec *ipsec,struct mlx5e_ipsec_rx_create_attr *attr) {}
@@ -48,5 +50,8 @@ static inline void mlx5_esw_ipsec_tx_create_attr_set(struct mlx5e_ipsec *ipsec, struct mlx5e_ipsec_tx_create_attr *attr) {}static inline void mlx5_esw_ipsec_restore_dest_uplink (struct mlx5_core_dev *mdev) {} +static inline void +mlx5_esw_ipsec_rx_rule_add_match_obj (struct mlx5e_ipsec_sa_entry *sa_entry, +struct mlx5_flow_spec *spec) {}#endif /* CONFIG_MLX5_ESWITCH */ #endif /* __MLX5_ESW_IPSEC_FS_H__ */
include/linux/mlx5/eswitch.h +2 -0
@@ -147,6 +147,8 @@ u32 mlx5_eswitch_get_vport_metadata_for_set(struct mlx5_eswitch *esw,/* reuse tun_opts for the mapped ipsec obj id when tun_id is 0 (invalid) */ #define ESW_IPSEC_RX_MAPPED_ID_MASK GENMASK(ESW_TUN_OPTS_BITS - 1, 0) +#define ESW_IPSEC_RX_MAPPED_ID_MATCH_MASK \ + GENMASK(31 - ESW_RESERVED_BITS, ESW_ZONE_ID_BITS)u8 mlx5_eswitch_mode (const struct mlx5_core_dev *dev);u16 mlx5_eswitch_get_total_vports (const struct mlx5_core_dev *dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 299/626 scsi: mpi3mr: Update timestamp only for supervisor IOCs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ranjan Kumar <[email protected]>
[ Upstream commit 83a9d30d29f275571f6e8f879f04b2379be7eb6c ]
The driver issues the time stamp update command periodically. Even if the command fails with supervisor only IOC Status.
Instead check the Non-Supervisor capability bit reported by IOC as part of IOC Facts.
--- drivers/scsi/mpi3mr/mpi3mr_fw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_fw.c +4 -1
@@ -2747,7 +2747,10 @@ static void mpi3mr_watchdog_work(struct work_struct *work)return ; } -if (mrioc->ts_update_counter++ >= mrioc->ts_update_interval) { +if (!(mrioc->facts.ioc_capabilities & +MPI3_IOCFACTS_CAPABILITY_NON_SUPERVISOR_IOC ) && + (mrioc->ts_update_counter++ >= mrioc->ts_update_interval)) { + mrioc->ts_update_counter =0 ;mpi3mr_sync_timestamp (mrioc); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 300/626 loop: check in LO_FLAGS_DIRECT_IO in loop_default_blocksize
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit f6f9e32fe1e454ae8ac0190b2c2bd6074914beec ]
We can't go below the minimum direct I/O size no matter if direct I/O is enabled by passing in an O_DIRECT file descriptor or due to the explicit flag. Now that LO_FLAGS_DIRECT_IO is set earlier after assigning a backing file, loop_default_blocksize can check it instead of the O_DIRECT flag to handle both conditions.
--- drivers/block/loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/loop.c +1 -1
@@ -916,7 +916,7 @@ static unsigned int loop_default_blocksize(struct loop_device *lo, struct block_device *backing_bdev) {/* In case of direct I/O, match underlying block size */ -if ((lo->lo_backing_file->f_flags &O_DIRECT ) && backing_bdev) +if ((lo->lo_flags &LO_FLAGS_DIRECT_IO ) && backing_bdev)return bdev_logical_block_size (backing_bdev);return SECTOR_SIZE ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 301/626 libbpf: Fix out-of-bound read
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nandakumar Edamana <[email protected]>
[ Upstream commit 236d3910117e9f97ebf75e511d8bcc950f1a4e5f ]
In set_kcfg_value_str, an untrusted string is accessed with the assumption that it will be at least two characters long due to the presence of checks for opening and closing quotes. But the check for the closing quote (value[len - 1] != '"') misses the fact that it could be checking the opening quote itself in case of an invalid input that consists of just the opening quote.
This commit adds an explicit check to make sure the string is at least two characters long.
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -2074,7 +2074,7 @@ static int set_kcfg_value_str(struct extern_desc *ext, char *ext_val, } len =strlen (value); -if (value[len -1 ] !='"' ) { +if (len <2 || value[len -1 ] !='"' ) {pr_warn ("extern (kcfg) '%s': invalid string config '%s'\n" , ext->name, value);return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 302/626 dm: fix unconditional IO throttle caused by REQ_PREFLUSH
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinliang Zheng <[email protected]>
[ Upstream commit 88f7f56d16f568f19e1a695af34a7f4a6ce537a6 ]
When a bio with REQ_PREFLUSH is submitted to dm, __send_empty_flush() generates a flush_bio with REQ_OP_WRITE | REQ_PREFLUSH | REQ_SYNC, which causes the flush_bio to be throttled by wbt_wait().
An example from v5.4, similar problem also exists in upstream:
crash> bt 2091206
PID: 2091206 TASK: ffff2050df92a300 CPU: 109 COMMAND: "kworker/u260:0"
#0 [ffff800084a2f7f0] __switch_to at ffff80004008aeb8
#1 [ffff800084a2f820] __schedule at ffff800040bfa0c4
#2 [ffff800084a2f880] schedule at ffff800040bfa4b4
#3 [ffff800084a2f8a0] io_schedule at ffff800040bfa9c4
#4 [ffff800084a2f8c0] rq_qos_wait at ffff8000405925bc
#5 [ffff800084a2f940] wbt_wait at ffff8000405bb3a0
#6 [ffff800084a2f9a0] __rq_qos_throttle at ffff800040592254
#7 [ffff800084a2f9c0] blk_mq_make_request at ffff80004057cf38
#8 [ffff800084a2fa60] generic_make_request at ffff800040570138
#9 [ffff800084a2fae0] submit_bio at ffff8000405703b4
#10 [ffff800084a2fb50] xlog_write_iclog at ffff800001280834 [xfs]
#11 [ffff800084a2fbb0] xlog_sync at ffff800001280c3c [xfs]
#12 [ffff800084a2fbf0] xlog_state_release_iclog at ffff800001280df4 [xfs]
#13 [ffff800084a2fc10] xlog_write at ffff80000128203c [xfs]
#14 [ffff800084a2fcd0] xlog_cil_push at ffff8000012846dc [xfs]
#15 [ffff800084a2fda0] xlog_cil_push_work at ffff800001284a2c [xfs]
#16 [ffff800084a2fdb0] process_one_work at ffff800040111d08
#17 [ffff800084a2fe00] worker_thread at ffff8000401121cc
#18 [ffff800084a2fe70] kthread at ffff800040118de4After commit 2def2845cc33 ("xfs: don't allow log IO to be throttled"), the metadata submitted by xlog_write_iclog() should not be throttled. But due to the existence of the dm layer, throttling flush_bio indirectly causes the metadata bio to be throttled.
Fix this by conditionally adding REQ_IDLE to flush_bio.bi_opf, which makes wbt_should_throttle() return false to avoid wbt_wait().
--- drivers/md/dm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/md/dm.c +6 -2
@@ -1541,14 +1541,18 @@ static void __send_empty_flush(struct clone_info *ci) {struct dm_table *t = ci->map;struct bio flush_bio; +blk_opf_t opf =REQ_OP_WRITE |REQ_PREFLUSH |REQ_SYNC ; + +if ((ci->io->orig_bio->bi_opf & (REQ_IDLE |REQ_SYNC )) == + (REQ_IDLE |REQ_SYNC )) + opf |=REQ_IDLE ;/* * Use an on-stack bio for this, it's safe since we don't * need to reference it after submit. It's just used as * the basis for the clone(s). */ -bio_init (&flush_bio, ci->io->md->disk->part0,NULL ,0 , -REQ_OP_WRITE |REQ_PREFLUSH |REQ_SYNC ); +bio_init (&flush_bio, ci->io->md->disk->part0,NULL ,0 , opf); ci->bio = &flush_bio; ci->sector_count =0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 303/626 scsi: scsi_debug: First fixes for tapes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai Mäkisara <[email protected]>
[ Upstream commit f69da85d5d5cc5b7dfb963a6c6c1ac0dd9002341 ]
Patch includes the following:
- Enable MODE SENSE/SELECT without actual page (to read/write only the Block Descriptor)
- Store the density code and block size in the Block Descriptor (only short version for tapes)
- Fix REWIND not to use the wrong page filling function
--- drivers/scsi/scsi_debug.c | 55 ++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 6 deletions(-)
drivers/scsi/scsi_debug.c +49 -6
@@ -173,6 +173,10 @@ static const char *sdebug_version_date = "20210520";#define DEF_ZBC_MAX_OPEN_ZONES 8#define DEF_ZBC_NR_CONV_ZONES 1 +/* Default parameters for tape drives */ +#define TAPE_DEF_DENSITY 0x0 +#define TAPE_DEF_BLKSIZE 0 +#define SDEBUG_LUN_0_VAL 0/* bit mask values for sdebug_opts */
@@ -363,6 +367,10 @@ struct sdebug_dev_info {ktime_t create_ts;/* time since bootup that this device was created */ struct sdeb_zone_state *zstate; +/* For tapes */ +unsigned int tape_blksize; +unsigned int tape_density; +struct dentry *debugfs_entry;struct spinlock list_lock;struct list_head inject_err_list;
@@ -773,7 +781,7 @@ static const struct opcode_info_t opcode_info_arr[SDEB_I_LAST_ELEM_P1 + 1] = {/* 20 */ {0 ,0x1e ,0 ,0 ,NULL ,NULL ,/* ALLOW REMOVAL */ {6, 0, 0, 0, 0x3, 0xc7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, - {0, 0x1, 0, 0, resp_start_stop, NULL, /* REWIND ?? */ + {0, 0x1, 0, 0, NULL, NULL, /* REWIND ?? */ {6, 0x1, 0, 0, 0, 0xc7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, {0, 0, 0, F_INV_OP | FF_RESPOND, NULL, NULL, /* ATA_PT */ {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
@@ -2742,7 +2750,7 @@ static int resp_mode_sense(struct scsi_cmnd *scp,unsigned char *ap; unsigned char *arr __free(kfree);unsigned char *cmd = scp->cmnd; -bool dbd, llbaa, msense_6, is_disk, is_zbc; +bool dbd, llbaa, msense_6, is_disk, is_zbc, is_tape; arr =kzalloc (SDEBUG_MAX_MSENSE_SZ ,GFP_ATOMIC );if (!arr)
@@ -2755,7 +2763,8 @@ static int resp_mode_sense(struct scsi_cmnd *scp, llbaa = msense_6 ? false : !!(cmd[1 ] &0x10 ); is_disk = (sdebug_ptype ==TYPE_DISK ); is_zbc = devip->zoned; -if ((is_disk || is_zbc) && !dbd) + is_tape = (sdebug_ptype ==TYPE_TAPE ); +if ((is_disk || is_zbc || is_tape) && !dbd) bd_len = llbaa ?16 :8 ;else bd_len =0 ;
@@ -2793,15 +2802,25 @@ static int resp_mode_sense(struct scsi_cmnd *scp,put_unaligned_be32 (0xffffffff , ap +0 ); else put_unaligned_be32(sdebug_capacity, ap + 0); -put_unaligned_be16 (sdebug_sector_size, ap +6 ); +if (is_tape) { + ap[0 ] = devip->tape_density; +put_unaligned_be16 (devip->tape_blksize, ap +6 ); + }else +put_unaligned_be16 (sdebug_sector_size, ap +6 ); offset += bd_len; ap = arr + offset; }else if (16 == bd_len) { +if (is_tape) { +mk_sense_invalid_fld (scp,SDEB_IN_DATA ,1 ,4 ); +return check_condition_result; + }put_unaligned_be64 ((u64 )sdebug_capacity, ap +0 );put_unaligned_be32 (sdebug_sector_size, ap +12 ); offset += bd_len; ap = arr + offset; } +if (cmd[2 ] ==0 ) + goto only_bd;/* Only block descriptor requested */ /* * N.B. If len>0 before resp_*_pg() call, then form of that call should be:
@@ -2902,6 +2921,7 @@ static int resp_mode_sense(struct scsi_cmnd *scp,default : goto bad_pcode; } +only_bd:if (msense_6) arr[0 ] = offset -1 ;else
@@ -2945,8 +2965,27 @@ static int resp_mode_select(struct scsi_cmnd *scp, __func__, param_len, res); md_len = mselect6 ? (arr[0 ] +1 ) : (get_unaligned_be16 (arr +0 ) +2 ); bd_len = mselect6 ? arr[3 ] :get_unaligned_be16 (arr +6 ); - off = bd_len + (mselect6 ?4 :8 ); -if (md_len >2 || off >= res) { + off = (mselect6 ?4 :8 ); +if (sdebug_ptype ==TYPE_TAPE ) { +int blksize; + +if (bd_len !=8 ) { +mk_sense_invalid_fld (scp,SDEB_IN_DATA , + mselect6 ?3 :6 ,-1 ); +return check_condition_result; + } + blksize =get_unaligned_be16 (arr + off +6 ); +if ((blksize %4 ) !=0 ) { +mk_sense_invalid_fld (scp,SDEB_IN_DATA , off +6 ,-1 ); +return check_condition_result; + } + devip->tape_density = arr[off]; + devip->tape_blksize = blksize; + } + off += bd_len; +if (off >= res) +return 0 ;/* No page written, just descriptors */ +if (md_len >2 ) {mk_sense_invalid_fld (scp,SDEB_IN_DATA ,0 ,-1 );return check_condition_result; }
@@ -5835,6 +5874,10 @@ static struct sdebug_dev_info *sdebug_device_create( }else { devip->zoned = false; } +if (sdebug_ptype ==TYPE_TAPE ) { + devip->tape_density =TAPE_DEF_DENSITY ; + devip->tape_blksize =TAPE_DEF_BLKSIZE ; + } devip->create_ts =ktime_get_boottime ();atomic_set (&devip->stopped, (sdeb_tur_ms_to_ready >0 ?2 :0 ));spin_lock_init (&devip->list_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 304/626 net/mlx5: Change POOL_NEXT_SIZE define value and make it global
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit 80df31f384b4146a62a01b3d4beb376cc7b9a89e ]
Change POOL_NEXT_SIZE define value from 0 to BIT(30), since this define is used to request the available maximum sized flow table, and zero doesn't make sense for it, whereas some places in the driver use zero explicitly expecting the smallest table size possible but instead due to this define they end up allocating the biggest table size unawarely.
In addition move the definition to "include/linux/mlx5/fs.h" to expose the define to IB driver as well, while appropriately renaming it.
--- drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c | 6 ++++-- drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h | 2 -- drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 ++- include/linux/mlx5/fs.h | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c +1 -1
@@ -96,7 +96,7 @@ static int esw_create_legacy_fdb_table(struct mlx5_eswitch *esw)if (!flow_group_in)return -ENOMEM ; - ft_attr.max_fte =POOL_NEXT_SIZE ; + ft_attr.max_fte =MLX5_FS_MAX_POOL_SIZE ; ft_attr.prio =LEGACY_FDB_PRIO ; fdb =mlx5_create_flow_table (root_ns, &ft_attr);if (IS_ERR (fdb)) {
drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c +4 -2
@@ -50,10 +50,12 @@ mlx5_ft_pool_get_avail_sz(struct mlx5_core_dev *dev, enum fs_flow_table_type tabint i, found_i =-1 ;for (i =ARRAY_SIZE (FT_POOLS ) -1 ; i >=0 ; i--) { -if (dev->priv.ft_pool->ft_left[i] &&FT_POOLS [i] >= desired_size && +if (dev->priv.ft_pool->ft_left[i] && + (FT_POOLS [i] >= desired_size || + desired_size ==MLX5_FS_MAX_POOL_SIZE ) &&FT_POOLS [i] <= max_ft_size) { found_i = i; -if (desired_size !=POOL_NEXT_SIZE ) +if (desired_size !=MLX5_FS_MAX_POOL_SIZE )break ; } }
drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h +0 -2
@@ -7,8 +7,6 @@#include <linux/mlx5/driver.h> #include "fs_core.h" -#define POOL_NEXT_SIZE 0 -int mlx5_ft_pool_init (struct mlx5_core_dev *dev);void mlx5_ft_pool_destroy (struct mlx5_core_dev *dev);
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c +2 -1
@@ -161,7 +161,8 @@ mlx5_chains_create_table(struct mlx5_fs_chains *chains, ft_attr.flags |= (MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT |MLX5_FLOW_TABLE_TUNNEL_EN_DECAP ); - sz = (chain ==mlx5_chains_get_nf_ft_chain (chains)) ?FT_TBL_SZ :POOL_NEXT_SIZE ; + sz = (chain ==mlx5_chains_get_nf_ft_chain (chains)) ? +FT_TBL_SZ :MLX5_FS_MAX_POOL_SIZE ; ft_attr.max_fte = sz;/* We use chains_default_ft(chains) as the table's next_ft till
include/linux/mlx5/fs.h +2 -0
@@ -40,6 +40,8 @@#define MLX5_SET_CFG (p, f, v) MLX5_SET(create_flow_group_in, p, f, v) +#define MLX5_FS_MAX_POOL_SIZE BIT(30) +enum mlx5_flow_destination_type {MLX5_FLOW_DESTINATION_TYPE_NONE ,MLX5_FLOW_DESTINATION_TYPE_VPORT ,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 305/626 x86/kaslr: Reduce KASLR entropy on most x86 systems
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Balbir Singh <[email protected]>
[ Upstream commit 7ffb791423c7c518269a9aad35039ef824a40adb ]
When CONFIG_PCI_P2PDMA=y (which is basically enabled on all large x86 distros), it maps the PFN's via a ZONE_DEVICE mapping using devm_memremap_pages(). The mapped virtual address range corresponds to the pci_resource_start() of the BAR address and size corresponding to the BAR length.
When KASLR is enabled, the direct map range of the kernel is reduced to the size of physical memory plus additional padding. If the BAR address is beyond this limit, PCI peer to peer DMA mappings fail.
Fix this by not shrinking the size of the direct map when CONFIG_PCI_P2PDMA=y.
This reduces the total available entropy, but it's better than the current work around of having to disable KASLR completely.
[ mingo: Clarified the changelog to point out the broad impact ... ]
--
arch/x86/mm/kaslr.c | 10 ++++++++-- drivers/pci/Kconfig | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
--- arch/x86/mm/kaslr.c | 10 ++++++++-- drivers/pci/Kconfig | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
arch/x86/mm/kaslr.c +8 -2
@@ -109,8 +109,14 @@ void __init kernel_randomize_memory(void) memory_tb =DIV_ROUND_UP (max_pfn <<PAGE_SHIFT ,1UL <<TB_SHIFT ) +CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING ; -/* Adapt physical memory region size based on available memory */ -if (memory_tb < kaslr_regions[0 ].size_tb) +/* +* Adapt physical memory region size based on available memory, +* except when CONFIG_PCI_P2PDMA is enabled. P2PDMA exposes the +* device BAR space assuming the direct map space is large enough +* for creating a ZONE_DEVICE mapping in the direct map corresponding +* to the physical BAR address. +*/ +if (!IS_ENABLED (CONFIG_PCI_P2PDMA ) && (memory_tb < kaslr_regions[0 ].size_tb)) kaslr_regions[0 ].size_tb = memory_tb;/*
drivers/pci/Kconfig +6 -0
@@ -194,6 +194,12 @@ config PCI_P2PDMA P2P DMA transactions must be between devices behind the same root port. + Enabling this option will reduce the entropy of x86 KASLR memory + regions. For example - on a 46 bit system, the entropy goes down + from 16 bits to 15 bits. The actual reduction in entropy depends + on the physical address bits, on processor features, kernel config + (5 level page table) and physical memory present on the system. + If unsure, say N. config PCI_LABEL
Signature · 1 line
2.39.5
Re: [PATCH 6.12 305/626] x86/kaslr: Reduce KASLR entropy on most x86 systems
Hi!
Quoted 1 line
6.12-stable review patch. If anyone has any objections, please let me know.
Something went wrong with the scripts here:
Quoted 12 lines
[ mingo: Clarified the changelog to point out the broad impact ... ]
Signed-off-by Balbir Singh <[email protected]>Signed-off-by Ingo Molnar <[email protected]>Reviewed-by Kees Cook <[email protected]>Cc Linus Torvalds <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Andy Lutomirski <[email protected]>--
Quoted 8 lines
arch/x86/mm/kaslr.c | 10 ++++++++-- drivers/pci/Kconfig | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-)Signed-off-by Sasha Levin <[email protected]>--- arch/x86/mm/kaslr.c | 10 ++++++++-- drivers/pci/Kconfig | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
Two diffstats and signoff at the weird place. You'll miss the signoff if you are not careful.
BR,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 306/626 crypto: ahash - Set default reqsize from ahash_alg
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit 9e01aaa1033d6e40f8d7cf4f20931a61ce9e3f04 ]
Add a reqsize field to struct ahash_alg and use it to set the default reqsize so that algorithms with a static reqsize are not forced to create an init_tfm function.
--- crypto/ahash.c | 4 ++++ include/crypto/hash.h | 3 +++ 2 files changed, 7 insertions(+)
crypto/ahash.c +4 -0
@@ -473,6 +473,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)struct ahash_alg *alg =crypto_ahash_alg (hash);crypto_ahash_set_statesize (hash, alg->halg.statesize); +crypto_ahash_set_reqsize (hash, alg->reqsize);if (tfm->__crt_alg->cra_type == &crypto_shash_type)return crypto_init_ahash_using_shash (tfm);
@@ -638,6 +639,9 @@ static int ahash_prepare_alg(struct ahash_alg *alg)if (alg->halg.statesize ==0 )return -EINVAL ; +if (alg->reqsize && alg->reqsize < alg->halg.statesize) +return -EINVAL ; + err =hash_prepare_alg (&alg->halg);if (err)return err;
include/crypto/hash.h +3 -0
@@ -132,6 +132,7 @@ struct ahash_request {* This is a counterpart to @init_tfm, used to remove * various changes set in @init_tfm. * @clone_tfm: Copy transform into new object, may allocate memory. +* @reqsize: Size of the request context. * @halg: see struct hash_alg_common */ struct ahash_alg {
@@ -148,6 +149,8 @@ struct ahash_alg {void (*exit_tfm)(struct crypto_ahash *tfm);int (*clone_tfm)(struct crypto_ahash *dst,struct crypto_ahash *src); +unsigned int reqsize; +struct hash_alg_common halg; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 307/626 crypto: skcipher - Zap type in crypto_alloc_sync_skcipher
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit ee509efc74ddbc59bb5d6fd6e050f9ef25f74bff ]
The type needs to be zeroed as otherwise the user could use it to allocate an asynchronous sync skcipher.
--- crypto/skcipher.c | 1 + 1 file changed, 1 insertion(+)
crypto/skcipher.c +1 -0
@@ -844,6 +844,7 @@ struct crypto_sync_skcipher *crypto_alloc_sync_skcipher(/* Only sync algorithms allowed. */ mask |=CRYPTO_ALG_ASYNC |CRYPTO_ALG_SKCIPHER_REQSIZE_LARGE ; + type &= ~(CRYPTO_ALG_ASYNC |CRYPTO_ALG_SKCIPHER_REQSIZE_LARGE ); tfm =crypto_alloc_tfm (alg_name, &crypto_skcipher_type, type, mask);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 308/626 net: ipv6: Init tunnel link-netns before registering dev
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiao Liang <[email protected]>
[ Upstream commit db014522f35606031d8ac58b4aed6b1ed84f03d1 ]
Currently some IPv6 tunnel drivers set tnl->net to dev_net(dev) in ndo_init(), which is called in register_netdevice(). However, it lacks the context of link-netns when we enable cross-net tunnels at device registration time.
Let's move the init of tunnel link-netns before register_netdevice().
ip6_gre has already initialized netns, so just remove the redundant assignment.
--- net/ipv6/ip6_gre.c | 2 -- net/ipv6/ip6_tunnel.c | 3 ++- net/ipv6/ip6_vti.c | 3 ++- net/ipv6/sit.c | 8 +++++--- 4 files changed, 9 insertions(+), 7 deletions(-)
net/ipv6/ip6_gre.c +0 -2
@@ -1498,7 +1498,6 @@ static int ip6gre_tunnel_init_common(struct net_device *dev) tunnel =netdev_priv (dev); tunnel->dev = dev; - tunnel->net =dev_net (dev);strcpy (tunnel->parms.name, dev->name); ret =dst_cache_init (&tunnel->dst_cache,GFP_KERNEL );
@@ -1882,7 +1881,6 @@ static int ip6erspan_tap_init(struct net_device *dev) tunnel =netdev_priv (dev); tunnel->dev = dev; - tunnel->net =dev_net (dev);strcpy (tunnel->parms.name, dev->name); ret =dst_cache_init (&tunnel->dst_cache,GFP_KERNEL );
net/ipv6/ip6_tunnel.c +2 -1
@@ -1878,7 +1878,6 @@ ip6_tnl_dev_init_gen(struct net_device *dev)int t_hlen; t->dev = dev; - t->net =dev_net (dev); ret =dst_cache_init (&t->dst_cache,GFP_KERNEL );if (ret)
@@ -1940,6 +1939,7 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev)struct net *net =dev_net (dev);struct ip6_tnl_net *ip6n =net_generic (net, ip6_tnl_net_id); + t->net = net; t->parms.proto =IPPROTO_IPV6 ;rcu_assign_pointer (ip6n->tnls_wc[0 ], t);
@@ -2013,6 +2013,7 @@ static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,int err; nt =netdev_priv (dev); + nt->net = net;if (ip_tunnel_netlink_encap_parms (data, &ipencap)) { err =ip6_tnl_encap_setup (nt, &ipencap);
net/ipv6/ip6_vti.c +2 -1
@@ -925,7 +925,6 @@ static inline int vti6_dev_init_gen(struct net_device *dev)struct ip6_tnl *t =netdev_priv (dev); t->dev = dev; - t->net =dev_net (dev);netdev_hold (dev, &t->dev_tracker,GFP_KERNEL );netdev_lockdep_set_classes (dev);return 0 ;
@@ -958,6 +957,7 @@ static int __net_init vti6_fb_tnl_dev_init(struct net_device *dev)struct net *net =dev_net (dev);struct vti6_net *ip6n =net_generic (net, vti6_net_id); + t->net = net; t->parms.proto =IPPROTO_IPV6 ;rcu_assign_pointer (ip6n->tnls_wc[0 ], t);
@@ -1008,6 +1008,7 @@ static int vti6_newlink(struct net *src_net, struct net_device *dev,vti6_netlink_parms (data, &nt->parms); nt->parms.proto =IPPROTO_IPV6 ; + nt->net = net;if (vti6_locate (net, &nt->parms,0 ))return -EEXIST ;
net/ipv6/sit.c +5 -3
@@ -269,6 +269,7 @@ static struct ip_tunnel *ipip6_tunnel_locate(struct net *net, nt =netdev_priv (dev); + nt->net = net; nt->parms = *parms;if (ipip6_tunnel_create (dev) <0 ) goto failed_free;
@@ -1449,7 +1450,6 @@ static int ipip6_tunnel_init(struct net_device *dev)int err; tunnel->dev = dev; - tunnel->net =dev_net (dev);strcpy (tunnel->parms.name, dev->name);ipip6_tunnel_bind_dev (dev);
@@ -1563,6 +1563,7 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev,int err; nt =netdev_priv (dev); + nt->net = net;if (ip_tunnel_netlink_encap_parms (data, &ipencap)) { err =ip_tunnel_encap_setup (nt, &ipencap);
@@ -1858,6 +1859,9 @@ static int __net_init sit_init_net(struct net *net)*/ sitn->fb_tunnel_dev->netns_local = true; + t =netdev_priv (sitn->fb_tunnel_dev); + t->net = net; + err =register_netdev (sitn->fb_tunnel_dev);if (err) goto err_reg_dev;
@@ -1865,8 +1869,6 @@ static int __net_init sit_init_net(struct net *net)ipip6_tunnel_clone_6rd (sitn->fb_tunnel_dev, sitn);ipip6_fb_tunnel_init (sitn->fb_tunnel_dev); - t =netdev_priv (sitn->fb_tunnel_dev); -strcpy (t->parms.name, sitn->fb_tunnel_dev->name);return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 309/626 drm/xe/oa: Ensure that polled read returns latest data
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Umesh Nerlige Ramappa <[email protected]>
[ Upstream commit 98c9d27ab30aa9c6451d3a34e6e297171f273e51 ]
In polled mode, user calls poll() for read data to be available before performing a read(). In the duration between these 2 calls, there may be new data available in the OA buffer. To ensure user reads all available data, check for latest data in the OA buffer in polled read.
--- drivers/gpu/drm/xe/xe_oa.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/xe/xe_oa.c +1 -0
@@ -535,6 +535,7 @@ static ssize_t xe_oa_read(struct file *file, char __user *buf,mutex_unlock (&stream->stream_lock); }while (!offset && !ret); }else { +xe_oa_buffer_check_unlocked (stream);mutex_lock (&stream->stream_lock); ret =__xe_oa_read (stream, buf, count, &offset);mutex_unlock (&stream->stream_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 310/626 MIPS: Use arch specific syscall name match function
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bibo Mao <[email protected]>
[ Upstream commit 756276ce78d5624dc814f9d99f7d16c8fd51076e ]
On MIPS system, most of the syscall function name begin with prefix sys_. Some syscalls are special such as clone/fork, function name of these begin with __sys_. Since scratch registers need be saved in stack when these system calls happens.
With ftrace system call method, system call functions are declared with SYSCALL_DEFINEx, metadata of the system call symbol name begins with sys_. Here mips specific function arch_syscall_match_sym_name is used to compare function name between sys_call_table[] and metadata of syscall symbol.
--- arch/mips/include/asm/ftrace.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/mips/include/asm/ftrace.h +16 -0
@@ -91,4 +91,20 @@ void prepare_ftrace_return(unsigned long *parent_ra_addr, unsigned long self_ra,#endif /* __ASSEMBLY__ */ #endif /* CONFIG_FUNCTION_TRACER */ + +#ifdef CONFIG_FTRACE_SYSCALLS +#ifndef __ASSEMBLY__ +/* +* Some syscall entry functions on mips start with "__sys_" (fork and clone, +* for instance). We should also match the sys_ variant with those. +*/ +#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME +static inline bool arch_syscall_match_sym_name (const char *sym, +const char *name) +{ +return !strcmp (sym, name) || + (!strncmp (sym,"__sys_" ,6 ) && !strcmp (sym +6 , name +4 )); +} +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_FTRACE_SYSCALLS */ #endif /* _ASM_MIPS_FTRACE_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 311/626 drm/amdgpu: remove all KFD fences from the BO on release
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian König <[email protected]>
[ Upstream commit cb0de06d1b0afb2d0c600ad748069f5ce27730ec ]
Remove all KFD BOs from the private dma_resv object.
This prevents the KFD from being evict unecessarily when an exported BO is released.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 52 ++++++++----------- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 38 ++++++++------ 3 files changed, 47 insertions(+), 48 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -3
@@ -192,7 +192,7 @@ int kfd_debugfs_kfd_mem_limits(struct seq_file *m, void *data);#if IS_ENABLED (CONFIG_HSA_AMD )bool amdkfd_fence_check_mm (struct dma_fence *f,struct mm_struct *mm);struct amdgpu_amdkfd_fence *to_amdgpu_amdkfd_fence (struct dma_fence *f); -int amdgpu_amdkfd_remove_fence_on_pt_pd_bos (struct amdgpu_bo *bo); +void amdgpu_amdkfd_remove_all_eviction_fences (struct amdgpu_bo *bo);int amdgpu_amdkfd_evict_userptr (struct mmu_interval_notifier *mni,unsigned long cur_seq,struct kgd_mem *mem); int amdgpu_amdkfd_bo_validate_and_fence(struct amdgpu_bo *bo,
@@ -212,9 +212,8 @@ struct amdgpu_amdkfd_fence *to_amdgpu_amdkfd_fence(struct dma_fence *f) }static inline -int amdgpu_amdkfd_remove_fence_on_pt_pd_bos (struct amdgpu_bo *bo) +void amdgpu_amdkfd_remove_all_eviction_fences (struct amdgpu_bo *bo) { -return 0 ; } static inline
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +22 -30
62 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +23 -15
@@ -1246,28 +1246,36 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)if (abo->kfd_bo)amdgpu_amdkfd_release_notify (abo); -/* We only remove the fence if the resv has individualized. */ -WARN_ON_ONCE (bo->type == ttm_bo_type_kernel - && bo->base.resv != &bo->base._resv); -if (bo->base.resv == &bo->base._resv) -amdgpu_amdkfd_remove_fence_on_pt_pd_bos (abo); +/* +* We lock the private dma_resv object here and since the BO is about to +* be released nobody else should have a pointer to it. +* So when this locking here fails something is wrong with the reference +* counting. +*/ +if (WARN_ON_ONCE (!dma_resv_trylock (&bo->base._resv))) +return ; + +amdgpu_amdkfd_remove_all_eviction_fences (abo);if (!bo->resource || bo->resource->mem_type !=TTM_PL_VRAM || !(abo->flags &AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE ) || adev->in_suspend ||drm_dev_is_unplugged (adev_to_drm (adev))) -return ; + goto out; -if (WARN_ON_ONCE (!dma_resv_trylock (bo->base.resv))) -return ; + r =dma_resv_reserve_fences (&bo->base._resv,1 ); +if (r) + goto out; - r =amdgpu_fill_buffer (abo,0 , bo->base.resv, &fence, true); -if (!WARN_ON (r)) { -amdgpu_vram_mgr_set_cleared (bo->resource); -amdgpu_bo_fence (abo, fence, false); -dma_fence_put (fence); - } + r =amdgpu_fill_buffer (abo,0 , &bo->base._resv, &fence, true); +if (WARN_ON (r)) + goto out; + +amdgpu_vram_mgr_set_cleared (bo->resource); +dma_resv_add_fence (&bo->base._resv, fence,DMA_RESV_USAGE_KERNEL ); +dma_fence_put (fence); -dma_resv_unlock (bo->base.resv); +out: +dma_resv_unlock (&bo->base._resv); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 312/626 x86/locking: Use ALT_OUTPUT_SP() for percpu_{,try_}cmpxchg{64,128}_op()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uros Bizjak <[email protected]>
[ Upstream commit 4087e16b033140cf2ce509ec23503bddec818a16 ]
percpu_{,try_}cmpxchg{64,128}() macros use CALL instruction inside asm statement in one of their alternatives. Use ALT_OUTPUT_SP() macro to add required dependence on %esp register.
ALT_OUTPUT_SP() implements the above dependence by adding ASM_CALL_CONSTRAINT to its arguments. This constraint should be used for any inline asm which has a CALL instruction, otherwise the compiler may schedule the asm before the frame pointer gets set up by the containing function, causing objtool to print a "call without frame pointer save/setup" warning.
--- arch/x86/include/asm/percpu.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/x86/include/asm/percpu.h +14 -14
@@ -349,9 +349,9 @@ do { \ \ asm qual (ALTERNATIVE("call this_cpu_cmpxchg8b_emu", \ "cmpxchg8b " __percpu_arg([var]), X86_FEATURE_CX8) \ - : [var] "+m" (__my_cpu_var(_var)), \ - "+a" (old__.low), \ - "+d" (old__.high) \ + : ALT_OUTPUT_SP([var] "+m" (__my_cpu_var(_var)), \ + "+a" (old__.low), \ + "+d" (old__.high)) \ : "b" (new__.low), \"c" (new__.high), \"S" (&(_var)) \
@@ -380,10 +380,10 @@ do { \ asm qual (ALTERNATIVE("call this_cpu_cmpxchg8b_emu", \ "cmpxchg8b " __percpu_arg([var]), X86_FEATURE_CX8) \ CC_SET(z) \ - : CC_OUT(z) (success), \ - [var] "+m" (__my_cpu_var(_var)), \ -" +a" (old__.low), \ -" +d" (old__.high) \ + : ALT_OUTPUT_SP(CC_OUT(z) (success), \ + [var] "+m" (__my_cpu_var(_var)), \ +" +a" (old__.low), \ +" +d" (old__.high)) \ : " b" (new__.low), \ " c" (new__.high), \ "S" (&(_var)) \
@@ -420,9 +420,9 @@ do { \ \ asm qual (ALTERNATIVE("call this_cpu_cmpxchg16b_emu", \ "cmpxchg16b " __percpu_arg([var]), X86_FEATURE_CX16) \ - : [var] "+m" (__my_cpu_var(_var)), \ - "+a" (old__.low), \ - "+d" (old__.high) \ + : ALT_OUTPUT_SP([var] "+m" (__my_cpu_var(_var)), \ + "+a" (old__.low), \ + "+d" (old__.high)) \ : "b" (new__.low), \"c" (new__.high), \"S" (&(_var)) \
@@ -451,10 +451,10 @@ do { \ asm qual (ALTERNATIVE("call this_cpu_cmpxchg16b_emu", \ "cmpxchg16b " __percpu_arg([var]), X86_FEATURE_CX16) \ CC_SET(z) \ - : CC_OUT(z) (success), \ - [var] "+m" (__my_cpu_var(_var)), \ -" +a" (old__.low), \ -" +d" (old__.high) \ + : ALT_OUTPUT_SP(CC_OUT(z) (success), \ + [var] "+m" (__my_cpu_var(_var)), \ +" +a" (old__.low), \ +" +d" (old__.high)) \ : " b" (new__.low), \ " c" (new__.high), \ "S" (&(_var)) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 313/626 genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit 1f7df3a691740a7736bbc99dc4ed536120eb4746 ]
The IOMMU translation for MSI message addresses has been a 2-step process, separated in time:
1) iommu_dma_prepare_msi(): A cookie pointer containing the IOVA address is stored in the MSI descriptor when an MSI interrupt is allocated.
2) iommu_dma_compose_msi_msg(): this cookie pointer is used to compute a translated message address.
This has an inherent lifetime problem for the pointer stored in the cookie that must remain valid between the two steps. However, there is no locking at the irq layer that helps protect the lifetime. Today, this works under the assumption that the iommu domain is not changed while MSI interrupts being programmed. This is true for normal DMA API users within the kernel, as the iommu domain is attached before the driver is probed and cannot be changed while a driver is attached.
Classic VFIO type1 also prevented changing the iommu domain while VFIO was running as it does not support changing the "container" after starting up.
However, iommufd has improved this so that the iommu domain can be changed during VFIO operation. This potentially allows userspace to directly race VFIO_DEVICE_ATTACH_IOMMUFD_PT (which calls iommu_attach_group()) and VFIO_DEVICE_SET_IRQS (which calls into iommu_dma_compose_msi_msg()).
This potentially causes both the cookie pointer and the unlocked call to iommu_get_domain_for_dev() on the MSI translation path to become UAFs.
Fix the MSI cookie UAF by removing the cookie pointer. The translated IOVA address is already known during iommu_dma_prepare_msi() and cannot change. Thus, it can simply be stored as an integer in the MSI descriptor.
The other UAF related to iommu_get_domain_for_dev() will be addressed in patch "iommu: Make iommu_dma_prepare_msi() into a generic operation" by using the IOMMU group mutex.
--- drivers/iommu/dma-iommu.c | 28 +++++++++++++--------------- include/linux/msi.h | 33 ++++++++++++--------------------- 2 files changed, 25 insertions(+), 36 deletions(-)
drivers/iommu/dma-iommu.c +13 -15
@@ -1815,7 +1815,7 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)static DEFINE_MUTEX (msi_prepare_lock);/* see below */ if (!domain || !domain->iova_cookie) { - desc->iommu_cookie =NULL ; +msi_desc_set_iommu_msi_iova (desc,0 ,0 );return 0 ; }
@@ -1827,11 +1827,12 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)mutex_lock (&msi_prepare_lock); msi_page =iommu_dma_get_msi_page (dev, msi_addr, domain);mutex_unlock (&msi_prepare_lock); - -msi_desc_set_iommu_cookie (desc, msi_page); -if (!msi_page)return -ENOMEM ; + +msi_desc_set_iommu_msi_iova ( + desc, msi_page->iova, +ilog2 (cookie_msi_granule (domain->iova_cookie)));return 0 ; }
@@ -1842,18 +1843,15 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)*/ void iommu_dma_compose_msi_msg (struct msi_desc *desc,struct msi_msg *msg) { -struct device *dev =msi_desc_to_dev (desc); -const struct iommu_domain *domain =iommu_get_domain_for_dev (dev); -const struct iommu_dma_msi_page *msi_page; +#ifdef CONFIG_IRQ_MSI_IOMMU +if (desc->iommu_msi_shift) { +u64 msi_iova = desc->iommu_msi_iova << desc->iommu_msi_shift; - msi_page =msi_desc_get_iommu_cookie (desc); - -if (!domain || !domain->iova_cookie ||WARN_ON (!msi_page)) -return ; - - msg->address_hi =upper_32_bits (msi_page->iova); - msg->address_lo &=cookie_msi_granule (domain->iova_cookie) -1 ; - msg->address_lo +=lower_32_bits (msi_page->iova); + msg->address_hi =upper_32_bits (msi_iova); + msg->address_lo =lower_32_bits (msi_iova) | + (msg->address_lo & ((1 << desc->iommu_msi_shift) -1 )); + } +#endif }static int iommu_dma_init (void )
include/linux/msi.h +12 -21
@@ -165,6 +165,10 @@ struct msi_desc_data {* @dev: Pointer to the device which uses this descriptor * @msg: The last set MSI message cached for reuse * @affinity: Optional pointer to a cpu affinity mask for this descriptor +* @iommu_msi_iova: Optional shifted IOVA from the IOMMU to override the msi_addr. +* Only used if iommu_msi_shift != 0 +* @iommu_msi_shift: Indicates how many bits of the original address should be +* preserved when using iommu_msi_iova. * @sysfs_attr: Pointer to sysfs device attribute * * @write_msi_msg: Callback that may be called when the MSI message
@@ -183,7 +187,8 @@ struct msi_desc {struct msi_msg msg;struct irq_affinity_desc *affinity;#ifdef CONFIG_IRQ_MSI_IOMMU -const void *iommu_cookie; + u64 iommu_msi_iova : 58; + u64 iommu_msi_shift : 6;#endif #ifdef CONFIG_SYSFS struct device_attribute *sysfs_attrs;
@@ -284,28 +289,14 @@ struct msi_desc *msi_next_desc(struct device *dev, unsigned int domid,#define msi_desc_to_dev (desc) ((desc)->dev) -#ifdef CONFIG_IRQ_MSI_IOMMU -static inline const void *msi_desc_get_iommu_cookie (struct msi_desc *desc) -{ -return desc->iommu_cookie; -} - -static inline void msi_desc_set_iommu_cookie (struct msi_desc *desc, -const void *iommu_cookie) -{ - desc->iommu_cookie = iommu_cookie; -} -#else -static inline const void *msi_desc_get_iommu_cookie (struct msi_desc *desc) +static inline void msi_desc_set_iommu_msi_iova (struct msi_desc *desc,u64 msi_iova, +unsigned int msi_shift) { -return NULL ; -} - -static inline void msi_desc_set_iommu_cookie (struct msi_desc *desc, -const void *iommu_cookie) -{ -} +#ifdef CONFIG_IRQ_MSI_IOMMU + desc->iommu_msi_iova = msi_iova >> msi_shift; + desc->iommu_msi_shift = msi_shift;#endif +}int msi_domain_insert_msi_desc (struct device *dev,unsigned int domid,struct msi_desc *init_desc);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 314/626 MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Burton <[email protected]>
[ Upstream commit 00a134fc2bb4a5f8fada58cf7ff4259149691d64 ]
The pm-cps code has up until now used per-CPU variables indexed by core, rather than CPU number, in order to share data amongst sibling CPUs (ie. VPs/threads in a core). This works fine for single cluster systems, but with multi-cluster systems a core number is no longer unique in the system, leading to sharing between CPUs that are not actually siblings.
Avoid this issue by using per-CPU variables as they are more generally used - ie. access them using CPU numbers rather than core numbers. Sharing between siblings is then accomplished by:
- Assigning the same pointer to entries for each sibling CPU for the nc_asm_enter & ready_count variables, which allow this by virtue of being per-CPU pointers.
- Indexing by the first CPU set in a CPUs cpu_sibling_map in the case of pm_barrier, for which we can't use the previous approach because the per-CPU variable is not a pointer.
--- arch/mips/kernel/pm-cps.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
arch/mips/kernel/pm-cps.c +17 -13
@@ -57,10 +57,7 @@ static DEFINE_PER_CPU_ALIGNED(u32*, ready_count);/* Indicates online CPUs coupled with the current CPU */ static DEFINE_PER_CPU_ALIGNED(cpumask_t, online_coupled); -/* -* Used to synchronize entry to deep idle states. Actually per-core rather -* than per-CPU. -*/ +/* Used to synchronize entry to deep idle states */ static DEFINE_PER_CPU_ALIGNED(atomic_t, pm_barrier);/* Saved CPU state across the CPS_PM_POWER_GATED state */
@@ -112,9 +109,10 @@ int cps_pm_enter_state(enum cps_pm_state state)cps_nc_entry_fn entry;struct core_boot_config *core_cfg;struct vpe_boot_config *vpe_cfg; +atomic_t *barrier;/* Check that there is an entry function for this state */ - entry =per_cpu (nc_asm_enter, core)[state]; + entry =per_cpu (nc_asm_enter, cpu)[state];if (!entry)return -EINVAL ;
@@ -150,7 +148,7 @@ int cps_pm_enter_state(enum cps_pm_state state)smp_mb__after_atomic ();/* Create a non-coherent mapping of the core ready_count */ - core_ready_count =per_cpu (ready_count, core); + core_ready_count =per_cpu (ready_count, cpu); nc_addr =kmap_noncoherent (virt_to_page (core_ready_count), (unsigned long )core_ready_count); nc_addr += ((unsigned long )core_ready_count & ~PAGE_MASK );
@@ -158,7 +156,8 @@ int cps_pm_enter_state(enum cps_pm_state state)/* Ensure ready_count is zero-initialised before the assembly runs */ WRITE_ONCE (*nc_core_ready_count,0 ); -coupled_barrier (&per_cpu (pm_barrier, core), online); + barrier = &per_cpu (pm_barrier,cpumask_first (&cpu_sibling_map[cpu])); +coupled_barrier (barrier, online);/* Run the generated entry code */ left =entry (online, nc_core_ready_count);
@@ -629,12 +628,14 @@ static void *cps_gen_entry_code(unsigned cpu, enum cps_pm_state state)static int cps_pm_online_cpu (unsigned int cpu) { -enum cps_pm_state state; -unsigned core =cpu_core (&cpu_data[cpu]); +unsigned int sibling, core;void *entry_fn, *core_rc; +enum cps_pm_state state; + + core =cpu_core (&cpu_data[cpu]);for (state =CPS_PM_NC_WAIT ; state <CPS_PM_STATE_COUNT ; state++) { -if (per_cpu (nc_asm_enter, core)[state]) +if (per_cpu (nc_asm_enter, cpu)[state])continue ;if (!test_bit (state, state_support))continue ;
@@ -646,16 +647,19 @@ static int cps_pm_online_cpu(unsigned int cpu)clear_bit (state, state_support); } -per_cpu (nc_asm_enter, core)[state] = entry_fn; +for_each_cpu (sibling, &cpu_sibling_map[cpu]) +per_cpu (nc_asm_enter, sibling)[state] = entry_fn; } -if (!per_cpu (ready_count, core)) { +if (!per_cpu (ready_count, cpu)) { core_rc =kmalloc (sizeof (u32),GFP_KERNEL );if (!core_rc) {pr_err ("Failed allocate core %u ready_count\n" , core);return -ENOMEM ; } -per_cpu (ready_count, core) = core_rc; + +for_each_cpu (sibling, &cpu_sibling_map[cpu]) +per_cpu (ready_count, sibling) = core_rc; }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 315/626 clocksource: mips-gic-timer: Enable counter when CPUs start
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Burton <[email protected]>
[ Upstream commit 3128b0a2e0cf6e07aa78e5f8cf7dd9cd59dc8174 ]
In multi-cluster MIPS I6500 systems there is a GIC in each cluster, each with its own counter. When a cluster powers up the counter will be stopped, with the COUNTSTOP bit set in the GIC_CONFIG register.
In single cluster systems, it has been fine to clear COUNTSTOP once in gic_clocksource_of_init() to start the counter. In multi-cluster systems, this will only have started the counter in the boot cluster, and any CPUs in other clusters will find their counter stopped which will break the GIC clock_event_device.
Resolve this by having CPUs clear the COUNTSTOP bit when they come online, using the existing gic_starting_cpu() CPU hotplug callback. This will allow CPUs in secondary clusters to ensure that the cluster's GIC counter is running as expected.
--- drivers/clocksource/mips-gic-timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clocksource/mips-gic-timer.c +3 -3
@@ -115,6 +115,9 @@ static void gic_update_frequency(void *data)static int gic_starting_cpu (unsigned int cpu) { +/* Ensure the GIC counter is running */ +clear_gic_config (GIC_CONFIG_COUNTSTOP ); +gic_clockevent_cpu_init (cpu,this_cpu_ptr (&gic_clockevent_device));return 0 ; }
@@ -252,9 +255,6 @@ static int __init gic_clocksource_of_init(struct device_node *node)pr_warn ("Unable to register clock notifier\n" ); } -/* And finally start the counter */ -clear_gic_config (GIC_CONFIG_COUNTSTOP ); -/* * It's safe to use the MIPS GIC timer as a sched clock source only if * its ticks are stable, which is true on either the platforms with
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 316/626 PCI: epf-mhi: Update device ID for SA8775P
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mrinmay Sarkar <[email protected]>
[ Upstream commit 4f13dd9e2b1d2b317bb36704f8a7bd1d3017f7a2 ]
Update device ID for the Qcom SA8775P SoC.
--- drivers/pci/endpoint/functions/pci-epf-mhi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-mhi.c +1 -1
@@ -125,7 +125,7 @@ static const struct pci_epf_mhi_ep_info sm8450_info = {static struct pci_epf_header sa8775p_header = { .vendorid =PCI_VENDOR_ID_QCOM , - .deviceid =0x0306 ,/* FIXME: Update deviceid for sa8775p EP */ + .deviceid =0x0116 , .baseclass_code =PCI_CLASS_OTHERS , .interrupt_pin =PCI_INTERRUPT_INTA , };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 317/626 scsi: mpt3sas: Send a diag reset if target reset fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shivasharan S <[email protected]>
[ Upstream commit 5612d6d51ed2634a033c95de2edec7449409cbb9 ]
When an IOCTL times out and driver issues a target reset, if firmware fails the task management elevate the recovery by issuing a diag reset to controller.
--- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_ctl.c +10 -2
@@ -679,6 +679,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,size_t data_in_sz =0 ;long ret;u16 device_handle =MPT3SAS_INVALID_DEVICE_HANDLE ; +int tm_ret; issue_reset =0 ;
@@ -1120,18 +1121,25 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,if (pcie_device && (!ioc->tm_custom_handling) && (!(mpt3sas_scsih_is_pcie_scsi_device ( pcie_device->device_info)))) -mpt3sas_scsih_issue_locked_tm (ioc, + tm_ret =mpt3sas_scsih_issue_locked_tm (ioc,le16_to_cpu (mpi_request->FunctionDependent1),0 ,0 ,0 ,MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET ,0 ,0 , pcie_device->reset_timeout,MPI26_SCSITASKMGMT_MSGFLAGS_PROTOCOL_LVL_RST_PCIE );else -mpt3sas_scsih_issue_locked_tm (ioc, + tm_ret =mpt3sas_scsih_issue_locked_tm (ioc,le16_to_cpu (mpi_request->FunctionDependent1),0 ,0 ,0 ,MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET ,0 ,0 ,30 ,MPI2_SCSITASKMGMT_MSGFLAGS_LINK_RESET ); + +if (tm_ret !=SUCCESS ) { +ioc_info (ioc, +"target reset failed, issue hard reset: handle (0x%04x)\n" , +le16_to_cpu (mpi_request->FunctionDependent1)); +mpt3sas_base_hard_reset_handler (ioc,FORCE_BIG_HAMMER ); + } }else mpt3sas_base_hard_reset_handler (ioc,FORCE_BIG_HAMMER ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 318/626 wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit 6be7544d19fcfcb729495e793bc6181f85bb8949 ]
Set the MCS maps and the highest rates according to the number of spatial streams the chip has. For RTL8814AU that is 3.
--- drivers/net/wireless/realtek/rtw88/main.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/net/wireless/realtek/rtw88/main.c +9 -14
@@ -1579,8 +1579,9 @@ static void rtw_init_vht_cap(struct rtw_dev *rtwdev, struct ieee80211_sta_vht_cap *vht_cap) {struct rtw_efuse *efuse = &rtwdev->efuse; -u16 mcs_map; +u16 mcs_map =0 ;__le16 highest; +int i;if (efuse->hw_cap.ptcl !=EFUSE_HW_CAP_IGNORE && efuse->hw_cap.ptcl !=EFUSE_HW_CAP_PTCL_VHT )
@@ -1603,21 +1604,15 @@ static void rtw_init_vht_cap(struct rtw_dev *rtwdev,if (rtw_chip_has_rx_ldpc (rtwdev)) vht_cap->cap |=IEEE80211_VHT_CAP_RXLDPC ; - mcs_map =IEEE80211_VHT_MCS_SUPPORT_0_9 <<0 | -IEEE80211_VHT_MCS_NOT_SUPPORTED <<4 | -IEEE80211_VHT_MCS_NOT_SUPPORTED <<6 | -IEEE80211_VHT_MCS_NOT_SUPPORTED <<8 | -IEEE80211_VHT_MCS_NOT_SUPPORTED <<10 | -IEEE80211_VHT_MCS_NOT_SUPPORTED <<12 | -IEEE80211_VHT_MCS_NOT_SUPPORTED <<14 ; -if (efuse->hw_cap.nss >1 ) { - highest =cpu_to_le16 (780 ); - mcs_map |=IEEE80211_VHT_MCS_SUPPORT_0_9 <<2 ; - }else { - highest =cpu_to_le16 (390 ); - mcs_map |=IEEE80211_VHT_MCS_NOT_SUPPORTED <<2 ; +for (i =0 ; i <8 ; i++) { +if (i < efuse->hw_cap.nss) + mcs_map |=IEEE80211_VHT_MCS_SUPPORT_0_9 << (i *2 ); +else + mcs_map |=IEEE80211_VHT_MCS_NOT_SUPPORTED << (i *2 ); } + highest =cpu_to_le16 (390 * efuse->hw_cap.nss); + vht_cap->vht_mcs.rx_mcs_map =cpu_to_le16 (mcs_map); vht_cap->vht_mcs.tx_mcs_map =cpu_to_le16 (mcs_map); vht_cap->vht_mcs.rx_highest = highest;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 319/626 wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit c7eea1ba05ca5b0dbf77a27cf2e1e6e2fb3c0043 ]
Set the RX mask and the highest RX rate according to the number of spatial streams the chip can receive. For RTL8814AU that is 3.
--- drivers/net/wireless/realtek/rtw88/main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtw88/main.c +6 -11
@@ -1543,6 +1543,7 @@ static void rtw_init_ht_cap(struct rtw_dev *rtwdev, {const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_efuse *efuse = &rtwdev->efuse; +int i; ht_cap->ht_supported = true; ht_cap->cap =0 ;
@@ -1562,17 +1563,11 @@ static void rtw_init_ht_cap(struct rtw_dev *rtwdev, ht_cap->ampdu_factor =IEEE80211_HT_MAX_AMPDU_64K ; ht_cap->ampdu_density = chip->ampdu_density; ht_cap->mcs.tx_params =IEEE80211_HT_MCS_TX_DEFINED ; -if (efuse->hw_cap.nss >1 ) { - ht_cap->mcs.rx_mask[0 ] =0xFF ; - ht_cap->mcs.rx_mask[1 ] =0xFF ; - ht_cap->mcs.rx_mask[4 ] =0x01 ; - ht_cap->mcs.rx_highest =cpu_to_le16 (300 ); - }else { - ht_cap->mcs.rx_mask[0 ] =0xFF ; - ht_cap->mcs.rx_mask[1 ] =0x00 ; - ht_cap->mcs.rx_mask[4 ] =0x01 ; - ht_cap->mcs.rx_highest =cpu_to_le16 (150 ); - } + +for (i =0 ; i < efuse->hw_cap.nss; i++) + ht_cap->mcs.rx_mask[i] =0xFF ; + ht_cap->mcs.rx_mask[4 ] =0x01 ; + ht_cap->mcs.rx_highest =cpu_to_le16 (150 * efuse->hw_cap.nss); } static void rtw_init_vht_cap(struct rtw_dev *rtwdev,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 320/626 wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit 86d04f8f991a0509e318fe886d5a1cf795736c7d ]
This function translates the rate number reported by the hardware into something mac80211 can understand. It was ignoring the 3SS and 4SS HT rates. Translate them too.
Also set *nss to 0 for the HT rates, just to make sure it's initialised.
--- drivers/net/wireless/realtek/rtw88/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/util.c +2 -1
@@ -101,7 +101,8 @@ void rtw_desc_to_mcsrate(u16 rate, u8 *mcs, u8 *nss) *nss =4 ; *mcs = rate -DESC_RATEVHT4SS_MCS0 ; }else if (rate >=DESC_RATEMCS0 && - rate <=DESC_RATEMCS15 ) { + rate <=DESC_RATEMCS31 ) { + *nss =0 ; *mcs = rate -DESC_RATEMCS0 ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 321/626 wifi: rtw89: fw: propagate error code from rtw89_h2c_tx()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit 56e1acaa0f80620b8e2c3410db35b4b975782b0a ]
The error code should be propagated to callers during downloading firmware header and body. Remove unnecessary assignment of -1.
--- drivers/net/wireless/realtek/rtw89/fw.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +0 -2
@@ -1234,7 +1234,6 @@ static int __rtw89_fw_download_hdr(struct rtw89_dev *rtwdev, ret =rtw89_h2c_tx (rtwdev, skb, false);if (ret) {rtw89_err (rtwdev,"failed to send h2c\n" ); - ret =-1 ; goto fail; }
@@ -1311,7 +1310,6 @@ static int __rtw89_fw_download_main(struct rtw89_dev *rtwdev, ret =rtw89_h2c_tx (rtwdev, skb, true);if (ret) {rtw89_err (rtwdev,"failed to send h2c\n" ); - ret =-1 ; goto fail; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 322/626 wifi: rtw89: fw: get sb_sel_ver via get_unaligned_le32()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit 2f9da853f4d848d23bade4c22931ea0f5a011674 ]
The sb_sel_ver is selection version for secure boot recorded in firmware binary data, and its size is 4 and offset is 58 (not natural alignment). Use get_unaligned_le32() to get this value safely. Find this by reviewing.
--- drivers/net/wireless/realtek/rtw89/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/fw.c +1 -1
@@ -285,7 +285,7 @@ static int __parse_formatted_mssc(struct rtw89_dev *rtwdev,if (!sec->secure_boot) goto out; - sb_sel_ver =le32_to_cpu (section_content->sb_sel_ver.v); + sb_sel_ver =get_unaligned_le32 (§ion_content->sb_sel_ver.v);if (sb_sel_ver && sb_sel_ver != sec->sb_sel_mgn) goto ignore;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 323/626 wifi: rtw89: fw: add blacklist to avoid obsolete secure firmware
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
[ Upstream commit f11d042b3a2e92ab1aa10e0da8e290bcdcf31d39 ]
To ensure secure chip only runs expected secure firmware, stop using obsolete firmware in blacklist which weakness or flaw was found.
--- drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/fw.c | 52 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/fw.h | 12 +++++ drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + .../net/wireless/realtek/rtw89/rtw8852bt.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + 9 files changed, 71 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -17,6 +17,7 @@ struct rtw89_dev;struct rtw89_pci_info ;struct rtw89_mac_gen_def ;struct rtw89_phy_gen_def ; +struct rtw89_fw_blacklist ;struct rtw89_efuse_block_cfg ;struct rtw89_h2c_rf_tssi ;struct rtw89_fw_txpwr_track_cfg ;
@@ -4232,6 +4233,7 @@ struct rtw89_chip_info {bool try_ce_fw;u8 bbmcu_nr;u32 needed_fw_elms; +const struct rtw89_fw_blacklist *fw_blacklist;u32 fifo_size;bool small_fifo_size;u32 dle_scc_rsvd_size;
drivers/net/wireless/realtek/rtw89/fw.c +51 -1
70 lines not on this page · raw message
drivers/net/wireless/realtek/rtw89/fw.h +12 -0
@@ -639,6 +639,11 @@ struct rtw89_fw_mss_pool_hdr { } __packed;union rtw89_fw_section_mssc_content { +struct { +u8 pad[0x20 ]; +u8 bit_in_chip_list; +u8 ver; + } __packed blacklist;struct {u8 pad[58 ];__le32 v;
@@ -649,6 +654,13 @@ union rtw89_fw_section_mssc_content { }__packed key_sign_len; } __packed; +struct rtw89_fw_blacklist { +u8 ver; +u8 list[32 ]; +}; + +extern const struct rtw89_fw_blacklist rtw89_fw_blacklist_default; +static inline void SET_CTRL_INFO_MACID (void *table,u32 val) {le32p_replace_bits ((__le32 *)(table) +0 , val,GENMASK (6 ,0 ));
drivers/net/wireless/realtek/rtw89/rtw8851b.c +1 -0
@@ -2443,6 +2443,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .try_ce_fw = true, .bbmcu_nr = 0, .needed_fw_elms = 0, + .fw_blacklist = NULL, .fifo_size = 196608, .small_fifo_size = true, .dle_scc_rsvd_size = 98304,
drivers/net/wireless/realtek/rtw89/rtw8852a.c +1 -0
@@ -2159,6 +2159,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .try_ce_fw = false, .bbmcu_nr = 0, .needed_fw_elms = 0, + .fw_blacklist = NULL, .fifo_size = 458752, .small_fifo_size = false, .dle_scc_rsvd_size = 0,
drivers/net/wireless/realtek/rtw89/rtw8852b.c +1 -0
@@ -797,6 +797,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .try_ce_fw = true, .bbmcu_nr = 0, .needed_fw_elms = 0, + .fw_blacklist = &rtw89_fw_blacklist_default, .fifo_size = 196608, .small_fifo_size = true, .dle_scc_rsvd_size = 98304,
drivers/net/wireless/realtek/rtw89/rtw8852bt.c +1 -0
@@ -731,6 +731,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .try_ce_fw = true, .bbmcu_nr = 0, .needed_fw_elms = RTW89_AX_GEN_DEF_NEEDED_FW_ELEMENTS_NO_6GHZ, + .fw_blacklist = &rtw89_fw_blacklist_default, .fifo_size = 458752, .small_fifo_size = true, .dle_scc_rsvd_size = 98304,
drivers/net/wireless/realtek/rtw89/rtw8852c.c +1 -0
@@ -2936,6 +2936,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .try_ce_fw = false, .bbmcu_nr = 0, .needed_fw_elms = 0, + .fw_blacklist = &rtw89_fw_blacklist_default, .fifo_size = 458752, .small_fifo_size = false, .dle_scc_rsvd_size = 0,
drivers/net/wireless/realtek/rtw89/rtw8922a.c +1 -0
@@ -2632,6 +2632,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .try_ce_fw = false, .bbmcu_nr = 1, .needed_fw_elms = RTW89_BE_GEN_DEF_NEEDED_FW_ELEMENTS, + .fw_blacklist = &rtw89_fw_blacklist_default, .fifo_size = 589824, .small_fifo_size = false, .dle_scc_rsvd_size = 0,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 324/626 wifi: rtw89: 8922a: fix incorrect STA-ID in EHT MU PPDU
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Chung Chen <[email protected]>
[ Upstream commit bdce0574243b43b3bb2064f609c0c326df44c4c6 ]
EHT MU PPDU contains user field of EHT-SIG field with STA-ID that must match AID subfield in the Associate Response. Add a necessary setting to prevent these from being inconsistent.
--- drivers/net/wireless/realtek/rtw89/fw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +3 -2
@@ -3128,9 +3128,10 @@ int rtw89_fw_h2c_assoc_cmac_tbl_g7(struct rtw89_dev *rtwdev,CCTLINFO_G7_W5_NOMINAL_PKT_PADDING3 | CCTLINFO_G7_W5_NOMINAL_PKT_PADDING4); - h2c->w6 =le32_encode_bits (vif->type ==NL80211_IFTYPE_STATION ?1 :0 , + h2c->w6 =le32_encode_bits (vif->cfg.aid,CCTLINFO_G7_W6_AID12_PAID ) | +le32_encode_bits (vif->type ==NL80211_IFTYPE_STATION ?1 :0 ,CCTLINFO_G7_W6_ULDL ); - h2c->m6 =cpu_to_le32 (CCTLINFO_G7_W6_ULDL ); + h2c->m6 =cpu_to_le32 (CCTLINFO_G7_W6_AID12_PAID |CCTLINFO_G7_W6_ULDL );if (rtwsta_link) { h2c->w8 = le32_encode_bits(link_sta->he_cap.has_he,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 325/626 net: pktgen: fix access outside of user given buffer in pktgen_thread_write()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Seiderer <[email protected]>
[ Upstream commit 425e64440ad0a2f03bdaf04be0ae53dededbaa77 ]
Honour the user given buffer size for the strn_len() calls (otherwise strn_len() will access memory outside of the user given buffer).
--- net/core/pktgen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/core/pktgen.c +4 -3
@@ -1898,8 +1898,8 @@ static ssize_t pktgen_thread_write(struct file *file, i = len;/* Read variable name */ - - len =strn_len (&user_buffer[i],sizeof (name) -1 ); + max =min (sizeof (name) -1 , count - i); + len =strn_len (&user_buffer[i], max);if (len <0 )return len;
@@ -1929,7 +1929,8 @@ static ssize_t pktgen_thread_write(struct file *file,if (!strcmp (name,"add_device" )) {char f[32 ];memset (f,0 ,32 ); - len =strn_len (&user_buffer[i],sizeof (f) -1 ); + max =min (sizeof (f) -1 , count - i); + len =strn_len (&user_buffer[i], max);if (len <0 ) { ret = len; goto out;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 326/626 power: supply: axp20x_battery: Update temp sensor for AXP717 from device tree
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Morgan <[email protected]>
[ Upstream commit bbcfe510ecd47f2db4c8653c7dfa9dc7a55b1583 ]
Allow a boolean property of "x-powers,no-thermistor" to specify devices where the ts pin is not connected to anything. This works around an issue found with some devices where the efuse is not programmed correctly from the factory or when the register gets set erroneously.
--- drivers/power/supply/axp20x_battery.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/power/supply/axp20x_battery.c +21 -0
@@ -89,6 +89,8 @@#define AXP717_BAT_CC_MIN_UA 0#define AXP717_BAT_CC_MAX_UA 3008000 +#define AXP717_TS_PIN_DISABLE BIT(4) +struct axp20x_batt_ps ;struct axp_data {
@@ -117,6 +119,7 @@ struct axp20x_batt_ps {/* Maximum constant charge current */ unsigned int max_ccc;const struct axp_data *data; +bool ts_disable; }; static int axp20x_battery_get_max_voltage(struct axp20x_batt_ps *axp20x_batt,
@@ -983,6 +986,24 @@ static void axp717_set_battery_info(struct platform_device *pdev,int ccc = info->constant_charge_current_max_ua;int val; + axp_batt->ts_disable = (device_property_read_bool (axp_batt->dev, +"x-powers,no-thermistor" )); + +/* +* Under rare conditions an incorrectly programmed efuse for +* the temp sensor on the PMIC may trigger a fault condition. +* Allow users to hard-code if the ts pin is not used to work +* around this problem. Note that this requires the battery +* be correctly defined in the device tree with a monitored +* battery node. +*/ +if (axp_batt->ts_disable) { +regmap_update_bits (axp_batt->regmap, +AXP717_TS_PIN_CFG , +AXP717_TS_PIN_DISABLE , +AXP717_TS_PIN_DISABLE ); + } +if (vmin >0 &&axp717_set_voltage_min_design (axp_batt, vmin))dev_err (&pdev->dev,"couldn't set voltage_min_design\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 327/626 EDAC/ie31200: work around false positive build warning
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit c29dfd661fe2f8d1b48c7f00590929c04b25bf40 ]
gcc-14 produces a bogus warning in some configurations:
drivers/edac/ie31200_edac.c: In function 'ie31200_probe1.isra':drivers/edac/ie31200_edac.c:412:26: error: 'dimm_info' is used uninitialized [-Werror=uninitialized]
412 | struct dimm_data dimm_info[IE31200_CHANNELS][IE31200_DIMMS_PER_CHANNEL];
| ^~~~~~~~~
drivers/edac/ie31200_edac.c:412:26: note: 'dimm_info' declared here
412 | struct dimm_data dimm_info[IE31200_CHANNELS][IE31200_DIMMS_PER_CHANNEL];
| ^~~~~~~~~I don't see any way the unintialized access could really happen here, but I can see why the compiler gets confused by the two loops.
Instead, rework the two nested loops to only read the addr_decode registers and then keep only one instance of the dimm info structure.
[Tony: Qiuxu pointed out that the "populate DIMM info" comment was left behind in the refactor and suggested moving it. I deleted the comment as unnecessry in front os a call to populate_dimm_info(). That seems pretty self-describing.]
--- drivers/edac/ie31200_edac.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/edac/ie31200_edac.c +13 -15
@@ -405,10 +405,9 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx)int i, j, ret;struct mem_ctl_info *mci =NULL ;struct edac_mc_layer layers[2 ]; -struct dimm_data dimm_info[IE31200_CHANNELS ][IE31200_DIMMS_PER_CHANNEL ];void __iomem *window;struct ie31200_priv *priv; -u32 addr_decode, mad_offset; +u32 addr_decode[IE31200_CHANNELS ], mad_offset;/* * Kaby Lake, Coffee Lake seem to work like Skylake. Please re-visit
@@ -466,19 +465,10 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx) mad_offset =IE31200_MAD_DIMM_0_OFFSET ; } -/* populate DIMM info */ for (i =0 ; i <IE31200_CHANNELS ; i++) { - addr_decode =readl (window + mad_offset + + addr_decode[i] =readl (window + mad_offset + (i *4 )); -edac_dbg (0 ,"addr_decode: 0x%x\n" , addr_decode); -for (j =0 ; j <IE31200_DIMMS_PER_CHANNEL ; j++) { -populate_dimm_info (&dimm_info[i][j], addr_decode, j, - skl); -edac_dbg (0 ,"size: 0x%x, rank: %d, width: %d\n" , - dimm_info[i][j].size, - dimm_info[i][j].dual_rank, - dimm_info[i][j].x16_width); - } +edac_dbg (0 ,"addr_decode: 0x%x\n" , addr_decode[i]); }/*
@@ -489,14 +479,22 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx)*/ for (i =0 ; i <IE31200_DIMMS_PER_CHANNEL ; i++) {for (j =0 ; j <IE31200_CHANNELS ; j++) { +struct dimm_data dimm_info;struct dimm_info *dimm;unsigned long nr_pages; - nr_pages =IE31200_PAGES (dimm_info[j][i].size, skl); +populate_dimm_info (&dimm_info, addr_decode[j], i, + skl); +edac_dbg (0 ,"size: 0x%x, rank: %d, width: %d\n" , + dimm_info.size, + dimm_info.dual_rank, + dimm_info.x16_width); + + nr_pages =IE31200_PAGES (dimm_info.size, skl);if (nr_pages ==0 )continue ; -if (dimm_info[j][i].dual_rank) { +if (dimm_info.dual_rank) { nr_pages = nr_pages /2 ; dimm =edac_get_dimm (mci, (i *2 ) +1 , j,0 ); dimm->nr_pages = nr_pages;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 328/626 i3c: master: svc: Flush FIFO before sending Dynamic Address Assignment(DAA)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit a892ee4cf22a50e1d6988d0464a9a421f3e5db2f ]
Ensure the FIFO is empty before issuing the DAA command to prevent incorrect command data from being sent. Align with other data transfers, such as svc_i3c_master_start_xfer_locked(), which flushes the FIFO before sending a command.
--- drivers/i3c/master/svc-i3c-master.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i3c/master/svc-i3c-master.c +2 -0
@@ -860,6 +860,8 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,u32 reg;int ret, i; +svc_i3c_master_flush_fifo (master); +while (true) {/* SVC_I3C_MCTRL_REQUEST_PROC_DAA have two mode, ENTER DAA or PROCESS DAA. *
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 329/626 mfd: axp20x: AXP717: Add AXP717_TS_PIN_CFG to writeable regs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Morgan <[email protected]>
[ Upstream commit bfad07fe298bfba0c7ddab87c5b5325970203a1e ]
Add AXP717_TS_PIN_CFG (register 0x50) to the table of writeable registers so that the temperature sensor can be configured by the battery driver.
--- drivers/mfd/axp20x.c | 1 + include/linux/mfd/axp20x.h | 1 + 2 files changed, 2 insertions(+)
drivers/mfd/axp20x.c +1 -0
@@ -214,6 +214,7 @@ static const struct regmap_range axp717_writeable_ranges[] = {regmap_reg_range (AXP717_VSYS_V_POWEROFF ,AXP717_VSYS_V_POWEROFF ),regmap_reg_range (AXP717_IRQ0_EN ,AXP717_IRQ4_EN ),regmap_reg_range (AXP717_IRQ0_STATE ,AXP717_IRQ4_STATE ), +regmap_reg_range (AXP717_TS_PIN_CFG ,AXP717_TS_PIN_CFG ),regmap_reg_range (AXP717_ICC_CHG_SET ,AXP717_CV_CHG_SET ),regmap_reg_range (AXP717_DCDC_OUTPUT_CONTROL ,AXP717_CPUSLDO_CONTROL ), regmap_reg_range(AXP717_ADC_CH_EN_CONTROL, AXP717_ADC_CH_EN_CONTROL),
include/linux/mfd/axp20x.h +1 -0
@@ -135,6 +135,7 @@ enum axp20x_variants {#define AXP717_IRQ2_STATE 0x4a#define AXP717_IRQ3_STATE 0x4b#define AXP717_IRQ4_STATE 0x4c +#define AXP717_TS_PIN_CFG 0x50#define AXP717_ICC_CHG_SET 0x62#define AXP717_ITERM_CHG_SET 0x63#define AXP717_CV_CHG_SET 0x64
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 330/626 eeprom: ee1004: Check chip before probing
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eddie James <[email protected]>
[ Upstream commit d9406677428e9234ea62bb2d2f5e996d1b777760 ]
Like other eeprom drivers, check if the device is really there and functional before probing.
--- drivers/misc/eeprom/ee1004.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/misc/eeprom/ee1004.c +4 -0
@@ -304,6 +304,10 @@ static int ee1004_probe(struct i2c_client *client) I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_READ_BYTE_DATA))return -EPFNOSUPPORT ; + err =i2c_smbus_read_byte (client); +if (err <0 ) +return -ENODEV ; +mutex_lock (&ee1004_bus_lock); err =ee1004_init_bus_data (client);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 331/626 irqchip/riscv-imsic: Separate next and previous pointers in IMSIC vector
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anup Patel <[email protected]>
[ Upstream commit 0f67911e821c67ecfccc365a2103ce276a9a56fe ]
Currently, there is only one "move" pointer in struct imsic_vector so during vector movement the old vector points to the new vector and new vector points to itself.
To support forced cleanup of the old vector, add separate "move_next" and "move_prev" pointers to struct imsic_vector, where during vector movement the "move_next" pointer of the old vector points to the new vector and the "move_prev" pointer of the new vector points to the old vector.
Both "move_next" and "move_prev" pointers are cleared separately by __imsic_local_sync() with a restriction that "move_prev" on the new CPU is cleared only after the old CPU has cleared "move_next".
--- drivers/irqchip/irq-riscv-imsic-early.c | 8 ++- drivers/irqchip/irq-riscv-imsic-state.c | 96 +++++++++++++++++-------- drivers/irqchip/irq-riscv-imsic-state.h | 7 +- 3 files changed, 78 insertions(+), 33 deletions(-)
drivers/irqchip/irq-riscv-imsic-early.c +7 -1
@@ -77,6 +77,12 @@ static void imsic_handle_irq(struct irq_desc *desc)struct imsic_vector *vec;unsigned long local_id; +/* +* Process pending local synchronization instead of waiting +* for per-CPU local timer to expire. +*/ +imsic_local_sync_all (false); +chained_irq_enter (chip, desc);while ((local_id =csr_swap (CSR_TOPEI ,0 ))) {
@@ -120,7 +126,7 @@ static int imsic_starting_cpu(unsigned int cpu)* Interrupts identities might have been enabled/disabled while * this CPU was not running so sync-up local enable/disable state. */ -imsic_local_sync_all (); +imsic_local_sync_all (true);/* Enable local interrupt delivery */ imsic_local_delivery (true);
drivers/irqchip/irq-riscv-imsic-state.c +67 -29
168 lines not on this page · raw message
drivers/irqchip/irq-riscv-imsic-state.h +4 -3
@@ -23,7 +23,8 @@ struct imsic_vector {unsigned int hwirq;/* Details accessed using local lock held */ bool enable; -struct imsic_vector *move; +struct imsic_vector *move_next; +struct imsic_vector *move_prev; };struct imsic_local_priv {
@@ -74,7 +75,7 @@ static inline void __imsic_id_clear_enable(unsigned long id)__imsic_eix_update (id,1 , false, false); } -void imsic_local_sync_all (void ); +void imsic_local_sync_all (bool force_all);void imsic_local_delivery (bool enable);void imsic_vector_mask (struct imsic_vector *vec);
@@ -87,7 +88,7 @@ static inline bool imsic_vector_isenabled(struct imsic_vector *vec)static inline struct imsic_vector *imsic_vector_get_move (struct imsic_vector *vec) { -return READ_ONCE (vec->move); +return READ_ONCE (vec->move_prev); }void imsic_vector_move (struct imsic_vector *old_vec,struct imsic_vector *new_vec);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 332/626 drm/amd/pm: Fetch current power limit from PMFW
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit b2a9e562dfa156bd53e62ce571f3f8f65d243f14 ]
On SMU v13.0.12, always query the firmware to get the current power limit as it could be updated through other means also.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -0
@@ -2772,6 +2772,7 @@ int smu_get_power_limit(void *handle,switch (amdgpu_ip_version (adev,MP1_HWIP ,0 )) {case IP_VERSION (13 ,0 ,2 ):case IP_VERSION (13 ,0 ,6 ): +case IP_VERSION (13 ,0 ,12 ):case IP_VERSION (13 ,0 ,14 ):case IP_VERSION (11 ,0 ,7 ):case IP_VERSION (11 ,0 ,11 ):
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 333/626 drm/amd/display: Add support for disconnected eDP streams
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harry VanZyllDeJong <[email protected]>
[ Upstream commit 6571bef25fe48c642f7a69ccf7c3198b317c136a ]
[Why]
eDP may not be connected to the GPU on driver start causing fail enumeration.
[How]
Move the virtual signal type check before the eDP connector signal check.
--- .../drm/amd/display/dc/link/protocols/link_dp_capability.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +3 -3
@@ -945,6 +945,9 @@ bool link_decide_link_settings(struct dc_stream_state *stream,* TODO: add MST specific link training routine */ decide_mst_link_settings (link, link_setting); + }else if (stream->signal ==SIGNAL_TYPE_VIRTUAL ) { + link_setting->lane_count =LANE_COUNT_FOUR ; + link_setting->link_rate =LINK_RATE_HIGH3 ; }else if (link->connector_signal ==SIGNAL_TYPE_EDP ) {/* enable edp link optimization for DSC eDP case */ if (stream->timing.flags.DSC) {
@@ -967,9 +970,6 @@ bool link_decide_link_settings(struct dc_stream_state *stream, }else {edp_decide_link_settings (link, link_setting, req_bw); } - }else if (stream->signal ==SIGNAL_TYPE_VIRTUAL ) { - link_setting->lane_count =LANE_COUNT_FOUR ; - link_setting->link_rate =LINK_RATE_HIGH3 ; }else {decide_dp_link_settings (link, link_setting, req_bw); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 334/626 drm/amd/display: Guard against setting dispclk low when active
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 72d7a7fa1f2404fd31c84a8f808b1b37021a3a9e ]
[Why]
We should never apply a minimum dispclk value while in prepare_bandwidth or while displays are active. This is always an optimization for when all displays are disabled.
[How]
Defer dispclk optimization until safe_to_lower = true and display_count reaches 0.
Since 0 has a special value in this logic (ie. no dispclk required) we also need adjust the logic that clamps it for the actual request to PMFW.
--- .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +9 -4
@@ -452,14 +452,19 @@ void dcn35_update_clocks(struct clk_mgr *clk_mgr_base, update_dppclk = true; } -if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz)) { +if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) && + (new_clocks->dispclk_khz >0 || (safe_to_lower && display_count ==0 ))) { +int requested_dispclk_khz = new_clocks->dispclk_khz; +dcn35_disable_otg_wa (clk_mgr_base, context, safe_to_lower, true); -if (dc->debug.min_disp_clk_khz >0 && new_clocks->dispclk_khz < dc->debug.min_disp_clk_khz) - new_clocks->dispclk_khz = dc->debug.min_disp_clk_khz; +/* Clamp the requested clock to PMFW based on their limit. */ +if (dc->debug.min_disp_clk_khz >0 && requested_dispclk_khz < dc->debug.min_disp_clk_khz) + requested_dispclk_khz = dc->debug.min_disp_clk_khz; +dcn35_smu_set_dispclk (clk_mgr, requested_dispclk_khz); clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz; -dcn35_smu_set_dispclk (clk_mgr, clk_mgr_base->clks.dispclk_khz); +dcn35_disable_otg_wa (clk_mgr_base, context, safe_to_lower, false); update_dispclk = true;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 335/626 drm/amd/display: Fix BT2020 YCbCr limited/full range input
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Bakoulin <[email protected]>
[ Upstream commit 07bc2dcbcf403d47d6f305ef7f0d3d489491c5fb ]
[Why]
BT2020 YCbCr input is not handled properly when full range quantization is used and limited range is not supported at all.
[How]
- Add enums for BT2020 YCbCr limited/full range
- Add limited range CSC matrix
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- drivers/gpu/drm/amd/display/dc/basics/dc_common.c | 3 ++- drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 5 +++-- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 4 +++- drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 3 ++- .../gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c | 3 ++- .../amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c | 3 ++- .../amd/display/dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 3 ++- drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 6 +++++- .../gpu/drm/amd/display/modules/info_packet/info_packet.c | 4 ++-- 12 files changed, 29 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -3
@@ -5552,9 +5552,9 @@ fill_plane_color_attributes(const struct drm_plane_state *plane_state,case DRM_COLOR_YCBCR_BT2020 :if (full_range) - *color_space =COLOR_SPACE_2020_YCBCR ; + *color_space =COLOR_SPACE_2020_YCBCR_FULL ;else -return -EINVAL ; + *color_space =COLOR_SPACE_2020_YCBCR_LIMITED ;break ;default :
@@ -6050,7 +6050,7 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing,if (dc_crtc_timing->pixel_encoding ==PIXEL_ENCODING_RGB ) color_space =COLOR_SPACE_2020_RGB_FULLRANGE ;else - color_space =COLOR_SPACE_2020_YCBCR ; + color_space =COLOR_SPACE_2020_YCBCR_LIMITED ;break ;case DRM_MODE_COLORIMETRY_DEFAULT :// ITU601 default :
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +1 -1
@@ -1145,7 +1145,7 @@ static int amdgpu_current_colorspace_show(struct seq_file *m, void *data)case COLOR_SPACE_2020_RGB_FULLRANGE :seq_puts (m,"BT2020_RGB" );break ; -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED :seq_puts (m,"BT2020_YCC" );break ;default :
drivers/gpu/drm/amd/display/dc/basics/dc_common.c +2 -1
@@ -40,7 +40,8 @@ bool is_rgb_cspace(enum dc_color_space output_color_space)case COLOR_SPACE_YCBCR709 :case COLOR_SPACE_YCBCR601_LIMITED :case COLOR_SPACE_YCBCR709_LIMITED : -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED : +case COLOR_SPACE_2020_YCBCR_FULL :return false;default :/* Add a case to switch */
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +3 -2
@@ -176,7 +176,7 @@ static bool is_ycbcr2020_type( {bool ret = false; -if (color_space ==COLOR_SPACE_2020_YCBCR ) +if (color_space ==COLOR_SPACE_2020_YCBCR_LIMITED || color_space ==COLOR_SPACE_2020_YCBCR_FULL ) ret = true;return ret; }
@@ -247,7 +247,8 @@ void color_space_to_black_color(case COLOR_SPACE_YCBCR709_BLACK :case COLOR_SPACE_YCBCR601_LIMITED :case COLOR_SPACE_YCBCR709_LIMITED : -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED : +case COLOR_SPACE_2020_YCBCR_FULL : *black_color = black_color_format[BLACK_COLOR_FORMAT_YUV_CV ];break ;
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -2
@@ -4215,7 +4215,7 @@ static void set_avi_info_frame(break ;case COLOR_SPACE_2020_RGB_FULLRANGE :case COLOR_SPACE_2020_RGB_LIMITEDRANGE : -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED : hdmi_info.bits.EC0_EC2 =COLORIMETRYEX_BT2020RGBYCBCR ; hdmi_info.bits.C0_C1 =COLORIMETRY_EXTENDED ;break ;
@@ -4229,7 +4229,7 @@ static void set_avi_info_frame(break ; } -if (pixel_encoding && color_space ==COLOR_SPACE_2020_YCBCR && +if (pixel_encoding && color_space ==COLOR_SPACE_2020_YCBCR_LIMITED && stream->out_transfer_func.tf ==TRANSFER_FUNCTION_GAMMA22 ) { hdmi_info.bits.EC0_EC2 =0 ; hdmi_info.bits.C0_C1 =COLORIMETRY_ITU709 ;
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +3 -1
@@ -641,7 +641,8 @@ enum dc_color_space {COLOR_SPACE_YCBCR709_LIMITED ,COLOR_SPACE_2020_RGB_FULLRANGE ,COLOR_SPACE_2020_RGB_LIMITEDRANGE , -COLOR_SPACE_2020_YCBCR , +COLOR_SPACE_2020_YCBCR_LIMITED , +COLOR_SPACE_2020_YCBCR_FULL ,COLOR_SPACE_ADOBERGB ,COLOR_SPACE_DCIP3 , COLOR_SPACE_DISPLAYNATIVE,
@@ -649,6 +650,7 @@ enum dc_color_space {COLOR_SPACE_APPCTRL ,COLOR_SPACE_CUSTOMPOINTS ,COLOR_SPACE_YCBCR709_BLACK , + COLOR_SPACE_2020_YCBCR = COLOR_SPACE_2020_YCBCR_LIMITED, }; enum dc_dither_option {
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +2 -1
@@ -420,7 +420,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute( dynamic_range_rgb =1 ;/*limited range*/ break ;case COLOR_SPACE_2020_RGB_FULLRANGE : -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED :case COLOR_SPACE_XR_RGB :case COLOR_SPACE_MSREF_SCRGB :case COLOR_SPACE_ADOBERGB :
@@ -432,6 +432,7 @@ static void dce110_stream_encoder_dp_set_stream_attribute(case COLOR_SPACE_APPCTRL :case COLOR_SPACE_CUSTOMPOINTS :case COLOR_SPACE_UNKNOWN : +default :/* do nothing */ break ; }
drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_stream_encoder.c +2 -1
@@ -393,7 +393,7 @@ void enc1_stream_encoder_dp_set_stream_attribute(break ;case COLOR_SPACE_2020_RGB_LIMITEDRANGE :case COLOR_SPACE_2020_RGB_FULLRANGE : -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED :case COLOR_SPACE_XR_RGB :case COLOR_SPACE_MSREF_SCRGB :case COLOR_SPACE_ADOBERGB :
@@ -406,6 +406,7 @@ void enc1_stream_encoder_dp_set_stream_attribute(case COLOR_SPACE_CUSTOMPOINTS :case COLOR_SPACE_UNKNOWN :case COLOR_SPACE_YCBCR709_BLACK : +default :/* do nothing */ break ; }
drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c +2 -1
@@ -634,7 +634,7 @@ void enc401_stream_encoder_dp_set_stream_attribute(break ;case COLOR_SPACE_2020_RGB_LIMITEDRANGE :case COLOR_SPACE_2020_RGB_FULLRANGE : -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED :case COLOR_SPACE_XR_RGB :case COLOR_SPACE_MSREF_SCRGB :case COLOR_SPACE_ADOBERGB :
@@ -647,6 +647,7 @@ void enc401_stream_encoder_dp_set_stream_attribute(case COLOR_SPACE_CUSTOMPOINTS :case COLOR_SPACE_UNKNOWN :case COLOR_SPACE_YCBCR709_BLACK : +default :/* do nothing */ break ; }
drivers/gpu/drm/amd/display/dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c +2 -1
@@ -323,7 +323,7 @@ static void dcn31_hpo_dp_stream_enc_set_stream_attribute(break ;case COLOR_SPACE_2020_RGB_LIMITEDRANGE :case COLOR_SPACE_2020_RGB_FULLRANGE : -case COLOR_SPACE_2020_YCBCR : +case COLOR_SPACE_2020_YCBCR_LIMITED :case COLOR_SPACE_XR_RGB :case COLOR_SPACE_MSREF_SCRGB :case COLOR_SPACE_ADOBERGB :
@@ -336,6 +336,7 @@ static void dcn31_hpo_dp_stream_enc_set_stream_attribute(case COLOR_SPACE_CUSTOMPOINTS :case COLOR_SPACE_UNKNOWN :case COLOR_SPACE_YCBCR709_BLACK : +default :/* do nothing */ break ; }
drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h +5 -1
@@ -119,10 +119,14 @@ static const struct dpp_input_csc_matrix __maybe_unused dpp_input_csc_matrix[] = {0x39a6 ,0x2568 ,0 ,0xe0d6 ,0xeedd ,0x2568 ,0xf925 ,0x9a8 , 0, 0x2568, 0x43ee, 0xdbb2 } }, - { COLOR_SPACE_2020_YCBCR, + { COLOR_SPACE_2020_YCBCR_FULL, { 0x2F30, 0x2000, 0, 0xE869,0xEDB7 ,0x2000 ,0xFABC ,0xBC6 , 0, 0x2000, 0x3C34, 0xE1E6 } }, + { COLOR_SPACE_2020_YCBCR_LIMITED, + { 0x35B9, 0x2543, 0, 0xE2B2, +0xEB2F ,0x2543 ,0xFA01 ,0x0B1F , + 0, 0x2543, 0x4489, 0xDB42 } }, { COLOR_SPACE_2020_RGB_LIMITEDRANGE, { 0x35E0, 0x255F, 0, 0xE2B3, 0xEB20, 0x255F, 0xF9FD, 0xB1E,
drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c +2 -2
@@ -383,10 +383,10 @@ void mod_build_vsc_infopacket(const struct dc_stream_state *stream, colorimetryFormat = ColorimetryYCC_DP_ITU709; else if (cs == COLOR_SPACE_ADOBERGB) colorimetryFormat = ColorimetryYCC_DP_AdobeYCC; - else if (cs == COLOR_SPACE_2020_YCBCR) + else if (cs == COLOR_SPACE_2020_YCBCR_LIMITED) colorimetryFormat = ColorimetryYCC_DP_ITU2020YCbCr; -if (cs ==COLOR_SPACE_2020_YCBCR && tf ==TRANSFER_FUNC_GAMMA_22 ) +if (cs ==COLOR_SPACE_2020_YCBCR_LIMITED && tf ==TRANSFER_FUNC_GAMMA_22 ) colorimetryFormat = ColorimetryYCC_DP_ITU709;break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 336/626 drm/amd/display: Read LTTPR ALPM caps during link cap retrieval
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Shen <[email protected]>
[ Upstream commit de84d580126eb2214937df755cfec5ef0901479e ]
[Why]
The latest DP spec requires the DP TX to read DPCD F0000h through F0009h when detecting LTTPR capabilities for the first time.
[How]
Update LTTPR cap retrieval to read up to F0009h (two more bytes than the previous F0007h), and store the LTTPR ALPM capabilities.
--- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 12 ++++++++++++ .../display/dc/link/protocols/link_dp_capability.c | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc_dp_types.h +12 -0
@@ -959,6 +959,14 @@ union dp_128b_132b_supported_lttpr_link_rates {uint8_t raw; }; +union dp_alpm_lttpr_cap { +struct { +uint8_t AUX_LESS_ALPM_SUPPORTED :1 ; +uint8_t RESERVED :7 ; + } bits; +uint8_t raw; +}; +union dp_sink_video_fallback_formats {struct {uint8_t dp_1024x768_60Hz_24bpp_support :1 ;
@@ -1103,6 +1111,7 @@ struct dc_lttpr_caps {uint8_t max_ext_timeout;union dp_main_link_channel_coding_lttpr_cap main_link_channel_coding;union dp_128b_132b_supported_lttpr_link_rates supported_128b_132b_rates; +union dp_alpm_lttpr_cap alpm;uint8_t aux_rd_interval[MAX_REPEATER_CNT -1 ]; };
@@ -1352,6 +1361,9 @@ struct dp_trace {#ifndef DPCD_MAX_UNCOMPRESSED_PIXEL_RATE_CAP #define DPCD_MAX_UNCOMPRESSED_PIXEL_RATE_CAP 0x221c#endif +#ifndef DP_LTTPR_ALPM_CAPABILITIES +#define DP_LTTPR_ALPM_CAPABILITIES 0xF0009 +#endif #ifndef DP_REPEATER_CONFIGURATION_AND_STATUS_SIZE #define DP_REPEATER_CONFIGURATION_AND_STATUS_SIZE 0x50#endif
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +5 -1
@@ -1495,7 +1495,7 @@ static bool dpcd_read_sink_ext_caps(struct dc_link *link)enum dc_status dp_retrieve_lttpr_cap (struct dc_link *link) { -uint8_t lttpr_dpcd_data[8 ] = {0 }; +uint8_t lttpr_dpcd_data[10 ] = {0 };enum dc_status status;bool is_lttpr_present;
@@ -1545,6 +1545,10 @@ enum dc_status dp_retrieve_lttpr_cap(struct dc_link *link) lttpr_dpcd_data[DP_PHY_REPEATER_128B132B_RATES -DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV ]; + link->dpcd_caps.lttpr_caps.alpm.raw = + lttpr_dpcd_data[DP_LTTPR_ALPM_CAPABILITIES - +DP_LT_TUNABLE_PHY_REPEATER_FIELD_DATA_STRUCTURE_REV ]; +/* If this chip cap is set, at least one retimer must exist in the chain * Override count to 1 if we receive a known bad count (0 or an invalid value) */ if ((link->chip_caps & EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) &&
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 337/626 Revert "drm/amd/display: Request HW cursor on DCN3.2 with SubVP"
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leo Zeng <[email protected]>
[ Upstream commit 8ae6dfc0b61b170cf13832d4cfe2a0c744e621a7 ]
This reverts commit 13437c91606c9232c747475e202fe3827cd53264.
Reason to revert: idle power regression found in testing.
--- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +0 -1
@@ -626,7 +626,6 @@ static bool dcn32_assign_subvp_pipe(struct dc *dc,* - Not TMZ surface */ if (pipe->plane_state && !pipe->top_pipe && !pipe->prev_odm_pipe && !dcn32_is_center_timing(pipe) && - !pipe->stream->hw_cursor_req && !(pipe->stream->timing.pix_clk_100hz / 10000 > DCN3_2_MAX_SUBVP_PIXEL_RATE_MHZ) && (!dcn32_is_psr_capable(pipe) || (context->stream_count == 1 && dc->caps.dmub_caps.subvp_psr)) && dc_state_get_pipe_subvp_type(context, pipe) == SUBVP_NONE &&
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 338/626 drm/amd/display: Dont treat wb connector as physical in create_validate_stream_for_sink
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harry Wentland <[email protected]>
[ Upstream commit cbf4890c6f28fb1ad733e14613fbd33c2004bced ]
Don't try to operate on a drm_wb_connector as an amdgpu_dm_connector. While dereferencing aconnector->base will "work" it's wrong and might lead to unknown bad things. Just... don't.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 ++++++++++++------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 ++--- 3 files changed, 20 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +17 -9
@@ -7399,12 +7399,12 @@ static enum dc_status dm_validate_stream_and_context(struct dc *dc, }struct dc_stream_state * -create_validate_stream_for_sink (struct amdgpu_dm_connector *aconnector, +create_validate_stream_for_sink (struct drm_connector *connector,const struct drm_display_mode *drm_mode,const struct dm_connector_state *dm_state,const struct dc_stream_state *old_stream) { -struct drm_connector *connector = &aconnector->base; +struct amdgpu_dm_connector *aconnector =NULL ;struct amdgpu_device *adev =drm_to_adev (connector->dev);struct dc_stream_state *stream;const struct drm_connector_state *drm_state = dm_state ? &dm_state->base :NULL ;
@@ -7415,8 +7415,12 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,if (!dm_state)return NULL ; -if (aconnector->dc_link->connector_signal ==SIGNAL_TYPE_HDMI_TYPE_A || - aconnector->dc_link->dpcd_caps.dongle_type ==DISPLAY_DONGLE_DP_HDMI_CONVERTER ) +if (connector->connector_type !=DRM_MODE_CONNECTOR_WRITEBACK ) + aconnector =to_amdgpu_dm_connector (connector); + +if (aconnector && + (aconnector->dc_link->connector_signal ==SIGNAL_TYPE_HDMI_TYPE_A || + aconnector->dc_link->dpcd_caps.dongle_type ==DISPLAY_DONGLE_DP_HDMI_CONVERTER )) bpc_limit =8 ; do {
@@ -7428,10 +7432,11 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,break ; } -if (aconnector->base.connector_type ==DRM_MODE_CONNECTOR_WRITEBACK ) + dc_result =dc_validate_stream (adev->dm.dc, stream); + +if (!aconnector)/* writeback connector */ return stream; - dc_result =dc_validate_stream (adev->dm.dc, stream);if (dc_result ==DC_OK && stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) dc_result =dm_dp_mst_is_port_support_mode (aconnector, stream);
@@ -7461,7 +7466,7 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector, __func__, __LINE__); aconnector->force_yuv420_output = true; - stream =create_validate_stream_for_sink (aconnector, drm_mode, + stream =create_validate_stream_for_sink (connector, drm_mode, dm_state, old_stream); aconnector->force_yuv420_output = false; }
@@ -7476,6 +7481,9 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connecstruct dc_sink *dc_sink;/* TODO: Unhardcode stream count */ struct dc_stream_state *stream; +/* we always have an amdgpu_dm_connector here since we got +* here via the amdgpu_dm_connector_helper_funcs +*/ struct amdgpu_dm_connector *aconnector =to_amdgpu_dm_connector (connector); if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||
@@ -7500,7 +7508,7 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connecdrm_mode_set_crtcinfo (mode,0 ); - stream =create_validate_stream_for_sink (aconnector, mode, + stream =create_validate_stream_for_sink (connector, mode,to_dm_connector_state (connector->state),NULL );if (stream) {
@@ -10520,7 +10528,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,if (!drm_atomic_crtc_needs_modeset (new_crtc_state)) goto skip_modeset; - new_stream =create_validate_stream_for_sink (aconnector, + new_stream =create_validate_stream_for_sink (connector, &new_crtc_state->mode, dm_new_conn_state, dm_old_crtc_state->stream);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +1 -1
@@ -987,7 +987,7 @@ int amdgpu_dm_process_dmub_set_config_sync(struct dc_context *ctx, unsigned int struct set_config_cmd_payload *payload, enum set_config_status *operation_result);struct dc_stream_state * -create_validate_stream_for_sink (struct amdgpu_dm_connector *aconnector, +create_validate_stream_for_sink (struct drm_connector *connector,const struct drm_display_mode *drm_mode,const struct dm_connector_state *dm_state,const struct dc_stream_state *old_stream);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2 -4
@@ -1646,7 +1646,6 @@ int pre_validate_dsc(struct drm_atomic_state *state,if (ind >=0 ) {struct drm_connector *connector; -struct amdgpu_dm_connector *aconnector;struct drm_connector_state *drm_new_conn_state;struct dm_connector_state *dm_new_conn_state;struct dm_crtc_state *dm_old_crtc_state;
@@ -1654,15 +1653,14 @@ int pre_validate_dsc(struct drm_atomic_state *state, connector =amdgpu_dm_find_first_crtc_matching_connector (state, state->crtcs[ind].ptr); - aconnector =to_amdgpu_dm_connector (connector); drm_new_conn_state =drm_atomic_get_new_connector_state (state, - &aconnector->base); + connector); dm_new_conn_state =to_dm_connector_state (drm_new_conn_state); dm_old_crtc_state =to_dm_crtc_state (state->crtcs[ind].old_state); local_dc_state->streams[i] = -create_validate_stream_for_sink (aconnector, +create_validate_stream_for_sink (connector, &state->crtcs[ind].new_state->mode, dm_new_conn_state, dm_old_crtc_state->stream);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 339/626 serial: mctrl_gpio: split disable_ms into sync and no_sync APIs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Lothoré <[email protected]>
[ Upstream commit 1bd2aad57da95f7f2d2bb52f7ad15c0f4993a685 ]
The following splat has been observed on a SAMA5D27 platform using atmel_serial:
BUG: sleeping function called from invalid context at kernel/irq/manage.c:738 in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 27, name: kworker/u5:0 preempt_count: 1, expected: 0 INFO: lockdep is turned off. irq event stamp: 0 hardirqs last enabled at (0): [<00000000>] 0x0 hardirqs last disabled at (0): [<c01588f0>] copy_process+0x1c4c/0x7bec softirqs last enabled at (0): [<c0158944>] copy_process+0x1ca0/0x7bec softirqs last disabled at (0): [<00000000>] 0x0 CPU: 0 UID: 0 PID: 27 Comm: kworker/u5:0 Not tainted 6.13.0-rc7+ #74 Hardware name: Atmel SAMA5 Workqueue: hci0 hci_power_on [bluetooth] Call trace: unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x44/0x70 dump_stack_lvl from __might_resched+0x38c/0x598 __might_resched from disable_irq+0x1c/0x48 disable_irq from mctrl_gpio_disable_ms+0x74/0xc0 mctrl_gpio_disable_ms from atmel_disable_ms.part.0+0x80/0x1f4 atmel_disable_ms.part.0 from atmel_set_termios+0x764/0x11e8 atmel_set_termios from uart_change_line_settings+0x15c/0x994 uart_change_line_settings from uart_set_termios+0x2b0/0x668 uart_set_termios from tty_set_termios+0x600/0x8ec tty_set_termios from ttyport_set_flow_control+0x188/0x1e0 ttyport_set_flow_control from wilc_setup+0xd0/0x524 [hci_wilc] wilc_setup [hci_wilc] from hci_dev_open_sync+0x330/0x203c [bluetooth] hci_dev_open_sync [bluetooth] from hci_dev_do_open+0x40/0xb0 [bluetooth] hci_dev_do_open [bluetooth] from hci_power_on+0x12c/0x664 [bluetooth] hci_power_on [bluetooth] from process_one_work+0x998/0x1a38 process_one_work from worker_thread+0x6e0/0xfb4 worker_thread from kthread+0x3d4/0x484 kthread from ret_from_fork+0x14/0x28
This warning is emitted when trying to toggle, at the highest level, some flow control (with serdev_device_set_flow_control) in a device driver. At the lowest level, the atmel_serial driver is using serial_mctrl_gpio lib to enable/disable the corresponding IRQs accordingly. The warning emitted by CONFIG_DEBUG_ATOMIC_SLEEP is due to disable_irq (called in mctrl_gpio_disable_ms) being possibly called in some atomic context (some tty drivers perform modem lines configuration in regions protected by port lock).
Split mctrl_gpio_disable_ms into two differents APIs, a non-blocking one and a blocking one. Replace mctrl_gpio_disable_ms calls with the relevant version depending on whether the call is protected by some port lock.
--- Documentation/driver-api/serial/driver.rst | 2 +- drivers/tty/serial/8250/8250_port.c | 2 +- drivers/tty/serial/atmel_serial.c | 2 +- drivers/tty/serial/imx.c | 2 +- drivers/tty/serial/serial_mctrl_gpio.c | 34 +++++++++++++++++----- drivers/tty/serial/serial_mctrl_gpio.h | 17 +++++++++-- drivers/tty/serial/sh-sci.c | 2 +- drivers/tty/serial/stm32-usart.c | 2 +- 8 files changed, 47 insertions(+), 16 deletions(-)
Documentation/driver-api/serial/driver.rst +1 -1
@@ -103,4 +103,4 @@ Some helpers are provided in order to set/get modem control lines via GPIO. .. kernel-doc:: drivers/tty/serial/serial_mctrl_gpio.c :identifiers: mctrl_gpio_init mctrl_gpio_free mctrl_gpio_to_gpiod mctrl_gpio_set mctrl_gpio_get mctrl_gpio_enable_ms - mctrl_gpio_disable_ms + mctrl_gpio_disable_ms_sync mctrl_gpio_disable_ms_no_sync
drivers/tty/serial/8250/8250_port.c +1 -1
@@ -1657,7 +1657,7 @@ static void serial8250_disable_ms(struct uart_port *port)if (up->bugs &UART_BUG_NOMSR )return ; -mctrl_gpio_disable_ms (up->gpios); +mctrl_gpio_disable_ms_no_sync (up->gpios); up->ier &= ~UART_IER_MSI ;serial_port_out (port,UART_IER , up->ier);
drivers/tty/serial/atmel_serial.c +1 -1
@@ -700,7 +700,7 @@ static void atmel_disable_ms(struct uart_port *port) atmel_port->ms_irq_enabled = false; -mctrl_gpio_disable_ms (atmel_port->gpios); +mctrl_gpio_disable_ms_no_sync (atmel_port->gpios);if (!mctrl_gpio_to_gpiod (atmel_port->gpios,UART_GPIO_CTS )) idr |=ATMEL_US_CTSIC ;
drivers/tty/serial/imx.c +1 -1
@@ -1596,7 +1596,7 @@ static void imx_uart_shutdown(struct uart_port *port)imx_uart_dma_exit (sport); } -mctrl_gpio_disable_ms (sport->gpios); +mctrl_gpio_disable_ms_sync (sport->gpios);uart_port_lock_irqsave (&sport->port, &flags); ucr2 =imx_uart_readl (sport,UCR2 );
drivers/tty/serial/serial_mctrl_gpio.c +27 -7
@@ -322,11 +322,7 @@ void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios) }EXPORT_SYMBOL_GPL (mctrl_gpio_enable_ms); -/** -* mctrl_gpio_disable_ms - disable irqs and handling of changes to the ms lines -* @gpios: gpios to disable -*/ -void mctrl_gpio_disable_ms (struct mctrl_gpios *gpios) +static void mctrl_gpio_disable_ms (struct mctrl_gpios *gpios,bool sync) {enum mctrl_gpio_idx i;
@@ -342,10 +338,34 @@ void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios)if (!gpios->irq[i])continue ; -disable_irq (gpios->irq[i]); +if (sync) +disable_irq (gpios->irq[i]); +else +disable_irq_nosync (gpios->irq[i]); } } -EXPORT_SYMBOL_GPL (mctrl_gpio_disable_ms); + +/** +* mctrl_gpio_disable_ms_sync - disable irqs and handling of changes to the ms +* lines, and wait for any pending IRQ to be processed +* @gpios: gpios to disable +*/ +void mctrl_gpio_disable_ms_sync (struct mctrl_gpios *gpios) +{ +mctrl_gpio_disable_ms (gpios, true); +} +EXPORT_SYMBOL_GPL (mctrl_gpio_disable_ms_sync); + +/** +* mctrl_gpio_disable_ms_no_sync - disable irqs and handling of changes to the +* ms lines, and return immediately +* @gpios: gpios to disable +*/ +void mctrl_gpio_disable_ms_no_sync (struct mctrl_gpios *gpios) +{ +mctrl_gpio_disable_ms (gpios, false); +} +EXPORT_SYMBOL_GPL (mctrl_gpio_disable_ms_no_sync);void mctrl_gpio_enable_irq_wake (struct mctrl_gpios *gpios) {
drivers/tty/serial/serial_mctrl_gpio.h +14 -3
@@ -87,9 +87,16 @@ void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios);void mctrl_gpio_enable_ms (struct mctrl_gpios *gpios);/* -* Disable gpio interrupts to report status line changes. +* Disable gpio interrupts to report status line changes, and block until +* any corresponding IRQ is processed */ -void mctrl_gpio_disable_ms (struct mctrl_gpios *gpios); +void mctrl_gpio_disable_ms_sync (struct mctrl_gpios *gpios); + +/* +* Disable gpio interrupts to report status line changes, and return +* immediately +*/ +void mctrl_gpio_disable_ms_no_sync (struct mctrl_gpios *gpios);/* * Enable gpio wakeup interrupts to enable wake up source.
@@ -148,7 +155,11 @@ static inline void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios) { } -static inline void mctrl_gpio_disable_ms (struct mctrl_gpios *gpios) +static inline void mctrl_gpio_disable_ms_sync (struct mctrl_gpios *gpios) +{ +} + +static inline void mctrl_gpio_disable_ms_no_sync (struct mctrl_gpios *gpios) { }
drivers/tty/serial/sh-sci.c +1 -1
@@ -2297,7 +2297,7 @@ static void sci_shutdown(struct uart_port *port)dev_dbg (port->dev,"%s(%d)\n" , __func__, port->line); s->autorts = false; -mctrl_gpio_disable_ms (to_sci_port (port)->gpios); +mctrl_gpio_disable_ms_sync (to_sci_port (port)->gpios);uart_port_lock_irqsave (port, &flags);sci_stop_rx (port);
drivers/tty/serial/stm32-usart.c +1 -1
@@ -944,7 +944,7 @@ static void stm32_usart_enable_ms(struct uart_port *port)static void stm32_usart_disable_ms (struct uart_port *port) { -mctrl_gpio_disable_ms (to_stm32_port (port)->gpios); +mctrl_gpio_disable_ms_sync (to_stm32_port (port)->gpios); }/* Transmit stop */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 340/626 RDMA/core: Fix best page size finding when it can cross SG entries
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Margolin <[email protected]>
[ Upstream commit 486055f5e09df959ad4e3aa4ee75b5c91ddeec2e ]
A single scatter-gather entry is limited by a 32 bits "length" field that is practically 4GB - PAGE_SIZE. This means that even when the memory is physically contiguous, we might need more than one entry to represent it. Additionally when using dmabuf, the sg_table might be originated outside the subsystem and optimized for other needs.
For instance an SGT of 16GB GPU continuous memory might look like this:
(a real life example)
dma_address 34401400000, length fffff000dma_address 345013ff000, length fffff000dma_address 346013fe000, length fffff000dma_address 347013fd000, length fffff000dma_address 348013fc000, length 4000
Since ib_umem_find_best_pgsz works within SG entries, in the above case we will result with the worst possible 4KB page size.
Fix this by taking into consideration only the alignment of addresses of real discontinuity points rather than treating SG entries as such, and adjust the page iterator to correctly handle cross SG entry pages.
There is currently an assumption that drivers do not ask for pages bigger than maximal DMA size supported by their devices.
--- drivers/infiniband/core/umem.c | 36 ++++++++++++++++++++++++--------- drivers/infiniband/core/verbs.c | 11 +++++----- 2 files changed, 32 insertions(+), 15 deletions(-)
drivers/infiniband/core/umem.c +26 -10
@@ -80,9 +80,12 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem, unsigned long pgsz_bitmap, unsigned long virt) { -struct scatterlist *sg; +unsigned long curr_len =0 ; +dma_addr_t curr_base = ~0 ;unsigned long va, pgoff; +struct scatterlist *sg;dma_addr_t mask; +dma_addr_t end;int i; umem->iova = va = virt;
@@ -107,17 +110,30 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem, pgoff = umem->address & ~PAGE_MASK ;for_each_sgtable_dma_sg (&umem->sgt_append.sgt, sg, i) { -/* Walk SGL and reduce max page size if VA/PA bits differ -* for any address. +/* If the current entry is physically contiguous with the previous +* one, no need to take its start addresses into consideration. */ - mask |= (sg_dma_address (sg) + pgoff) ^ va; +if (check_add_overflow (curr_base, curr_len, &end) || + end !=sg_dma_address (sg)) { + + curr_base =sg_dma_address (sg); + curr_len =0 ; + +/* Reduce max page size if VA/PA bits differ */ + mask |= (curr_base + pgoff) ^ va; + +/* The alignment of any VA matching a discontinuity point +* in the physical memory sets the maximum possible page +* size as this must be a starting point of a new page that +* needs to be aligned. +*/ +if (i !=0 ) + mask |= va; + } + + curr_len +=sg_dma_len (sg); va +=sg_dma_len (sg) - pgoff; -/* Except for the last entry, the ending iova alignment sets -* the maximum possible page size as the low bits of the iova -* must be zero when starting the next chunk. -*/ -if (i != (umem->sgt_append.sgt.nents -1 )) - mask |= va; + pgoff =0 ; }
drivers/infiniband/core/verbs.c +6 -5
@@ -3109,22 +3109,23 @@ EXPORT_SYMBOL(__rdma_block_iter_start);bool __rdma_block_iter_next (struct ib_block_iter *biter) {unsigned int block_offset; -unsigned int sg_delta; +unsigned int delta;if (!biter->__sg_nents || !biter->__sg)return false; biter->__dma_addr =sg_dma_address (biter->__sg) + biter->__sg_advance; block_offset = biter->__dma_addr & (BIT_ULL (biter->__pg_bit) -1 ); - sg_delta =BIT_ULL (biter->__pg_bit) - block_offset; + delta =BIT_ULL (biter->__pg_bit) - block_offset; -if (sg_dma_len (biter->__sg) - biter->__sg_advance > sg_delta) { - biter->__sg_advance += sg_delta; - }else { +while (biter->__sg_nents && biter->__sg && +sg_dma_len (biter->__sg) - biter->__sg_advance <= delta) { + delta -=sg_dma_len (biter->__sg) - biter->__sg_advance; biter->__sg_advance =0 ; biter->__sg =sg_next (biter->__sg); biter->__sg_nents--; } + biter->__sg_advance += delta;return true; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 341/626 pmdomain: imx: gpcv2: use proper helper for property detection
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit 6568cb40e73163fa25e2779f7234b169b2e1a32e ]
Starting with commit c141ecc3cecd7 ("of: Warn when of_property_read_bool() is used on non-boolean properties"), probing the gpcv2 device on i.MX8M SoCs leads to warnings when LOCKDEP is enabled.
Fix this by checking property presence with of_property_present as intended.
--- drivers/pmdomain/imx/gpcv2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pmdomain/imx/gpcv2.c +1 -1
@@ -1361,7 +1361,7 @@ static int imx_pgc_domain_probe(struct platform_device *pdev) }if (IS_ENABLED (CONFIG_LOCKDEP ) && -of_property_read_bool (domain->dev->of_node,"power-domains" )) +of_property_present (domain->dev->of_node,"power-domains" ))lockdep_set_subclass (&domain->genpd.mlock,1 ); ret = of_genpd_add_provider_simple(domain->dev->of_node,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 342/626 can: c_can: Use of_property_present() to test existence of DT property
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ab1bc2290fd8311d49b87c29f1eb123fcb581bee ]
of_property_read_bool() should be used only on boolean properties.
--- drivers/net/can/c_can/c_can_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/c_can/c_can_platform.c +1 -1
@@ -324,7 +324,7 @@ static int c_can_plat_probe(struct platform_device *pdev)/* Check if we need custom RAMINIT via syscon. Mostly for TI * platforms. Only supported with DT boot. */ -if (np &&of_property_read_bool (np,"syscon-raminit" )) { +if (np &&of_property_present (np,"syscon-raminit" )) {u32 id;struct c_can_raminit *raminit = &priv->raminit_sys;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 343/626 bpf: dont do clean_live_states when state->loop_entry->branches > 0
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eduard Zingerman <[email protected]>
[ Upstream commit 9e63fdb0cbdf3268c86638a8274f4d5549a82820 ]
verifier.c:is_state_visited() uses RANGE_WITHIN states comparison rules for cached states that have loop_entry with non-zero branches count (meaning that loop_entry's verification is not yet done).
The RANGE_WITHIN rules in regsafe()/stacksafe() require register and stack objects types to be identical in current and old states.
verifier.c:clean_live_states() replaces registers and stack spills with NOT_INIT/STACK_INVALID marks, if these registers/stack spills are not read in any child state. This means that clean_live_states() works against loop convergence logic under some conditions. See selftest in the next patch for a specific example.
Mitigate this by prohibiting clean_verifier_state() when state->loop_entry->branches > 0.
This undoes negative verification performance impact of the copy_verifier_state() fix from the previous patch. Below is comparison between master and current patch.
selftests:
File Program Insns (A) Insns (B) Insns (DIFF) States (A) States (B) States (DIFF) ---------------------------------- ---------------------------- --------- --------- --------------- ---------- ---------- -------------- arena_htab.bpf.o arena_htab_llvm 717 423 -294 (-41.00%) 57 37 -20 (-35.09%) arena_htab_asm.bpf.o arena_htab_asm 597 445 -152 (-25.46%) 47 37 -10 (-21.28%) arena_list.bpf.o arena_list_add 1493 1822 +329 (+22.04%) 30 37 +7 (+23.33%) arena_list.bpf.o arena_list_del 309 261 -48 (-15.53%) 23 15 -8 (-34.78%) iters.bpf.o checkpoint_states_deletion 18125 22154 +4029 (+22.23%) 818 918 +100 (+12.22%) iters.bpf.o iter_nested_deeply_iters 593 367 -226 (-38.11%) 67 43 -24 (-35.82%) iters.bpf.o iter_nested_iters 813 772 -41 (-5.04%) 79 72 -7 (-8.86%) iters.bpf.o iter_subprog_check_stacksafe 155 135 -20 (-12.90%) 15 14 -1 (-6.67%) iters.bpf.o iter_subprog_iters 1094 808 -286 (-26.14%) 88 68 -20 (-22.73%) iters.bpf.o loop_state_deps2 479 356 -123 (-25.68%) 46 35 -11 (-23.91%) iters.bpf.o triple_continue 35 31 -4 (-11.43%) 3 3 +0 (+0.00%) kmem_cache_iter.bpf.o open_coded_iter 63 59 -4 (-6.35%) 7 6 -1 (-14.29%) mptcp_subflow.bpf.o _getsockopt_subflow 501 446 -55 (-10.98%) 25 23 -2 (-8.00%) pyperf600_iter.bpf.o on_event 12339 6379 -5960 (-48.30%) 441 286 -155 (-35.15%) verifier_bits_iter.bpf.o max_words 92 84 -8 (-8.70%) 8 7 -1 (-12.50%) verifier_iterating_callbacks.bpf.o cond_break2 113 192 +79 (+69.91%) 12 21 +9 (+75.00%)
sched_ext:
File Program Insns (A) Insns (B) Insns (DIFF) States (A) States (B) States (DIFF) ----------------- ---------------------- --------- --------- ----------------- ---------- ---------- ---------------- bpf.bpf.o layered_dispatch 11485 9039 -2446 (-21.30%) 848 662 -186 (-21.93%) bpf.bpf.o layered_dump 7422 5022 -2400 (-32.34%) 681 298 -383 (-56.24%) bpf.bpf.o layered_enqueue 16854 13753 -3101 (-18.40%) 1611 1308 -303 (-18.81%) bpf.bpf.o layered_init 1000001 5549 -994452 (-99.45%) 84672 523 -84149 (-99.38%) bpf.bpf.o layered_runnable 3149 1899 -1250 (-39.70%) 288 151 -137 (-47.57%) bpf.bpf.o p2dq_init 2343 1936 -407 (-17.37%) 201 170 -31 (-15.42%) bpf.bpf.o refresh_layer_cpumasks 16487 1285 -15202 (-92.21%) 1770 120 -1650 (-93.22%) bpf.bpf.o rusty_select_cpu 1937 1386 -551 (-28.45%) 177 125 -52 (-29.38%) scx_central.bpf.o central_dispatch 636 600 -36 (-5.66%) 63 59 -4 (-6.35%) scx_central.bpf.o central_init 913 632 -281 (-30.78%) 48 39 -9 (-18.75%) scx_nest.bpf.o nest_init 636 601 -35 (-5.50%) 60 58 -2 (-3.33%) scx_pair.bpf.o pair_dispatch 1000001 1914 -998087 (-99.81%) 58169 142 -58027 (-99.76%) scx_qmap.bpf.o qmap_dispatch 2393 2187 -206 (-8.61%) 196 174 -22 (-11.22%) scx_qmap.bpf.o qmap_init 16367 22777 +6410 (+39.16%) 603 768 +165 (+27.36%)
'layered_init' and 'pair_dispatch' hit 1M on master, but are verified ok with this patch.
--- kernel/bpf/verifier.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/bpf/verifier.c +4 -0
@@ -17282,12 +17282,16 @@ static void clean_verifier_state(struct bpf_verifier_env *env,static void clean_live_states (struct bpf_verifier_env *env,int insn,struct bpf_verifier_state *cur) { +struct bpf_verifier_state *loop_entry;struct bpf_verifier_state_list *sl; sl = *explored_state (env, insn);while (sl) {if (sl->state.branches) goto next; + loop_entry =get_loop_entry (&sl->state); +if (loop_entry && loop_entry->branches) + goto next;if (sl->state.insn_idx != insn || !same_callsites (&sl->state, cur)) goto next;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 344/626 bpf: copy_verifier_state() should copy loop_entry field
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eduard Zingerman <[email protected]>
[ Upstream commit bbbc02b7445ebfda13e4847f4f1413c6480a85a9 ]
The bpf_verifier_state.loop_entry state should be copied by copy_verifier_state(). Otherwise, .loop_entry values from unrelated states would poison env->cur_state.
Additionally, env->stack should not contain any states with .loop_entry != NULL. The states in env->stack are yet to be verified, while .loop_entry is set for states that reached an equivalent state. This means that env->cur_state->loop_entry should always be NULL after pop_stack().
See the selftest in the next commit for an example of the program that is not safe yet is accepted by verifier w/o this fix.
This change has some verification performance impact for selftests:
File Program Insns (A) Insns (B) Insns (DIFF) States (A) States (B) States (DIFF) ---------------------------------- ---------------------------- --------- --------- -------------- ---------- ---------- ------------- arena_htab.bpf.o arena_htab_llvm 717 426 -291 (-40.59%) 57 37 -20 (-35.09%) arena_htab_asm.bpf.o arena_htab_asm 597 445 -152 (-25.46%) 47 37 -10 (-21.28%) arena_list.bpf.o arena_list_del 309 279 -30 (-9.71%) 23 14 -9 (-39.13%) iters.bpf.o iter_subprog_check_stacksafe 155 141 -14 (-9.03%) 15 14 -1 (-6.67%) iters.bpf.o iter_subprog_iters 1094 1003 -91 (-8.32%) 88 83 -5 (-5.68%) iters.bpf.o loop_state_deps2 479 725 +246 (+51.36%) 46 63 +17 (+36.96%) kmem_cache_iter.bpf.o open_coded_iter 63 59 -4 (-6.35%) 7 6 -1 (-14.29%) verifier_bits_iter.bpf.o max_words 92 84 -8 (-8.70%) 8 7 -1 (-12.50%) verifier_iterating_callbacks.bpf.o cond_break2 113 107 -6 (-5.31%) 12 12 +0 (+0.00%)
And significant negative impact for sched_ext:
File Program Insns (A) Insns (B) Insns (DIFF) States (A) States (B) States (DIFF) ----------------- ---------------------- --------- --------- -------------------- ---------- ---------- ------------------ bpf.bpf.o lavd_init 7039 14723 +7684 (+109.16%) 490 1139 +649 (+132.45%) bpf.bpf.o layered_dispatch 11485 10548 -937 (-8.16%) 848 762 -86 (-10.14%) bpf.bpf.o layered_dump 7422 1000001 +992579 (+13373.47%) 681 31178 +30497 (+4478.27%) bpf.bpf.o layered_enqueue 16854 71127 +54273 (+322.02%) 1611 6450 +4839 (+300.37%) bpf.bpf.o p2dq_dispatch 665 791 +126 (+18.95%) 68 78 +10 (+14.71%) bpf.bpf.o p2dq_init 2343 2980 +637 (+27.19%) 201 237 +36 (+17.91%) bpf.bpf.o refresh_layer_cpumasks 16487 674760 +658273 (+3992.68%) 1770 65370 +63600 (+3593.22%) bpf.bpf.o rusty_select_cpu 1937 40872 +38935 (+2010.07%) 177 3210 +3033 (+1713.56%) scx_central.bpf.o central_dispatch 636 2687 +2051 (+322.48%) 63 227 +164 (+260.32%) scx_nest.bpf.o nest_init 636 815 +179 (+28.14%) 60 73 +13 (+21.67%) scx_qmap.bpf.o qmap_dispatch 2393 3580 +1187 (+49.60%) 196 253 +57 (+29.08%) scx_qmap.bpf.o qmap_dump 233 318 +85 (+36.48%) 22 30 +8 (+36.36%) scx_qmap.bpf.o qmap_init 16367 17436 +1069 (+6.53%) 603 669 +66 (+10.95%)
Note 'layered_dump' program, which now hits 1M instructions limit. This impact would be mitigated in the next patch.
--- kernel/bpf/verifier.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/bpf/verifier.c +3 -0
@@ -1447,6 +1447,7 @@ static int copy_verifier_state(struct bpf_verifier_state *dst_state, dst_state->callback_unroll_depth = src->callback_unroll_depth; dst_state->used_as_loop_entry = src->used_as_loop_entry; dst_state->may_goto_depth = src->may_goto_depth; + dst_state->loop_entry = src->loop_entry;for (i =0 ; i <= src->curframe; i++) { dst = dst_state->frame[i];if (!dst) {
@@ -18720,6 +18721,8 @@ static int do_check(struct bpf_verifier_env *env)return err;break ; }else { +if (WARN_ON_ONCE (env->cur_state->loop_entry)) + env->cur_state->loop_entry =NULL ; do_print_state = true;continue ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 345/626 eth: mlx4: dont try to complete XDP frames in netpoll
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 8fdeafd66edaf420ea0063a1f13442fe3470fe70 ]
mlx4 doesn't support ndo_xdp_xmit / XDP_REDIRECT and wasn't using page pool until now, so it could run XDP completions in netpoll (NAPI budget == 0) just fine. Page pool has calling context requirements, make sure we don't try to call it from what is potentially HW IRQ context.
--- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mellanox/mlx4/en_tx.c +2 -0
@@ -450,6 +450,8 @@ int mlx4_en_process_tx_cq(struct net_device *dev,if (unlikely (!priv->port_up))return 0 ; +if (unlikely (!napi_budget) && cq->type ==TX_XDP ) +return 0 ;netdev_txq_bql_complete_prefetchw (ring->tx_queue);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 346/626 PCI: Fix old_size lower bound in calculate_iosize() too
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit ff61f380de5652e723168341480cc7adf1dd6213 ]
Commit 903534fa7d30 ("PCI: Fix resource double counting on remove & rescan") fixed double counting of mem resources because of old_size being applied too early.
Fix a similar counting bug on the io resource side.
--- drivers/pci/setup-bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/setup-bus.c +2 -4
@@ -814,11 +814,9 @@ static resource_size_t calculate_iosize(resource_size_t size, size = (size &0xff ) + ((size & ~0xffUL ) <<2 );#endif size = size + size1; -if (size < old_size) - size = old_size; - size =ALIGN (max (size, add_size) + children_add_size, align); -return size; + size =max (size, add_size) + children_add_size; +return ALIGN (max (size, old_size), align); } static resource_size_t calculate_memsize(resource_size_t size,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 347/626 ACPI: HED: Always initialize before evged
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaofei Tan <[email protected]>
[ Upstream commit cccf6ee090c8c133072d5d5b52ae25f3bc907a16 ]
When the HED driver is built-in, it initializes after evged because they both are at the same initcall level, so the initialization ordering depends on the Makefile order. However, this prevents RAS records coming in between the evged driver initialization and the HED driver initialization from being handled.
If the number of such RAS records is above the APEI HEST error source number, the HEST resources may be exhausted, and that may affect subsequent RAS error reporting.
To fix this issue, change the initcall level of HED to subsys_initcall and prevent the driver from being built as a module by changing ACPI_HED in Kconfig from "tristate" to "bool".
--- drivers/acpi/Kconfig | 2 +- drivers/acpi/hed.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/acpi/Kconfig +1 -1
@@ -443,7 +443,7 @@ config ACPI_SBS the modules will be called sbs and sbshc. config ACPI_HED - tristate "Hardware Error Device" + bool "Hardware Error Device" help This driver supports the Hardware Error Device (PNP0C33), which is used to report some hardware errors notified via
drivers/acpi/hed.c +6 -1
@@ -80,7 +80,12 @@ static struct acpi_driver acpi_hed_driver = { .remove = acpi_hed_remove, }, }; -module_acpi_driver (acpi_hed_driver); + +static int __init acpi_hed_driver_init (void ) +{ +return acpi_bus_register_driver (&acpi_hed_driver); +} +subsys_initcall (acpi_hed_driver_init);MODULE_AUTHOR ("Huang Ying" );MODULE_DESCRIPTION ("ACPI Hardware Error Device Driver" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 348/626 vxlan: Join / leave MC group after remote changes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Machata <[email protected]>
[ Upstream commit d42d543368343c0449a4e433b5f02e063a86209c ]
When a vxlan netdevice is brought up, if its default remote is a multicast address, the device joins the indicated group.
Therefore when the multicast remote address changes, the device should leave the current group and subscribe to the new one. Similarly when the interface used for endpoint communication is changed in a situation when multicast remote is configured. This is currently not done.
Both vxlan_igmp_join() and vxlan_igmp_leave() can however fail. So it is possible that with such fix, the netdevice will end up in an inconsistent situation where the old group is not joined anymore, but joining the new group fails. Should we join the new group first, and leave the old one second, we might end up in the opposite situation, where both groups are joined. Undoing any of this during rollback is going to be similarly problematic.
One solution would be to just forbid the change when the netdevice is up. However in vnifilter mode, changing the group address is allowed, and these problems are simply ignored (see vxlan_vni_update_group()):
# ip link add name br up type bridge vlan_filtering 1 # ip link add vx1 up master br type vxlan external vnifilter local 192.0.2.1 dev lo dstport 4789 # bridge vni add dev vx1 vni 200 group 224.0.0.1 # tcpdump -i lo & # bridge vni add dev vx1 vni 200 group 224.0.0.2 18:55:46.523438 IP 0.0.0.0 > 224.0.0.22: igmp v3 report, 1 group record(s) 18:55:46.943447 IP 0.0.0.0 > 224.0.0.22: igmp v3 report, 1 group record(s) # bridge vni dev vni group/remote vx1 200 224.0.0.2
Having two different modes of operation for conceptually the same interface is silly, so in this patch, just do what the vnifilter code does and deal with the errors by crossing fingers real hard.
The vnifilter code leaves old before joining new, and in case of join / leave failures does not roll back the configuration changes that have already been applied, but bails out of joining if it could not leave. Do the same here: leave before join, apply changes unconditionally and do not attempt to join if we couldn't leave.
--- drivers/net/vxlan/vxlan_core.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/net/vxlan/vxlan_core.c +16 -2
@@ -4340,6 +4340,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], struct netlink_ext_ack *extack) {struct vxlan_dev *vxlan =netdev_priv (dev); +bool rem_ip_changed, change_igmp;struct net_device *lowerdev;struct vxlan_config conf;struct vxlan_rdst *dst;
@@ -4363,8 +4364,13 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],if (err)return err; + rem_ip_changed = !vxlan_addr_equal (&conf.remote_ip, &dst->remote_ip); + change_igmp = vxlan->dev->flags &IFF_UP && + (rem_ip_changed || + dst->remote_ifindex != conf.remote_ifindex); +/* handle default dst entry */ -if (!vxlan_addr_equal (&conf.remote_ip, &dst->remote_ip)) { +if (rem_ip_changed) {u32 hash_index =fdb_head_index (vxlan, all_zeros_mac, conf.vni);spin_lock_bh (&vxlan->hash_lock[hash_index]);
@@ -4408,6 +4414,9 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[], } } +if (change_igmp &&vxlan_addr_multicast (&dst->remote_ip)) + err =vxlan_multicast_leave (vxlan); +if (conf.age_interval != vxlan->cfg.age_interval)mod_timer (&vxlan->age_timer, jiffies);
@@ -4415,7 +4424,12 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],if (lowerdev && lowerdev != dst->remote_dev) dst->remote_dev = lowerdev;vxlan_config_apply (dev, &conf, lowerdev, vxlan->net, true); -return 0 ; + +if (!err && change_igmp && +vxlan_addr_multicast (&dst->remote_ip)) + err =vxlan_multicast_join (vxlan); + +return err; }static void vxlan_dellink (struct net_device *dev,struct list_head *head)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 349/626 x86/boot: Disable stack protector for early boot code
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Gerst <[email protected]>
[ Upstream commit a9a76b38aaf577887103e3ebb41d70e6aa5a4b19 ]
On 64-bit, this will prevent crashes when the canary access is changed from %gs:40 to %gs:__stack_chk_guard(%rip). RIP-relative addresses from the identity-mapped early boot code will target the wrong address with zero-based percpu. KASLR could then shift that address to an unmapped page causing a crash on boot.
This early boot code runs well before user-space is active and does not need stack protector enabled.
--- arch/x86/kernel/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/Makefile +2 -0
@@ -44,6 +44,8 @@ KCOV_INSTRUMENT_unwind_orc.o := n KCOV_INSTRUMENT_unwind_frame.o := n KCOV_INSTRUMENT_unwind_guess.o := n +CFLAGS_head32.o := -fno-stack-protector +CFLAGS_head64.o := -fno-stack-protector CFLAGS_irq.o := -I $(src)/../include/asm/trace obj-y += head_$(BITS).o
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 350/626 hrtimers: Replace hrtimer_clock_to_base_table with switch-case
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 4441b976dfeff0d3579e8da3c0283300c618a553 ]
Clang and GCC complain about overlapped initialisers in the hrtimer_clock_to_base_table definition. With make W=1 and CONFIG_WERROR=y (which is default nowadays) this breaks the build:
CC kernel/time/hrtimer.okernel/time/hrtimer.c:124:21: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides]
124 | [CLOCK_REALTIME] = HRTIMER_BASE_REALTIME,
kernel/time/hrtimer.c:122:27: note: previous initialization is here
122 | [0 ... MAX_CLOCKS - 1] = HRTIMER_MAX_CLOCK_BASES,
(and similar for CLOCK_MONOTONIC, CLOCK_BOOTTIME, and CLOCK_TAI).
hrtimer_clockid_to_base(), which uses the table, is only used in __hrtimer_init(), which is not a hotpath.
Therefore replace the table lookup with a switch case in hrtimer_clockid_to_base() to avoid this warning.
--- kernel/time/hrtimer.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-)
kernel/time/hrtimer.c +12 -17
@@ -117,16 +117,6 @@ DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) = .csd = CSD_INIT(retrigger_next_event, NULL) }; -static const int hrtimer_clock_to_base_table[MAX_CLOCKS ] = { -/* Make sure we catch unsupported clockids */ - [0 ...MAX_CLOCKS -1 ] =HRTIMER_MAX_CLOCK_BASES , - - [CLOCK_REALTIME ] =HRTIMER_BASE_REALTIME , - [CLOCK_MONOTONIC ] =HRTIMER_BASE_MONOTONIC , - [CLOCK_BOOTTIME ] =HRTIMER_BASE_BOOTTIME , - [CLOCK_TAI ] =HRTIMER_BASE_TAI , -}; -static inline bool hrtimer_base_is_online (struct hrtimer_cpu_base *base) {if (!IS_ENABLED (CONFIG_HOTPLUG_CPU ))
@@ -1597,14 +1587,19 @@ u64 hrtimer_next_event_without(const struct hrtimer *exclude)static inline int hrtimer_clockid_to_base (clockid_t clock_id) { -if (likely (clock_id <MAX_CLOCKS )) { -int base = hrtimer_clock_to_base_table[clock_id]; - -if (likely (base !=HRTIMER_MAX_CLOCK_BASES )) -return base; +switch (clock_id) { +case CLOCK_REALTIME : +return HRTIMER_BASE_REALTIME ; +case CLOCK_MONOTONIC : +return HRTIMER_BASE_MONOTONIC ; +case CLOCK_BOOTTIME : +return HRTIMER_BASE_BOOTTIME ; +case CLOCK_TAI : +return HRTIMER_BASE_TAI ; +default : +WARN (1 ,"Invalid clockid %d. Using MONOTONIC\n" , clock_id); +return HRTIMER_BASE_MONOTONIC ; } -WARN (1 ,"Invalid clockid %d. Using MONOTONIC\n" , clock_id); -return HRTIMER_BASE_MONOTONIC ; } static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 351/626 irqchip/riscv-imsic: Set irq_set_affinity() for IMSIC base
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Jones <[email protected]>
[ Upstream commit 999f458c1771354371ba367dd84f55f9a62a4233 ]
The IMSIC driver assigns the IMSIC domain specific imsic_irq_set_affinity() callback to the per device leaf MSI domain. That's a layering violation as it is called with the leaf domain data and not with the IMSIC domain data. This prevents moving the IMSIC driver to the common MSI library which uses the generic msi_domain_set_affinity() callback for device MSI domains.
Instead of using imsic_irq_set_affinity() for leaf MSI domains, use imsic_irq_set_affinity() for the non-leaf IMSIC base domain and use irq_chip_set_affinity_parent() for leaf MSI domains.
[ tglx: Massaged change log ]
--- drivers/irqchip/irq-riscv-imsic-platform.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/irqchip/irq-riscv-imsic-platform.c +9 -7
@@ -96,9 +96,8 @@ static int imsic_irq_set_affinity(struct irq_data *d, const struct cpumask *mask bool force) {struct imsic_vector *old_vec, *new_vec; -struct irq_data *pd = d->parent_data; - old_vec =irq_data_get_irq_chip_data (pd); + old_vec =irq_data_get_irq_chip_data (d);if (WARN_ON (!old_vec))return -ENOENT ;
@@ -116,13 +115,13 @@ static int imsic_irq_set_affinity(struct irq_data *d, const struct cpumask *maskreturn -ENOSPC ;/* Point device to the new vector */ -imsic_msi_update_msg (d, new_vec); +imsic_msi_update_msg (irq_get_irq_data (d->irq), new_vec);/* Update irq descriptors with the new vector */ - pd->chip_data = new_vec; + d->chip_data = new_vec; -/* Update effective affinity of parent irq data */ -irq_data_update_effective_affinity (pd,cpumask_of (new_vec->cpu)); +/* Update effective affinity */ +irq_data_update_effective_affinity (d,cpumask_of (new_vec->cpu));/* Move state of the old vector to the new vector */ imsic_vector_move (old_vec, new_vec);
@@ -135,6 +134,9 @@ static struct irq_chip imsic_irq_base_chip = { .name = "IMSIC", .irq_mask = imsic_irq_mask, .irq_unmask = imsic_irq_unmask, +#ifdef CONFIG_SMP + .irq_set_affinity = imsic_irq_set_affinity, +#endif .irq_retrigger = imsic_irq_retrigger, .irq_compose_msi_msg = imsic_irq_compose_msg, .flags = IRQCHIP_SKIP_SET_WAKE |
@@ -245,7 +247,7 @@ static bool imsic_init_dev_msi_info(struct device *dev,if (WARN_ON_ONCE (domain != real_parent))return false;#ifdef CONFIG_SMP - info->chip->irq_set_affinity = imsic_irq_set_affinity; + info->chip->irq_set_affinity = irq_chip_set_affinity_parent;#endif break ;default :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 352/626 media: test-drivers: vivid: dont call schedule in loop
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit e4740118b752005cbed339aec9a1d1c43620e0b9 ]
Artem reported that the CPU load was 100% when capturing from vivid at low resolution with ffmpeg.
This was caused by:
while (time_is_after_jiffies(cur_jiffies + wait_jiffies) &&
!kthread_should_stop())
schedule();If there are no other processes running that can be scheduled, then this is basically a busy-loop.
Change it to wait_event_interruptible_timeout() which doesn't have that problem.
--- drivers/media/test-drivers/vivid/vivid-kthread-cap.c | 11 ++++++++--- drivers/media/test-drivers/vivid/vivid-kthread-out.c | 11 ++++++++--- .../media/test-drivers/vivid/vivid-kthread-touch.c | 11 ++++++++--- drivers/media/test-drivers/vivid/vivid-sdr-cap.c | 11 ++++++++--- 4 files changed, 32 insertions(+), 12 deletions(-)
drivers/media/test-drivers/vivid/vivid-kthread-cap.c +8 -3
@@ -789,9 +789,14 @@ static int vivid_thread_vid_cap(void *data) next_jiffies_since_start = jiffies_since_start; wait_jiffies = next_jiffies_since_start - jiffies_since_start; -while (time_is_after_jiffies (cur_jiffies + wait_jiffies) && - !kthread_should_stop ()) -schedule (); +if (!time_is_after_jiffies (cur_jiffies + wait_jiffies)) +continue ; + +wait_queue_head_t wait; + +init_waitqueue_head (&wait); +wait_event_interruptible_timeout (wait,kthread_should_stop (), + cur_jiffies + wait_jiffies - jiffies); }dprintk (dev,1 ,"Video Capture Thread End\n" );return 0 ;
drivers/media/test-drivers/vivid/vivid-kthread-out.c +8 -3
@@ -235,9 +235,14 @@ static int vivid_thread_vid_out(void *data) next_jiffies_since_start = jiffies_since_start; wait_jiffies = next_jiffies_since_start - jiffies_since_start; -while (time_is_after_jiffies (cur_jiffies + wait_jiffies) && - !kthread_should_stop ()) -schedule (); +if (!time_is_after_jiffies (cur_jiffies + wait_jiffies)) +continue ; + +wait_queue_head_t wait; + +init_waitqueue_head (&wait); +wait_event_interruptible_timeout (wait,kthread_should_stop (), + cur_jiffies + wait_jiffies - jiffies); }dprintk (dev,1 ,"Video Output Thread End\n" );return 0 ;
drivers/media/test-drivers/vivid/vivid-kthread-touch.c +8 -3
@@ -135,9 +135,14 @@ static int vivid_thread_touch_cap(void *data) next_jiffies_since_start = jiffies_since_start; wait_jiffies = next_jiffies_since_start - jiffies_since_start; -while (time_is_after_jiffies (cur_jiffies + wait_jiffies) && - !kthread_should_stop ()) -schedule (); +if (!time_is_after_jiffies (cur_jiffies + wait_jiffies)) +continue ; + +wait_queue_head_t wait; + +init_waitqueue_head (&wait); +wait_event_interruptible_timeout (wait,kthread_should_stop (), + cur_jiffies + wait_jiffies - jiffies); }dprintk (dev,1 ,"Touch Capture Thread End\n" );return 0 ;
drivers/media/test-drivers/vivid/vivid-sdr-cap.c +8 -3
@@ -206,9 +206,14 @@ static int vivid_thread_sdr_cap(void *data) next_jiffies_since_start = jiffies_since_start; wait_jiffies = next_jiffies_since_start - jiffies_since_start; -while (time_is_after_jiffies (cur_jiffies + wait_jiffies) && - !kthread_should_stop ()) -schedule (); +if (!time_is_after_jiffies (cur_jiffies + wait_jiffies)) +continue ; + +wait_queue_head_t wait; + +init_waitqueue_head (&wait); +wait_event_interruptible_timeout (wait,kthread_should_stop (), + cur_jiffies + wait_jiffies - jiffies); }dprintk (dev,1 ,"SDR Capture Thread End\n" );return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 353/626 net/mlx5: Modify LSB bitmask in temperature event to include only the first bit
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shahar Shitrit <[email protected]>
[ Upstream commit 633f16d7e07c129a36b882c05379e01ce5bdb542 ]
In the sensor_count field of the MTEWE register, bits 1-62 are supported only for unmanaged switches, not for NICs, and bit 63 is reserved for internal use.
To prevent confusing output that may include set bits that are not relevant to NIC sensors, we update the bitmask to retain only the first bit, which corresponds to the sensor ASIC.
--- drivers/net/ethernet/mellanox/mlx5/core/events.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/events.c +4 -0
@@ -163,6 +163,10 @@ static int temp_warn(struct notifier_block *nb, unsigned long type, void *data)u64 value_msb; value_lsb =be64_to_cpu (eqe->data.temp_warning.sensor_warning_lsb); +/* bit 1-63 are not supported for NICs, +* hence read only bit 0 (asic) from lsb. +*/ + value_lsb &=0x1 ; value_msb =be64_to_cpu (eqe->data.temp_warning.sensor_warning_msb); mlx5_core_warn(events->dev,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 354/626 net/mlx5: Apply rate-limiting to high temperature warning
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shahar Shitrit <[email protected]>
[ Upstream commit 9dd3d5d258aceb37bdf09c8b91fa448f58ea81f0 ]
Wrap the high temperature warning in a temperature event with a call to net_ratelimit() to prevent flooding the kernel log with repeated warning messages when temperature exceeds the threshold multiple times within a short duration.
--- drivers/net/ethernet/mellanox/mlx5/core/events.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/events.c +4 -3
@@ -169,9 +169,10 @@ static int temp_warn(struct notifier_block *nb, unsigned long type, void *data) value_lsb &=0x1 ; value_msb =be64_to_cpu (eqe->data.temp_warning.sensor_warning_msb); -mlx5_core_warn (events->dev, -"High temperature on sensors with bit set %llx %llx" , - value_msb, value_lsb); +if (net_ratelimit ()) +mlx5_core_warn (events->dev, +"High temperature on sensors with bit set %llx %llx" , + value_msb, value_lsb);return NOTIFY_OK ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 355/626 firmware: arm_ffa: Reject higher major version as incompatible
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit efff6a7f16b34fd902f342b58bd8bafc2d6f2fd1 ]
When the firmware compatibility was handled previously in the commit 8e3f9da608f1 ("firmware: arm_ffa: Handle compatibility with different firmware versions"), we only addressed firmware versions that have higher minor versions compared to the driver version which is should be considered compatible unless the firmware returns NOT_SUPPORTED.
However, if the firmware reports higher major version than the driver supported, we need to reject it. If the firmware can work in a compatible mode with the driver requested version, it must return the same major version as requested.
Message-Id: <[email protected]>
--- drivers/firmware/arm_ffa/driver.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/firmware/arm_ffa/driver.c +8 -0
@@ -150,6 +150,14 @@ static int ffa_version_check(u32 *version)return -EOPNOTSUPP ; } +if (FFA_MAJOR_VERSION (ver.a0) >FFA_MAJOR_VERSION (FFA_DRIVER_VERSION )) { +pr_err ("Incompatible v%d.%d! Latest supported v%d.%d\n" , +FFA_MAJOR_VERSION (ver.a0),FFA_MINOR_VERSION (ver.a0), +FFA_MAJOR_VERSION (FFA_DRIVER_VERSION ), +FFA_MINOR_VERSION (FFA_DRIVER_VERSION )); +return -EINVAL ; + } +if (ver.a0 <FFA_MIN_VERSION ) { pr_err("Incompatible v%d.%d! Earliest supported v%d.%d\n", FFA_MAJOR_VERSION(ver.a0), FFA_MINOR_VERSION(ver.a0),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 356/626 firmware: arm_ffa: Handle the presence of host partition in the partition info
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudeep Holla <[email protected]>
[ Upstream commit 2f622a8b0722d332a2a149794a3add47bc9bdcf3 ]
Currently it is assumed that the firmware doesn't present the host partition in the list of partitions presented as part of the response to PARTITION_INFO_GET from the firmware. However, there are few platforms that prefer to present the same in the list of partitions. It is not manadatory but not restricted as well.
So handle the same by making sure to check the presence of the host VM ID in the XArray partition information maintained/managed in the driver before attempting to add it.
Message-Id: <[email protected]>
--- drivers/firmware/arm_ffa/driver.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/firmware/arm_ffa/driver.c +4 -0
@@ -1449,6 +1449,10 @@ static int ffa_setup_partitions(void)kfree (pbuf); +/* Check if the host is already added as part of partition info */ +if (xa_load (&drv_info->partition_info, drv_info->vm_id)) +return 0 ; +/* Allocate for the host */ info =kzalloc (sizeof (*info),GFP_KERNEL );if (!info) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 357/626 firmware: xilinx: Dont send linux address to get fpga config get status
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siva Durga Prasad Paladugu <[email protected]>
[ Upstream commit 5abc174016052caff1bcf4cedb159bd388411e98 ]
Fpga get config status just returns status through ret_payload and there is no need to allocate local buf and send its address through SMC args. Moreover, the address that is being passed till now is linux virtual address and is incorrect.
Corresponding modification has been done in the firmware to avoid using the address sent by linux.
--- drivers/firmware/xilinx/zynqmp.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/firmware/xilinx/zynqmp.c +1 -5
@@ -1012,17 +1012,13 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_fpga_get_status);int zynqmp_pm_fpga_get_config_status (u32 *value) {u32 ret_payload[PAYLOAD_ARG_CNT ]; -u32 buf, lower_addr, upper_addr;int ret;if (!value)return -EINVAL ; - lower_addr =lower_32_bits ((u64)&buf); - upper_addr =upper_32_bits ((u64)&buf); - ret =zynqmp_pm_invoke_fn (PM_FPGA_READ , ret_payload,4 , -XILINX_ZYNQMP_PM_FPGA_CONFIG_STAT_OFFSET , lower_addr, upper_addr, +XILINX_ZYNQMP_PM_FPGA_CONFIG_STAT_OFFSET ,0 ,0 ,XILINX_ZYNQMP_PM_FPGA_READ_CONFIG_REG ); *value = ret_payload[1 ];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 358/626 ASoC: ops: Enforce platform maximum on initial value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Povišer <[email protected]>
[ Upstream commit 783db6851c1821d8b983ffb12b99c279ff64f2ee ]
Lower the volume if it is violating the platform maximum at its initial value (i.e. at the time of the 'snd_soc_limit_volume' call).
--- sound/soc/soc-ops.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)
sound/soc/soc-ops.c +28 -1
@@ -639,6 +639,33 @@ int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol, }EXPORT_SYMBOL_GPL (snd_soc_get_volsw_range); +static int snd_soc_clip_to_platform_max (struct snd_kcontrol *kctl) +{ +struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; +struct snd_ctl_elem_value uctl; +int ret; + +if (!mc->platform_max) +return 0 ; + + ret = kctl->get (kctl, &uctl); +if (ret <0 ) +return ret; + +if (uctl.value.integer.value[0 ] > mc->platform_max) + uctl.value.integer.value[0 ] = mc->platform_max; + +if (snd_soc_volsw_is_stereo (mc) && + uctl.value.integer.value[1 ] > mc->platform_max) + uctl.value.integer.value[1 ] = mc->platform_max; + + ret = kctl->put (kctl, &uctl); +if (ret <0 ) +return ret; + +return 0 ; +} +/** * snd_soc_limit_volume - Set new limit to an existing volume control. *
@@ -663,7 +690,7 @@ int snd_soc_limit_volume(struct snd_soc_card *card,struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value;if (max <= mc->max - mc->min) { mc->platform_max = max; - ret =0 ; + ret =snd_soc_clip_to_platform_max (kctl); } }return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 359/626 ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit d64c4c3d1c578f98d70db1c5e2535b47adce9d07 ]
--- sound/soc/codecs/tas2764.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/tas2764.c +1 -0
@@ -634,6 +634,7 @@ static const struct reg_default tas2764_reg_defaults[] = { { TAS2764_TDM_CFG2, 0x0a }, { TAS2764_TDM_CFG3, 0x10 }, { TAS2764_TDM_CFG5, 0x42 }, + { TAS2764_INT_CLK_CFG, 0x19 }, }; static const struct regmap_range_cfg tas2764_regmap_ranges[] = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 360/626 ASoC: tas2764: Mark SW_RESET as volatile
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit f37f1748564ac51d32f7588bd7bfc99913ccab8e ]
Since the bit is self-clearing.
--- sound/soc/codecs/tas2764.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/tas2764.c +1 -0
@@ -652,6 +652,7 @@ static const struct regmap_range_cfg tas2764_regmap_ranges[] = {static bool tas2764_volatile_register (struct device *dev,unsigned int reg) {switch (reg) { +case TAS2764_SW_RST : case TAS2764_INT_LTCH0 ... TAS2764_INT_LTCH4:case TAS2764_INT_CLK_CFG :return true;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 361/626 ASoC: tas2764: Power up/down amp on mute ops
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit 1c3b5f37409682184669457a5bdf761268eafbe5 ]
The ASoC convention is that clocks are removed after codec mute, and power up/down is more about top level power management. For these chips, the "mute" state still expects a TDM clock, and yanking the clock in this state will trigger clock errors. So, do the full shutdown<->mute<->active transition on the mute operation, so the amp is in software shutdown by the time the clocks are removed.
This fixes TDM clock errors when streams are stopped.
--- sound/soc/codecs/tas2764.c | 51 ++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 30 deletions(-)
sound/soc/codecs/tas2764.c +21 -30
@@ -180,33 +180,6 @@ static SOC_ENUM_SINGLE_DECL(static const struct snd_kcontrol_new tas2764_asi1_mux =SOC_DAPM_ENUM ("ASI1 Source" , tas2764_ASI1_src_enum); -static int tas2764_dac_event (struct snd_soc_dapm_widget *w, -struct snd_kcontrol *kcontrol,int event) -{ -struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm); -struct tas2764_priv *tas2764 =snd_soc_component_get_drvdata (component); -int ret; - -switch (event) { -case SND_SOC_DAPM_POST_PMU : - tas2764->dac_powered = true; - ret =tas2764_update_pwr_ctrl (tas2764); -break ; -case SND_SOC_DAPM_PRE_PMD : - tas2764->dac_powered = false; - ret =tas2764_update_pwr_ctrl (tas2764); -break ; -default : -dev_err (tas2764->dev,"Unsupported event\n" ); -return -EINVAL ; - } - -if (ret <0 ) -return ret; - -return 0 ; -} -static const struct snd_kcontrol_new isense_switch =SOC_DAPM_SINGLE ("Switch" ,TAS2764_PWR_CTRL ,TAS2764_ISENSE_POWER_EN ,1 ,1 ); static const struct snd_kcontrol_new vsense_switch =
@@ -219,8 +192,7 @@ static const struct snd_soc_dapm_widget tas2764_dapm_widgets[] = { 1, &isense_switch),SND_SOC_DAPM_SWITCH ("VSENSE" ,TAS2764_PWR_CTRL ,TAS2764_VSENSE_POWER_EN ,1 , &vsense_switch), -SND_SOC_DAPM_DAC_E ("DAC" ,NULL ,SND_SOC_NOPM ,0 ,0 , tas2764_dac_event, -SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_PRE_PMD ), +SND_SOC_DAPM_DAC ("DAC" ,NULL ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_OUTPUT ("OUT" ),SND_SOC_DAPM_SIGGEN ("VMON" ),SND_SOC_DAPM_SIGGEN ("IMON" )
@@ -241,9 +213,28 @@ static int tas2764_mute(struct snd_soc_dai *dai, int mute, int direction) {struct tas2764_priv *tas2764 =snd_soc_component_get_drvdata (dai->component); +int ret; + +if (!mute) { + tas2764->dac_powered = true; + ret =tas2764_update_pwr_ctrl (tas2764); +if (ret) +return ret; + } tas2764->unmuted = !mute; -return tas2764_update_pwr_ctrl (tas2764); + ret =tas2764_update_pwr_ctrl (tas2764); +if (ret) +return ret; + +if (mute) { + tas2764->dac_powered = false; + ret =tas2764_update_pwr_ctrl (tas2764); +if (ret) +return ret; + } + +return 0 ; }static int tas2764_set_bitwidth (struct tas2764_priv *tas2764,int bitwidth)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 362/626 ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit 7f1186a8d738661b941b298fd6d1d5725ed71428 ]
snd_soc_dai_set_tdm_slot() calls .xlate_tdm_slot_mask() or snd_soc_xlate_tdm_slot_mask(), but didn't check its return value. Let's check it.
This patch might break existing driver. In such case, let's makes each func to void instead of int.
--- sound/soc/soc-dai.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/soc/soc-dai.c +5 -3
@@ -275,10 +275,11 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,if (dai->driver->ops && dai->driver->ops->xlate_tdm_slot_mask) - dai->driver->ops->xlate_tdm_slot_mask (slots, - &tx_mask, &rx_mask); + ret = dai->driver->ops->xlate_tdm_slot_mask (slots, &tx_mask, &rx_mask);else -snd_soc_xlate_tdm_slot_mask (slots, &tx_mask, &rx_mask); + ret =snd_soc_xlate_tdm_slot_mask (slots, &tx_mask, &rx_mask); +if (ret) + goto err;for_each_pcm_streams (stream)snd_soc_dai_tdm_mask_set (dai, stream, *tdm_mask[stream]);
@@ -287,6 +288,7 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, dai->driver->ops->set_tdm_slot) ret = dai->driver->ops->set_tdm_slot (dai, tx_mask, rx_mask, slots, slot_width); +err:return soc_dai_ret (dai, ret); }EXPORT_SYMBOL_GPL (snd_soc_dai_set_tdm_slot);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 363/626 pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Valentin Caron <[email protected]>
[ Upstream commit c98868e816209e568c9d72023ba0bc1e4d96e611 ]
Cross case in pinctrl framework make impossible to an hogged pin and another, not hogged, used within the same device-tree node. For example with this simplified device-tree :
&pinctrl {
pinctrl_pin_1: pinctrl-pin-1 {
pins = "dummy-pinctrl-pin";
};
};
&rtc {
pinctrl-names = "default"
pinctrl-0 = <&pinctrl_pin_1 &rtc_pin_1> rtc_pin_1: rtc-pin-1 {
pins = "dummy-rtc-pin";
};};
"pinctrl_pin_1" configuration is never set. This produces this path in the code:
really_probe()
pinctrl_bind_pins()
| devm_pinctrl_get()
| pinctrl_get()
| create_pinctrl()
| pinctrl_dt_to_map()
| // Hog pin create an abort for all pins of the node
| ret = dt_to_map_one_config()
| | /* Do not defer probing of hogs (circular loop) */
| | if (np_pctldev == p->dev->of_node)
| | return -ENODEV;
| if (ret)
| goto err
|
call_driver_probe()
stm32_rtc_probe()
pinctrl_enable()
pinctrl_claim_hogs()
create_pinctrl()
for_each_maps(maps_node, i, map)
// Not hog pin is skipped
if (pctldev && strcmp(dev_name(pctldev->dev),
map->ctrl_dev_name))
continue;At the first call of create_pinctrl() the hogged pin produces an abort to avoid a defer of hogged pins. All other pin configurations are trashed.
At the second call, create_pinctrl is now called with pctldev parameter to get hogs, but in this context only hogs are set. And other pins are skipped.
To handle this, do not produce an abort in the first call of create_pinctrl(). Classic pin configuration will be set in pinctrl_bind_pins() context. And the hogged pin configuration will be set in pinctrl_claim_hogs() context.
--- drivers/pinctrl/devicetree.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pinctrl/devicetree.c +8 -2
@@ -143,10 +143,14 @@ static int dt_to_map_one_config(struct pinctrl *p, pctldev =get_pinctrl_dev_from_of_node (np_pctldev);if (pctldev)break ; -/* Do not defer probing of hogs (circular loop) */ +/* +* Do not defer probing of hogs (circular loop) +* +* Return 1 to let the caller catch the case. +*/ if (np_pctldev == p->dev->of_node) {of_node_put (np_pctldev); -return -ENODEV ; +return 1 ; } }of_node_put (np_pctldev);
@@ -265,6 +269,8 @@ int pinctrl_dt_to_map(struct pinctrl *p, struct pinctrl_dev *pctldev) ret =dt_to_map_one_config (p, pctldev, statename, np_config);of_node_put (np_config); +if (ret ==1 ) +continue ;if (ret <0 ) goto err; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 364/626 smack: recognize ipv4 CIPSO w/o categories
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Andreev <[email protected]>
[ Upstream commit a158a937d864d0034fea14913c1f09c6d5f574b8 ]
If SMACK label has CIPSO representation w/o categories, e.g.:
| # cat /smack/cipso2 | foo 10 | @ 250/2 | ...
then SMACK does not recognize such CIPSO in input ipv4 packets and substitues '*' label instead. Audit records may look like
| lsm=SMACK fn=smack_socket_sock_rcv_skb action=denied
| subject="*" object="_" requested=w pid=0 comm="swapper/1" ...
This happens in two steps:
1) security/smack/smackfs.c`smk_set_cipso does not clear NETLBL_SECATTR_MLS_CAT
from (struct smack_known *)skp->smk_netlabel.flags on assigning CIPSO w/o categories:
| rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat); | skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl;
2) security/smack/smack_lsm.c`smack_from_secattr
can not match skp->smk_netlabel with input packet's struct netlbl_lsm_secattr *sap
because sap->flags have not NETLBL_SECATTR_MLS_CAT (what is correct) but skp->smk_netlabel.flags have (what is incorrect):
| if ((sap->flags & NETLBL_SECATTR_MLS_CAT) == 0) {
| if ((skp->smk_netlabel.flags &
| NETLBL_SECATTR_MLS_CAT) == 0)
| found = 1;
| break;
| }This commit sets/clears NETLBL_SECATTR_MLS_CAT in skp->smk_netlabel.flags according to the presense of CIPSO categories. The update of smk_netlabel is not atomic, so input packets processing still may be incorrect during short time while update proceeds.
--- security/smack/smackfs.c | 4 ++++ 1 file changed, 4 insertions(+)
security/smack/smackfs.c +4 -0
@@ -933,6 +933,10 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf,if (rc >=0 ) { old_cat = skp->smk_netlabel.attr.mls.cat;rcu_assign_pointer (skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat); +if (ncats.attr.mls.cat) + skp->smk_netlabel.flags |=NETLBL_SECATTR_MLS_CAT ; +else + skp->smk_netlabel.flags &= ~(u32 )NETLBL_SECATTR_MLS_CAT ; skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl;synchronize_rcu ();netlbl_catmap_free (old_cat);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 365/626 smack: Revert "smackfs: Added check catlen"
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Andreev <[email protected]>
[ Upstream commit c7fb50cecff9cad19fdac5b37337eae4e42b94c7 ]
This reverts commit ccfd889acb06eab10b98deb4b5eef0ec74157ea0
The indicated commit
* does not describe the problem that change tries to solve
* has programming issues
* introduces a bug: forever clears NETLBL_SECATTR_MLS_CAT
in (struct smack_known *)skp->smk_netlabel.flags
Reverting the commit to reapproach original problem
--- security/smack/smackfs.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
security/smack/smackfs.c +3 -14
@@ -830,7 +830,7 @@ static int smk_open_cipso(struct inode *inode, struct file *file)static ssize_t smk_set_cipso (struct file *file,const char __user *buf,size_t count,loff_t *ppos,int format) { -struct netlbl_lsm_catmap *old_cat, *new_cat =NULL ; +struct netlbl_lsm_catmap *old_cat;struct smack_known *skp;struct netlbl_lsm_secattr ncats;char mapcatset[SMK_CIPSOLEN ];
@@ -917,19 +917,8 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf,smack_catset_bit (cat, mapcatset); } - ncats.flags =0 ; -if (catlen ==0 ) { - ncats.attr.mls.cat =NULL ; - ncats.attr.mls.lvl = maplevel; - new_cat =netlbl_catmap_alloc (GFP_ATOMIC ); -if (new_cat) - new_cat->next = ncats.attr.mls.cat; - ncats.attr.mls.cat = new_cat; - skp->smk_netlabel.flags &= ~(1U <<3 ); - rc =0 ; - }else { - rc =smk_netlbl_mls (maplevel, mapcatset, &ncats,SMK_CIPSOLEN ); - } + + rc =smk_netlbl_mls (maplevel, mapcatset, &ncats,SMK_CIPSOLEN );if (rc >=0 ) { old_cat = skp->smk_netlabel.attr.mls.cat;rcu_assign_pointer (skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 366/626 kunit: tool: Use qboot on QEMU x86_64
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brendan Jackman <[email protected]>
[ Upstream commit 08fafac4c9f289a9d9a22d838921e4b3eb22c664 ]
As noted in [0], SeaBIOS (QEMU default) makes a mess of the terminal, qboot does not.
It turns out this is actually useful with kunit.py, since the user is exposed to this issue if they set --raw_output=all.
qboot is also faster than SeaBIOS, but it's is marginal for this usecase.
[0] https://lore.kernel.org/all/CA+i-1C0wYb-gZ8Mwh3WSVpbk-LF-Uo+njVbASJPe1WXDURoV7A@mail.gmail.com/
Both SeaBIOS and qboot are x86-specific.
--- tools/testing/kunit/qemu_configs/x86_64.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/testing/kunit/qemu_configs/x86_64.py +3 -1
@@ -7,4 +7,6 @@ CONFIG_SERIAL_8250_CONSOLE=y''', qemu_arch='x86_64', kernel_path='arch/x86/boot/bzImage', kernel_command_line='console=ttyS0', - extra_qemu_params=[]) + # qboot is faster than SeaBIOS and doesn't mess up + # the terminal. + extra_qemu_params=['-bios', 'qboot.rom'])
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 367/626 media: i2c: imx219: Correct the minimum vblanking value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Plowman <[email protected]>
[ Upstream commit e3b82d49bf676f3c873e642038765eac32ab6d39 ]
The datasheet for this sensor documents the minimum vblanking as being 32 lines. It does fix some problems with occasional black lines at the bottom of images (tested on Raspberry Pi).
--- drivers/media/i2c/imx219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/imx219.c +1 -1
@@ -74,7 +74,7 @@#define IMX219_REG_VTS CCI_REG16(0x0160)#define IMX219_VTS_MAX 0xffff -#define IMX219_VBLANK_MIN 4 +#define IMX219_VBLANK_MIN 32/* HBLANK control - read only */ #define IMX219_PPL_DEFAULT 3448
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 368/626 media: v4l: Memset argument to 0 before calling get_mbus_config pad op
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
[ Upstream commit 91d6a99acfa5ce9f95ede775074b80f7193bd717 ]
Memset the config argument to get_mbus_config V4L2 sub-device pad operation to zero before calling the operation. This ensures the callers don't need to bother with it nor the implementations need to set all fields that may not be relevant to them.
--- drivers/media/v4l2-core/v4l2-subdev.c | 2 ++ include/media/v4l2-subdev.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-subdev.c +2 -0
@@ -439,6 +439,8 @@ static int call_enum_dv_timings(struct v4l2_subdev *sd,static int call_get_mbus_config (struct v4l2_subdev *sd,unsigned int pad,struct v4l2_mbus_config *config) { +memset (config,0 ,sizeof (*config)); +return check_pad (sd, pad) ? : sd->ops->pad->get_mbus_config (sd, pad, config); }
include/media/v4l2-subdev.h +3 -1
@@ -821,7 +821,9 @@ struct v4l2_subdev_state {* possible configuration from the remote end, likely calling * this operation as close as possible to stream on time. The * operation shall fail if the pad index it has been called on -* is not valid or in case of unrecoverable failures. +* is not valid or in case of unrecoverable failures. The +* config argument has been memset to 0 just before calling +* the op. * * @set_routing: Enable or disable data connection routes described in the * subdevice routing table. Subdevs that implement this operation
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 369/626 net/mlx4_core: Avoid impossible mlx4_db_alloc() order value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 4a6f18f28627e121bd1f74b5fcc9f945d6dbeb1e ]
GCC can see that the value range for "order" is capped, but this leads it to consider that it might be negative, leading to a false positive warning (with GCC 15 with -Warray-bounds -fdiagnostics-details):
../drivers/net/ethernet/mellanox/mlx4/alloc.c:691:47: error: array subscript -1 is below array bounds of 'long unsigned int *[2]' [-Werror=array-bounds=]
691 | i = find_first_bit(pgdir->bits[o], MLX4_DB_PER_PAGE >> o);
| ~~~~~~~~~~~^~~
'mlx4_alloc_db_from_pgdir': events 1-2
691 | i = find_first_bit(pgdir->bits[o], MLX4_DB_PER_PAGE >> o); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| | | | | (2) out of array bounds here
| (1) when the condition is evaluated to true In file included from ../drivers/net/ethernet/mellanox/mlx4/mlx4.h:53,
from ../drivers/net/ethernet/mellanox/mlx4/alloc.c:42:../include/linux/mlx4/device.h:664:33: note: while referencing 'bits'
664 | unsigned long *bits[2];
| ^~~~
Switch the argument to unsigned int, which removes the compiler needing to consider negative values.
--- drivers/net/ethernet/mellanox/mlx4/alloc.c | 6 +++--- include/linux/mlx4/device.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx4/alloc.c +3 -3
@@ -682,9 +682,9 @@ static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device) }static int mlx4_alloc_db_from_pgdir (struct mlx4_db_pgdir *pgdir, -struct mlx4_db *db,int order) +struct mlx4_db *db,unsigned int order) { -int o; +unsigned int o;int i;for (o = order; o <=1 ; ++o) {
@@ -712,7 +712,7 @@ static int mlx4_alloc_db_from_pgdir(struct mlx4_db_pgdir *pgdir,return 0 ; } -int mlx4_db_alloc (struct mlx4_dev *dev,struct mlx4_db *db,int order) +int mlx4_db_alloc (struct mlx4_dev *dev,struct mlx4_db *db,unsigned int order) {struct mlx4_priv *priv =mlx4_priv (dev);struct mlx4_db_pgdir *pgdir;
include/linux/mlx4/device.h +1 -1
@@ -1135,7 +1135,7 @@ int mlx4_write_mtt(struct mlx4_dev *dev, struct mlx4_mtt *mtt,int mlx4_buf_write_mtt (struct mlx4_dev *dev,struct mlx4_mtt *mtt,struct mlx4_buf *buf); -int mlx4_db_alloc (struct mlx4_dev *dev,struct mlx4_db *db,int order); +int mlx4_db_alloc (struct mlx4_dev *dev,struct mlx4_db *db,unsigned int order);void mlx4_db_free (struct mlx4_dev *dev,struct mlx4_db *db); int mlx4_alloc_hwq_res(struct mlx4_dev *dev, struct mlx4_hwq_resources *wqres,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 370/626 drm/xe: Stop ignoring errors from xe_ttm_stolen_mgr_init()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas De Marchi <[email protected]>
[ Upstream commit ff57025c358603555f1e0ae0d50282a460433594 ]
Make sure to differentiate normal behavior, e.g. there's no stolen, from allocation errors or failure to initialize lower layers.
--- drivers/gpu/drm/xe/xe_device.c | 4 +++- drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 17 +++++++++-------- drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-)
drivers/gpu/drm/xe/xe_device.c +3 -1
@@ -694,7 +694,9 @@ int xe_device_probe(struct xe_device *xe) }/* Allocate and map stolen after potential VRAM resize */ -xe_ttm_stolen_mgr_init (xe); + err =xe_ttm_stolen_mgr_init (xe); +if (err) +return err;/* * Now that GT is initialized (TTM in particular),
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c +9 -8
@@ -201,17 +201,16 @@ static u64 detect_stolen(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr)#endif } -void xe_ttm_stolen_mgr_init (struct xe_device *xe) +int xe_ttm_stolen_mgr_init (struct xe_device *xe) { -struct xe_ttm_stolen_mgr *mgr =drmm_kzalloc (&xe->drm,sizeof (*mgr),GFP_KERNEL );struct pci_dev *pdev =to_pci_dev (xe->drm.dev); +struct xe_ttm_stolen_mgr *mgr;u64 stolen_size, io_size;int err; -if (!mgr) { -drm_dbg_kms (&xe->drm,"Stolen mgr init failed\n" ); -return ; - } + mgr =drmm_kzalloc (&xe->drm,sizeof (*mgr),GFP_KERNEL ); +if (!mgr) +return -ENOMEM ;if (IS_SRIOV_VF (xe)) stolen_size =0 ;
@@ -224,7 +223,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)if (!stolen_size) {drm_dbg_kms (&xe->drm,"No stolen memory support\n" ); -return ; +return 0 ; }/*
@@ -240,7 +239,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe) io_size, PAGE_SIZE);if (err) {drm_dbg_kms (&xe->drm,"Stolen mgr init failed: %i\n" , err); -return ; +return err; } drm_dbg_kms(&xe->drm, "Initialized stolen memory support with %llu bytes\n",
@@ -248,6 +247,8 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)if (io_size) mgr->mapping =devm_ioremap_wc (&pdev->dev, mgr->io_base, io_size); + +return 0 ; }u64 xe_ttm_stolen_io_offset (struct xe_bo *bo,u32 offset)
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.h +1 -1
@@ -12,7 +12,7 @@ struct ttm_resource;struct xe_bo ;struct xe_device ; -void xe_ttm_stolen_mgr_init (struct xe_device *xe); +int xe_ttm_stolen_mgr_init (struct xe_device *xe);int xe_ttm_stolen_io_mem_reserve (struct xe_device *xe,struct ttm_resource *mem);bool xe_ttm_stolen_cpu_access_needs_ggtt (struct xe_device *xe);u64 xe_ttm_stolen_io_offset (struct xe_bo *bo,u32 offset);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 371/626 drm/xe: Fix xe_tile_init_noalloc() error propagation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas De Marchi <[email protected]>
[ Upstream commit 0bcf41171c64234e79eb3552d00f0aad8a47e8d3 ]
Propagate the error to the caller so initialization properly stops if sysfs creation fails.
--- drivers/gpu/drm/xe/xe_tile.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_tile.c +1 -3
@@ -173,9 +173,7 @@ int xe_tile_init_noalloc(struct xe_tile *tile)xe_wa_apply_tile_workarounds (tile); - err =xe_tile_sysfs_init (tile); - -return 0 ; +return xe_tile_sysfs_init (tile); }void xe_tile_migrate_wait (struct xe_tile *tile)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 372/626 clk: qcom: ipq5018: allow it to be bulid on arm32
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karl Chan <[email protected]>
[ Upstream commit 5d02941c83997b58e8fc15390290c7c6975acaff ]
There are some ipq5018 based device's firmware only can able to boot arm32 but the clock driver dont allow it to be compiled on arm32. Therefore allow GCC for IPQ5018 to be selected when building ARM32 kernel
--- drivers/clk/qcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/Kconfig +1 -1
@@ -199,7 +199,7 @@ config IPQ_GCC_4019 config IPQ_GCC_5018 tristate "IPQ5018 Global Clock Controller" - depends on ARM64 || COMPILE_TEST + depends on ARM || ARM64 || COMPILE_TEST help Support for global clock controller on ipq5018 devices. Say Y if you want to use peripheral devices such as UART, SPI,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 373/626 clk: qcom: clk-alpha-pll: Do not use random stack value for recalc rate
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 7a243e1b814a02ab40793026ef64223155d86395 ]
If regmap_read() fails, random stack value was used in calculating new frequency in recalc_rate() callbacks. Such failure is really not expected as these are all MMIO reads, however code should be here correct and bail out. This also avoids possible warning on uninitialized value.
--- drivers/clk/qcom/clk-alpha-pll.c | 52 ++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 16 deletions(-)
drivers/clk/qcom/clk-alpha-pll.c +36 -16
@@ -670,14 +670,19 @@ clk_alpha_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)struct clk_alpha_pll *pll =to_clk_alpha_pll (hw);u32 alpha_width =pll_alpha_width (pll); -regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l); +if (regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l)) +return 0 ; + +if (regmap_read (pll->clkr.regmap,PLL_USER_CTL (pll), &ctl)) +return 0 ; -regmap_read (pll->clkr.regmap,PLL_USER_CTL (pll), &ctl);if (ctl &PLL_ALPHA_EN ) { -regmap_read (pll->clkr.regmap,PLL_ALPHA_VAL (pll), &low); +if (regmap_read (pll->clkr.regmap,PLL_ALPHA_VAL (pll), &low)) +return 0 ;if (alpha_width >32 ) { -regmap_read (pll->clkr.regmap,PLL_ALPHA_VAL_U (pll), - &high); +if (regmap_read (pll->clkr.regmap,PLL_ALPHA_VAL_U (pll), + &high)) +return 0 ; a = (u64 )high <<32 | low; }else { a = low &GENMASK (alpha_width -1 ,0 );
@@ -903,8 +908,11 @@ alpha_pll_huayra_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)struct clk_alpha_pll *pll =to_clk_alpha_pll (hw);u32 l, alpha =0 , ctl, alpha_m, alpha_n; -regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l); -regmap_read (pll->clkr.regmap,PLL_USER_CTL (pll), &ctl); +if (regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l)) +return 0 ; + +if (regmap_read (pll->clkr.regmap,PLL_USER_CTL (pll), &ctl)) +return 0 ;if (ctl &PLL_ALPHA_EN ) {regmap_read (pll->clkr.regmap,PLL_ALPHA_VAL (pll), &alpha);
@@ -1098,8 +1106,11 @@ clk_trion_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)struct clk_alpha_pll *pll =to_clk_alpha_pll (hw);u32 l, frac, alpha_width =pll_alpha_width (pll); -regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l); -regmap_read (pll->clkr.regmap,PLL_ALPHA_VAL (pll), &frac); +if (regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l)) +return 0 ; + +if (regmap_read (pll->clkr.regmap,PLL_ALPHA_VAL (pll), &frac)) +return 0 ;return alpha_pll_calc_rate (parent_rate, l, frac, alpha_width); }
@@ -1157,7 +1168,8 @@ clk_alpha_pll_postdiv_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)struct clk_alpha_pll_postdiv *pll =to_clk_alpha_pll_postdiv (hw);u32 ctl; -regmap_read (pll->clkr.regmap,PLL_USER_CTL (pll), &ctl); +if (regmap_read (pll->clkr.regmap,PLL_USER_CTL (pll), &ctl)) +return 0 ; ctl >>=PLL_POST_DIV_SHIFT ; ctl &=PLL_POST_DIV_MASK (pll);
@@ -1373,8 +1385,11 @@ static unsigned long alpha_pll_fabia_recalc_rate(struct clk_hw *hw,struct clk_alpha_pll *pll =to_clk_alpha_pll (hw);u32 l, frac, alpha_width =pll_alpha_width (pll); -regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l); -regmap_read (pll->clkr.regmap,PLL_FRAC (pll), &frac); +if (regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l)) +return 0 ; + +if (regmap_read (pll->clkr.regmap,PLL_FRAC (pll), &frac)) +return 0 ;return alpha_pll_calc_rate (parent_rate, l, frac, alpha_width); }
@@ -1524,7 +1539,8 @@ clk_trion_pll_postdiv_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)struct regmap *regmap = pll->clkr.regmap;u32 i, div =1 , val; -regmap_read (regmap,PLL_USER_CTL (pll), &val); +if (regmap_read (regmap,PLL_USER_CTL (pll), &val)) +return 0 ; val >>= pll->post_div_shift; val &=PLL_POST_DIV_MASK (pll);
@@ -2451,9 +2467,12 @@ static unsigned long alpha_pll_lucid_evo_recalc_rate(struct clk_hw *hw,struct regmap *regmap = pll->clkr.regmap;u32 l, frac; -regmap_read (regmap,PLL_L_VAL (pll), &l); +if (regmap_read (regmap,PLL_L_VAL (pll), &l)) +return 0 ; l &=LUCID_EVO_PLL_L_VAL_MASK ; -regmap_read (regmap,PLL_ALPHA_VAL (pll), &frac); + +if (regmap_read (regmap,PLL_ALPHA_VAL (pll), &frac)) +return 0 ;return alpha_pll_calc_rate (parent_rate, l, frac,pll_alpha_width (pll)); }
@@ -2528,7 +2547,8 @@ static unsigned long clk_rivian_evo_pll_recalc_rate(struct clk_hw *hw,struct clk_alpha_pll *pll =to_clk_alpha_pll (hw);u32 l; -regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l); +if (regmap_read (pll->clkr.regmap,PLL_L_VAL (pll), &l)) +return 0 ;return parent_rate * l; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 374/626 drm/xe/debugfs: fixed the return value of wedged_mode_set
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Wang <[email protected]>
[ Upstream commit 6884d2051011f4db9e2f0b85709c79a8ced13bd6 ]
It is generally expected that the write() function should return a positive value indicating the number of bytes written or a negative error code if an error occurs. Returning 0 is unusual and can lead to unexpected behavior.
When the user program writes the same value to wedged_mode twice in a row, a lockup will occur, because the value expected to be returned by the write() function inside the program should be equal to the actual written value instead of 0.
To reproduce the issue:
echo 1 > /sys/kernel/debug/dri/0/wedged_mode
echo 1 > /sys/kernel/debug/dri/0/wedged_mode <- lockup here
--- drivers/gpu/drm/xe/xe_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_debugfs.c +1 -1
@@ -147,7 +147,7 @@ static ssize_t wedged_mode_set(struct file *f, const char __user *ubuf,return -EINVAL ;if (xe->wedged.mode == wedged_mode) -return 0 ; +return size; xe->wedged.mode = wedged_mode;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 375/626 drm/xe/debugfs: Add missing xe_pm_runtime_put in wedge_mode_set
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuicheng Lin <[email protected]>
[ Upstream commit b31e668d3111b100d16fd7db8db335328ce8c6d5 ]
xe_pm_runtime_put is missed in the failure path.
--- drivers/gpu/drm/xe/xe_debugfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/xe/xe_debugfs.c +1 -0
@@ -156,6 +156,7 @@ static ssize_t wedged_mode_set(struct file *f, const char __user *ubuf, ret =xe_guc_ads_scheduler_policy_toggle_reset (>->uc.guc.ads);if (ret) {xe_gt_err (gt,"Failed to update GuC ADS scheduler policy. GuC may still cause engine reset even with wedged_mode=2\n" ); +xe_pm_runtime_put (xe);return -EIO ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 376/626 x86/ibt: Handle FineIBT in handle_cfi_failure()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit 882b86fd4e0d49bf91148dbadcdbece19ded40e6 ]
Sami reminded me that FineIBT failure does not hook into the regular CFI failure case, and as such CFI_PERMISSIVE does not work.
--- arch/x86/include/asm/cfi.h | 11 +++++++++++ arch/x86/kernel/alternative.c | 30 ++++++++++++++++++++++++++++++ arch/x86/kernel/cfi.c | 22 ++++++++++++++++++---- 3 files changed, 59 insertions(+), 4 deletions(-)
arch/x86/include/asm/cfi.h +11 -0
@@ -126,6 +126,17 @@ static inline int cfi_get_offset(void)extern u32 cfi_get_func_hash (void *func); +#ifdef CONFIG_FINEIBT +extern bool decode_fineibt_insn (struct pt_regs *regs,unsigned long *target,u32 *type); +#else +static inline bool +decode_fineibt_insn (struct pt_regs *regs,unsigned long *target,u32 *type) +{ +return false; +} + +#endif +#else static inline enum bug_trap_type handle_cfi_failure (struct pt_regs *regs) {
arch/x86/kernel/alternative.c +30 -0
@@ -1254,6 +1254,7 @@ asm( ".pushsection .rodata \n"" endbr64 \n" " subl $0x12345678, %r10d \n" " je fineibt_preamble_end \n" +"fineibt_preamble_ud2: \n" " ud2 \n" " nop \n" "fineibt_preamble_end: \n"
@@ -1261,9 +1262,11 @@ asm( ".pushsection .rodata \n" );extern u8 fineibt_preamble_start[]; +extern u8 fineibt_preamble_ud2[];extern u8 fineibt_preamble_end[];#define fineibt_preamble_size (fineibt_preamble_end - fineibt_preamble_start) +#define fineibt_preamble_ud2 (fineibt_preamble_ud2 - fineibt_preamble_start)#define fineibt_preamble_hash 7 asm( ".pushsection .rodata \n"
@@ -1568,6 +1571,33 @@ static void poison_cfi(void *addr) } } +/* +* regs->ip points to a UD2 instruction, return true and fill out target and +* type when this UD2 is from a FineIBT preamble. +* +* We check the preamble by checking for the ENDBR instruction relative to the +* UD2 instruction. +*/ +bool decode_fineibt_insn (struct pt_regs *regs,unsigned long *target,u32 *type) +{ +unsigned long addr = regs->ip - fineibt_preamble_ud2; +u32 endbr, hash; + +__get_kernel_nofault (&endbr, addr, u32, Efault); +if (endbr !=gen_endbr ()) +return false; + + *target = addr + fineibt_preamble_size; + +__get_kernel_nofault (&hash, addr + fineibt_preamble_hash, u32, Efault); + *type = (u32 )regs->r10 + hash; + +return true; + +Efault: +return false; +} +#else static void __apply_fineibt(s32 *start_retpoline, s32 *end_retpoline,
arch/x86/kernel/cfi.c +18 -4
@@ -70,11 +70,25 @@ enum bug_trap_type handle_cfi_failure(struct pt_regs *regs)unsigned long target;u32 type; -if (!is_cfi_trap (regs->ip)) -return BUG_TRAP_TYPE_NONE ; +switch (cfi_mode) { +case CFI_KCFI : +if (!is_cfi_trap (regs->ip)) +return BUG_TRAP_TYPE_NONE ; + +if (!decode_cfi_insn (regs, &target, &type)) +return report_cfi_failure_noaddr (regs, regs->ip); + +break ; -if (!decode_cfi_insn (regs, &target, &type)) -return report_cfi_failure_noaddr (regs, regs->ip); +case CFI_FINEIBT : +if (!decode_fineibt_insn (regs, &target, &type)) +return BUG_TRAP_TYPE_NONE ; + +break ; + +default : +return BUG_TRAP_TYPE_NONE ; + }return report_cfi_failure (regs, regs->ip, &target, type); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 377/626 x86/traps: Cleanup and robustify decode_bug()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit c20ad96c9a8f0aeaf4e4057730a22de2657ad0c2 ]
Notably, don't attempt to decode an immediate when MOD == 3.
Additionally have it return the instruction length, such that WARN like bugs can more reliably skip to the correct instruction.
--- arch/x86/include/asm/bug.h | 5 ++- arch/x86/include/asm/ibt.h | 4 +- arch/x86/kernel/traps.c | 82 ++++++++++++++++++++++++++++---------- 3 files changed, 65 insertions(+), 26 deletions(-)
arch/x86/include/asm/bug.h +3 -2
@@ -22,8 +22,9 @@#define SECOND_BYTE_OPCODE_UD2 0x0b#define BUG_NONE 0xffff -#define BUG_UD1 0xfffe -#define BUG_UD2 0xfffd +#define BUG_UD2 0xfffe +#define BUG_UD1 0xfffd +#define BUG_UD1_UBSAN 0xfffc#ifdef CONFIG_GENERIC_BUG
arch/x86/include/asm/ibt.h +2 -2
@@ -41,7 +41,7 @@ _ASM_PTR fname "\n\t" \".popsection\n\t" -static inline __attribute_const__ u32 gen_endbr(void) +static __always_inline __attribute_const__ u32 gen_endbr(void) {u32 endbr;
@@ -56,7 +56,7 @@ static inline __attribute_const__ u32 gen_endbr(void)return endbr; } -static inline __attribute_const__ u32 gen_endbr_poison(void) +static __always_inline __attribute_const__ u32 gen_endbr_poison(void) {/* * 4 byte NOP that isn't NOP4 (in fact it is OSP NOP3), such that it
arch/x86/kernel/traps.c +60 -22
119 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 378/626 sched: Reduce the default slice to avoid tasks getting an extra tick
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: zihan zhou <[email protected]>
[ Upstream commit 2ae891b826958b60919ea21c727f77bcd6ffcc2c ]
The old default value for slice is 0.75 msec * (1 + ilog(ncpus)) which means that we have a default slice of:
0.75 for 1 cpu
1.50 up to 3 cpus
2.25 up to 7 cpus
3.00 for 8 cpus and above.
For HZ=250 and HZ=100, because of the tick accuracy, the runtime of tasks is far higher than their slice.
For HZ=1000 with 8 cpus or more, the accuracy of tick is already satisfactory, but there is still an issue that tasks will get an extra tick because the tick often arrives a little faster than expected. In this case, the task can only wait until the next tick to consider that it has reached its deadline, and will run 1ms longer.
vruntime + sysctl_sched_base_slice = deadline
|-----------|-----------|-----------|-----------|
1ms 1ms 1ms 1ms
^ ^ ^ ^
tick1 tick2 tick3 tick4(nearly 4ms)There are two reasons for tick error: clockevent precision and the CONFIG_IRQ_TIME_ACCOUNTING/CONFIG_PARAVIRT_TIME_ACCOUNTING. with CONFIG_IRQ_TIME_ACCOUNTING every tick will be less than 1ms, but even without it, because of clockevent precision, tick still often less than 1ms.
In order to make scheduling more precise, we changed 0.75 to 0.70, Using 0.70 instead of 0.75 should not change much for other configs and would fix this issue:
0.70 for 1 cpu
1.40 up to 3 cpus
2.10 up to 7 cpus
2.8 for 8 cpus and above.
This does not guarantee that tasks can run the slice time accurately every time, but occasionally running an extra tick has little impact.
--- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/fair.c +3 -3
@@ -71,10 +71,10 @@ unsigned int sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_LOG;/* * Minimal preemption granularity for CPU-bound tasks: * -* (default: 0.75 msec * (1 + ilog(ncpus)), units: nanoseconds) +* (default: 0.70 msec * (1 + ilog(ncpus)), units: nanoseconds) */ -unsigned int sysctl_sched_base_slice =750000ULL ; -static unsigned int normalized_sysctl_sched_base_slice =750000ULL ; +unsigned int sysctl_sched_base_slice =700000ULL ; +static unsigned int normalized_sysctl_sched_base_slice =700000ULL ; const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 379/626 serial: sh-sci: Update the suspend/resume support
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 22a6984c5b5df8eab864d7f3e8b94d5a554d31ab ]
The Renesas RZ/G3S supports a power saving mode where power to most of the SoC components is turned off. When returning from this power saving mode, SoC components need to be re-configured.
The SCIFs on the Renesas RZ/G3S need to be re-configured as well when returning from this power saving mode. The sh-sci code already configures the SCIF clocks, power domain and registers by calling uart_resume_port() in sci_resume(). On suspend path the SCIF UART ports are suspended accordingly (by calling uart_suspend_port() in sci_suspend()). The only missing setting is the reset signal. For this assert/de-assert the reset signal on driver suspend/resume.
In case the no_console_suspend is specified by the user, the registers need to be saved on suspend path and restore on resume path. To do this the sci_console_save()/sci_console_restore() functions were added. There is no need to cache/restore the status or FIFO registers. Only the control registers. The registers that will be saved/restored on suspend/resume are specified by the struct sci_suspend_regs data structure.
--- drivers/tty/serial/sh-sci.c | 71 +++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-)
drivers/tty/serial/sh-sci.c +69 -2
@@ -104,6 +104,15 @@ struct plat_sci_reg {u8 offset, size; }; +struct sci_suspend_regs { +u16 scsmr; +u16 scscr; +u16 scfcr; +u16 scsptr; +u8 scbrr; +u8 semr; +}; +struct sci_port_params {const struct plat_sci_reg regs[SCIx_NR_REGS];unsigned int fifosize;
@@ -134,6 +143,8 @@ struct sci_port {struct dma_chan *chan_tx;struct dma_chan *chan_rx; +struct reset_control *rstc; +#ifdef CONFIG_SERIAL_SH_SCI_DMA struct dma_chan *chan_tx_saved;struct dma_chan *chan_rx_saved;
@@ -153,6 +164,7 @@ struct sci_port {int rx_trigger;struct timer_list rx_fifo_timer;int rx_fifo_timeout; +struct sci_suspend_regs suspend_regs;u16 hscif_tot;bool has_rtscts;
@@ -3384,6 +3396,7 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev, } sp = &sci_ports[id]; + sp->rstc = rstc; *dev_id = id; p->type =SCI_OF_TYPE (data);
@@ -3532,13 +3545,57 @@ static int sci_probe(struct platform_device *dev)return 0 ; } +static void sci_console_save (struct sci_port *s) +{ +struct sci_suspend_regs *regs = &s->suspend_regs; +struct uart_port *port = &s->port; + +if (sci_getreg (port,SCSMR )->size) + regs->scsmr =sci_serial_in (port,SCSMR ); +if (sci_getreg (port,SCSCR )->size) + regs->scscr =sci_serial_in (port,SCSCR ); +if (sci_getreg (port,SCFCR )->size) + regs->scfcr =sci_serial_in (port,SCFCR ); +if (sci_getreg (port,SCSPTR )->size) + regs->scsptr =sci_serial_in (port,SCSPTR ); +if (sci_getreg (port,SCBRR )->size) + regs->scbrr =sci_serial_in (port,SCBRR ); +if (sci_getreg (port,SEMR )->size) + regs->semr =sci_serial_in (port,SEMR ); +} + +static void sci_console_restore (struct sci_port *s) +{ +struct sci_suspend_regs *regs = &s->suspend_regs; +struct uart_port *port = &s->port; + +if (sci_getreg (port,SCSMR )->size) +sci_serial_out (port,SCSMR , regs->scsmr); +if (sci_getreg (port,SCSCR )->size) +sci_serial_out (port,SCSCR , regs->scscr); +if (sci_getreg (port,SCFCR )->size) +sci_serial_out (port,SCFCR , regs->scfcr); +if (sci_getreg (port,SCSPTR )->size) +sci_serial_out (port,SCSPTR , regs->scsptr); +if (sci_getreg (port,SCBRR )->size) +sci_serial_out (port,SCBRR , regs->scbrr); +if (sci_getreg (port,SEMR )->size) +sci_serial_out (port,SEMR , regs->semr); +} +static __maybe_unused int sci_suspend (struct device *dev) {struct sci_port *sport =dev_get_drvdata (dev); -if (sport) +if (sport) {uart_suspend_port (&sci_uart_driver, &sport->port); +if (!console_suspend_enabled &&uart_console (&sport->port)) +sci_console_save (sport); +else +return reset_control_assert (sport->rstc); + } +return 0 ; }
@@ -3546,8 +3603,18 @@ static __maybe_unused int sci_resume(struct device *dev) {struct sci_port *sport =dev_get_drvdata (dev); -if (sport) +if (sport) { +if (!console_suspend_enabled &&uart_console (&sport->port)) { +sci_console_restore (sport); + }else { +int ret =reset_control_deassert (sport->rstc); + +if (ret) +return ret; + } +uart_resume_port (&sci_uart_driver, &sport->port); + }return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 380/626 pinctrl: renesas: rzg2l: Add suspend/resume support for pull up/down
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit b2bd65fbb617353e3c46ba5206b3b030fa0f260c ]
The Renesas RZ/G3S supports a power-saving mode where power to most of the SoC components is lost, including the PIN controller. Save and restore the pull-up/pull-down register contents to ensure the functionality is preserved after a suspend/resume cycle.
--- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/pinctrl/renesas/pinctrl-rzg2l.c +18 -1
@@ -311,6 +311,7 @@ struct rzg2l_pinctrl_pin_settings {* @pmc: PMC registers cache * @pfc: PFC registers cache * @iolh: IOLH registers cache +* @pupd: PUPD registers cache * @ien: IEN registers cache * @sd_ch: SD_CH registers cache * @eth_poc: ET_POC registers cache
@@ -324,6 +325,7 @@ struct rzg2l_pinctrl_reg_cache {u32 *pfc;u32 *iolh[2 ];u32 *ien[2 ]; +u32 *pupd[2 ];u8 sd_ch[2 ];u8 eth_poc[2 ];u8 eth_mode;
@@ -2539,6 +2541,11 @@ static int rzg2l_pinctrl_reg_cache_alloc(struct rzg2l_pinctrl *pctrl)if (!cache->ien[i])return -ENOMEM ; + cache->pupd[i] =devm_kcalloc (pctrl->dev, nports,sizeof (*cache->pupd[i]), +GFP_KERNEL ); +if (!cache->pupd[i]) +return -ENOMEM ; +/* Allocate dedicated cache. */ dedicated_cache->iolh[i] = devm_kcalloc(pctrl->dev, n_dedicated_pins, sizeof(*dedicated_cache->iolh[i]),
@@ -2779,7 +2786,7 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspenstruct rzg2l_pinctrl_reg_cache *cache = pctrl->cache;for (u32 port =0 ; port < nports; port++) { -bool has_iolh, has_ien; +bool has_iolh, has_ien, has_pupd;u32 off, caps;u8 pincnt;u64 cfg;
@@ -2791,6 +2798,7 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspen caps =FIELD_GET (PIN_CFG_MASK , cfg); has_iolh = !!(caps & (PIN_CFG_IOLH_A |PIN_CFG_IOLH_B |PIN_CFG_IOLH_C )); has_ien = !!(caps &PIN_CFG_IEN ); + has_pupd = !!(caps &PIN_CFG_PUPD );if (suspend)RZG2L_PCTRL_REG_ACCESS32 (suspend, pctrl->base +PFC (off), cache->pfc[port]);
@@ -2809,6 +2817,15 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspen } } +if (has_pupd) { +RZG2L_PCTRL_REG_ACCESS32 (suspend, pctrl->base +PUPD (off), + cache->pupd[0 ][port]); +if (pincnt >=4 ) { +RZG2L_PCTRL_REG_ACCESS32 (suspend, pctrl->base +PUPD (off), + cache->pupd[1 ][port]); + } + } +RZG2L_PCTRL_REG_ACCESS16 (suspend, pctrl->base +PM (off), cache->pm[port]);RZG2L_PCTRL_REG_ACCESS8 (suspend, pctrl->base +P (off), cache->p[port]);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 381/626 phy: phy-rockchip-samsung-hdptx: Swap the definitions of LCPLL_REF and ROPLL_REF
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damon Ding <[email protected]>
[ Upstream commit 2947c8065e9efdd3b6434d2817dc8896234a3fc0 ]
According to the datasheet, setting the dig_clk_sel bit of CMN_REG(0097) to 1'b1 selects LCPLL as the reference clock, while setting it to 1'b0 selects the ROPLL.
--- drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +2 -2
@@ -94,8 +94,8 @@#define LCPLL_ALONE_MODE BIT(1)/* CMN_REG(0097) */ #define DIG_CLK_SEL BIT(1) -#define ROPLL_REF BIT(1) -#define LCPLL_REF 0 +#define LCPLL_REF BIT(1) +#define ROPLL_REF 0/* CMN_REG(0099) */ #define CMN_ROPLL_ALONE_MODE BIT(2)#define ROPLL_ALONE_MODE BIT(2)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 382/626 phy: core: dont require set_mode() callback for phy_get_mode() to work
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit d58c04e305afbaa9dda7969151f06c4efe2c98b0 ]
As reported by Damon Ding, the phy_get_mode() call doesn't work as expected unless the PHY driver has a .set_mode() call. This prompts PHY drivers to have empty stubs for .set_mode() for the sake of being able to get the mode.
Make .set_mode() callback truly optional and update PHY's mode even if it there is none.
--- drivers/phy/phy-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/phy/phy-core.c +4 -3
@@ -405,13 +405,14 @@ EXPORT_SYMBOL_GPL(phy_power_off);int phy_set_mode_ext (struct phy *phy,enum phy_mode mode,int submode) { -int ret; +int ret =0 ; -if (!phy || !phy->ops->set_mode) +if (!phy)return 0 ;mutex_lock (&phy->mutex); - ret = phy->ops->set_mode (phy, mode, submode); +if (phy->ops->set_mode) + ret = phy->ops->set_mode (phy, mode, submode);if (!ret) phy->attrs.mode = mode;mutex_unlock (&phy->mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 383/626 phy: exynos5-usbdrd: fix EDS distribution tuning (gs101)
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Draszik <[email protected]>
[ Upstream commit 21860f340ba76ee042e5431ff92537f89bc11476 ]
This code's intention is to configure lane0 and lane2 tunings, but for lane2 there is a typo and it ends up tuning something else.
Fix the typo, as it doesn't appear to make sense to apply different tunings for lane0 vs lane2.
The same typo appears to exist in the bootloader, hence we restore the original value in the typo'd registers as well. This can be removed once / if the bootloader is updated.
Note that this is incorrect in the downstream driver as well - the values had been copied from there.
--- drivers/phy/samsung/phy-exynos5-usbdrd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/phy/samsung/phy-exynos5-usbdrd.c +5 -2
@@ -1513,8 +1513,11 @@ static const struct exynos5_usbdrd_phy_tuning gs101_tunes_pipe3_preinit[] = {PHY_TUNING_ENTRY_PMA (0x09e0 ,-1 ,0x00 ),PHY_TUNING_ENTRY_PMA (0x09e4 ,-1 ,0x36 ),PHY_TUNING_ENTRY_PMA (0x1e7c ,-1 ,0x06 ), -PHY_TUNING_ENTRY_PMA (0x1e90 ,-1 ,0x00 ), -PHY_TUNING_ENTRY_PMA (0x1e94 ,-1 ,0x36 ), +PHY_TUNING_ENTRY_PMA (0x19e0 ,-1 ,0x00 ), +PHY_TUNING_ENTRY_PMA (0x19e4 ,-1 ,0x36 ), +/* fix bootloader bug */ +PHY_TUNING_ENTRY_PMA (0x1e90 ,-1 ,0x02 ), +PHY_TUNING_ENTRY_PMA (0x1e94 ,-1 ,0x0b ),/* improve LVCC */ PHY_TUNING_ENTRY_PMA (0x08f0 ,-1 ,0x30 ), PHY_TUNING_ENTRY_PMA(0x18f0, -1, 0x30),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 384/626 soundwire: amd: change the soundwire wake enable/disable sequence
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vijendar Mukunda <[email protected]>
[ Upstream commit dcc48a73eae7f791b1a6856ea1bcc4079282c88d ]
During runtime suspend scenario, SoundWire wake should be enabled and during system level suspend scenario SoundWire wake should be disabled.
Implement the SoundWire wake enable/disable sequence as per design flow for SoundWire poweroff mode.
--- drivers/soundwire/amd_manager.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/soundwire/amd_manager.c +2 -0
@@ -1110,6 +1110,7 @@ static int __maybe_unused amd_suspend(struct device *dev)amd_sdw_wake_enable (amd_manager, false);return amd_sdw_clock_stop (amd_manager); }else if (amd_manager->power_mode_mask &AMD_SDW_POWER_OFF_MODE ) { +amd_sdw_wake_enable (amd_manager, false);/* * As per hardware programming sequence on AMD platforms, * clock stop should be invoked first before powering-off
@@ -1137,6 +1138,7 @@ static int __maybe_unused amd_suspend_runtime(struct device *dev)amd_sdw_wake_enable (amd_manager, true);return amd_sdw_clock_stop (amd_manager); }else if (amd_manager->power_mode_mask &AMD_SDW_POWER_OFF_MODE ) { +amd_sdw_wake_enable (amd_manager, true); ret =amd_sdw_clock_stop (amd_manager);if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 385/626 soundwire: cadence_master: set frame shape and divider based on actual clk freq
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bard Liao <[email protected]>
[ Upstream commit e738d77f78b3ac085dfb51be414e93464abba7ec ]
Frame shape and curr_dr_freq could be updated by sdw_compute_bus_params(). Peripherals will set curr_dr_freq as their frequency. Managers should do the same. Then update frame shape according to the actual bus frequency.
--- drivers/soundwire/cadence_master.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/soundwire/cadence_master.c +19 -3
@@ -1341,7 +1341,7 @@ static u32 cdns_set_initial_frame_shape(int n_rows, int n_cols)return val; } -static void cdns_init_clock_ctrl (struct sdw_cdns *cdns) +static int cdns_init_clock_ctrl (struct sdw_cdns *cdns) {struct sdw_bus *bus = &cdns->bus;struct sdw_master_prop *prop = &bus->prop;
@@ -1355,14 +1355,25 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns) prop->default_row, prop->default_col); +if (!prop->default_frame_rate || !prop->default_row) { +dev_err (cdns->dev,"Default frame_rate %d or row %d is invalid\n" , + prop->default_frame_rate, prop->default_row); +return -EINVAL ; + } +/* Set clock divider */ - divider = (prop->mclk_freq / prop->max_clk_freq) -1 ; + divider = (prop->mclk_freq *SDW_DOUBLE_RATE_FACTOR / + bus->params.curr_dr_freq) -1 ;cdns_updatel (cdns,CDNS_MCP_CLK_CTRL0 ,CDNS_MCP_CLK_MCLKD_MASK , divider);cdns_updatel (cdns,CDNS_MCP_CLK_CTRL1 ,CDNS_MCP_CLK_MCLKD_MASK , divider); +/* Set frame shape base on the actual bus frequency. */ + prop->default_col = bus->params.curr_dr_freq / + prop->default_frame_rate / prop->default_row; +/* * Frame shape changes after initialization have to be done * with the bank switch mechanism
@@ -1375,6 +1386,8 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns) ssp_interval = prop->default_frame_rate /SDW_CADENCE_GSYNC_HZ ;cdns_writel (cdns,CDNS_MCP_SSP_CTRL0 , ssp_interval);cdns_writel (cdns,CDNS_MCP_SSP_CTRL1 , ssp_interval); + +return 0 ; }/**
@@ -1383,9 +1396,12 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)*/ int sdw_cdns_init (struct sdw_cdns *cdns) { +int ret;u32 val; -cdns_init_clock_ctrl (cdns); + ret =cdns_init_clock_ctrl (cdns); +if (ret) +return ret;sdw_cdns_check_self_clearing_bits (cdns, __func__, false,0 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 386/626 net: stmmac: dwmac-loongson: Set correct {tx,rx}_fifo_size
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
[ Upstream commit 8dbf0c7556454b52af91bae305ca71500c31495c ]
Now for dwmac-loongson {tx,rx}_fifo_size are uninitialised, which means zero. This means dwmac-loongson doesn't support changing MTU because in stmmac_change_mtu() it requires the fifo size be no less than MTU. Thus, set the correct tx_fifo_size and rx_fifo_size for it (16KB multiplied by queue counts).
Here {tx,rx}_fifo_size is initialised with the initial value (also the maximum value) of {tx,rx}_queues_to_use. So it will keep as 16KB if we don't change the queue count, and will be larger than 16KB if we change (decrease) the queue count. However stmmac_change_mtu() still work well with current logic (MTU cannot be larger than 16KB for stmmac).
Note: the Fixes tag picked here is the oldest commit and key commit of the dwmac-loongson series "stmmac: Add Loongson platform support".
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -0
@@ -590,6 +590,9 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idif (ret) goto err_disable_device; + plat->tx_fifo_size =SZ_16K * plat->tx_queues_to_use; + plat->rx_fifo_size =SZ_16K * plat->rx_queues_to_use; +if (dev_of_node (&pdev->dev)) ret =loongson_dwmac_dt_config (pdev, plat, &res);else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 387/626 drm/amdgpu/mes11: fix set_hw_resources_1 calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 1350dd3691b5f757a948e5b9895d62c422baeb90 ]
It's GPU page size not CPU page size. In most cases they are the same, but not always. This can lead to overallocation on systems with larger pages.
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +1 -1
@@ -690,7 +690,7 @@ static int mes_v11_0_set_hw_resources(struct amdgpu_mes *mes)static int mes_v11_0_set_hw_resources_1 (struct amdgpu_mes *mes) { -int size =128 *PAGE_SIZE ; +int size =128 *AMDGPU_GPU_PAGE_SIZE ;int ret =0 ;struct amdgpu_device *adev = mes->adev;union MESAPI_SET_HW_RESOURCES_1 mes_set_hw_res_pkt;
Signature · 1 line
2.39.5