Skip to content

Commit 64c80c9

Browse files
committed
Merge tag 'scmi-fixes-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
Arm SCMI fixes for v6.9 Couple of fixes to address wrong fastchannel initialization in powercap protocol and disable seeking support for SCMI raw debugfs entries. * tag 'scmi-fixes-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: firmware: arm_scmi: Make raw debugfs entries non-seekable firmware: arm_scmi: Fix wrong fastchannel initialization Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7d177ae + b70c799 commit 64c80c9

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

drivers/firmware/arm_scmi/powercap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ static void scmi_powercap_domain_init_fc(const struct scmi_protocol_handle *ph,
736736
ph->hops->fastchannel_init(ph, POWERCAP_DESCRIBE_FASTCHANNEL,
737737
POWERCAP_PAI_GET, 4, domain,
738738
&fc[POWERCAP_FC_PAI].get_addr, NULL,
739-
&fc[POWERCAP_PAI_GET].rate_limit);
739+
&fc[POWERCAP_FC_PAI].rate_limit);
740740

741741
*p_fc = fc;
742742
}

drivers/firmware/arm_scmi/raw_mode.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ static int scmi_dbg_raw_mode_open(struct inode *inode, struct file *filp)
921921
rd->raw = raw;
922922
filp->private_data = rd;
923923

924-
return 0;
924+
return nonseekable_open(inode, filp);
925925
}
926926

927927
static int scmi_dbg_raw_mode_release(struct inode *inode, struct file *filp)
@@ -950,6 +950,7 @@ static const struct file_operations scmi_dbg_raw_mode_reset_fops = {
950950
.open = scmi_dbg_raw_mode_open,
951951
.release = scmi_dbg_raw_mode_release,
952952
.write = scmi_dbg_raw_mode_reset_write,
953+
.llseek = no_llseek,
953954
.owner = THIS_MODULE,
954955
};
955956

@@ -959,6 +960,7 @@ static const struct file_operations scmi_dbg_raw_mode_message_fops = {
959960
.read = scmi_dbg_raw_mode_message_read,
960961
.write = scmi_dbg_raw_mode_message_write,
961962
.poll = scmi_dbg_raw_mode_message_poll,
963+
.llseek = no_llseek,
962964
.owner = THIS_MODULE,
963965
};
964966

@@ -975,6 +977,7 @@ static const struct file_operations scmi_dbg_raw_mode_message_async_fops = {
975977
.read = scmi_dbg_raw_mode_message_read,
976978
.write = scmi_dbg_raw_mode_message_async_write,
977979
.poll = scmi_dbg_raw_mode_message_poll,
980+
.llseek = no_llseek,
978981
.owner = THIS_MODULE,
979982
};
980983

@@ -998,6 +1001,7 @@ static const struct file_operations scmi_dbg_raw_mode_notification_fops = {
9981001
.release = scmi_dbg_raw_mode_release,
9991002
.read = scmi_test_dbg_raw_mode_notif_read,
10001003
.poll = scmi_test_dbg_raw_mode_notif_poll,
1004+
.llseek = no_llseek,
10011005
.owner = THIS_MODULE,
10021006
};
10031007

@@ -1021,6 +1025,7 @@ static const struct file_operations scmi_dbg_raw_mode_errors_fops = {
10211025
.release = scmi_dbg_raw_mode_release,
10221026
.read = scmi_test_dbg_raw_mode_errors_read,
10231027
.poll = scmi_test_dbg_raw_mode_errors_poll,
1028+
.llseek = no_llseek,
10241029
.owner = THIS_MODULE,
10251030
};
10261031

0 commit comments

Comments
 (0)