Unverified Commit 64c80c99 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'scmi-fixes-6.9' of... 

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/20240404140306.450330-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7d177ae1 b70c7996

drivers/firmware/arm_scmi/powercap.c

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static void scmi_powercap_domain_init_fc(const struct scmi_protocol_handle *ph, 
	ph->hops->fastchannel_init(ph, POWERCAP_DESCRIBE_FASTCHANNEL,

				   POWERCAP_PAI_GET, 4, domain,

				   &fc[POWERCAP_FC_PAI].get_addr, NULL,

				   &fc[POWERCAP_PAI_GET].rate_limit);

				   &fc[POWERCAP_FC_PAI].rate_limit);



	*p_fc = fc;

}

drivers/firmware/arm_scmi/raw_mode.c

+6 −1
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ static int scmi_dbg_raw_mode_open(struct inode *inode, struct file *filp) 
	rd->raw = raw;

	filp->private_data = rd;



	return 0;

	return nonseekable_open(inode, filp);

}



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 = { 
	.open = scmi_dbg_raw_mode_open,

	.release = scmi_dbg_raw_mode_release,

	.write = scmi_dbg_raw_mode_reset_write,

	.llseek = no_llseek,

	.owner = THIS_MODULE,

};
@@ -959,6 +960,7 @@ static const struct file_operations scmi_dbg_raw_mode_message_fops = { 
	.read = scmi_dbg_raw_mode_message_read,

	.write = scmi_dbg_raw_mode_message_write,

	.poll = scmi_dbg_raw_mode_message_poll,

	.llseek = no_llseek,

	.owner = THIS_MODULE,

};
@@ -975,6 +977,7 @@ static const struct file_operations scmi_dbg_raw_mode_message_async_fops = { 
	.read = scmi_dbg_raw_mode_message_read,

	.write = scmi_dbg_raw_mode_message_async_write,

	.poll = scmi_dbg_raw_mode_message_poll,

	.llseek = no_llseek,

	.owner = THIS_MODULE,

};
@@ -998,6 +1001,7 @@ static const struct file_operations scmi_dbg_raw_mode_notification_fops = { 
	.release = scmi_dbg_raw_mode_release,

	.read = scmi_test_dbg_raw_mode_notif_read,

	.poll = scmi_test_dbg_raw_mode_notif_poll,

	.llseek = no_llseek,

	.owner = THIS_MODULE,

};
@@ -1021,6 +1025,7 @@ static const struct file_operations scmi_dbg_raw_mode_errors_fops = { 
	.release = scmi_dbg_raw_mode_release,

	.read = scmi_test_dbg_raw_mode_errors_read,

	.poll = scmi_test_dbg_raw_mode_errors_poll,

	.llseek = no_llseek,

	.owner = THIS_MODULE,

};