korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-26 07:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor bug fixes for the IPMI driver

Browse Source 
There was a bug in the SSIF driver where in certain conditions it could
 stop working.
 
 Outside of that: spelling fixes, removing some dead code, re-adding a
 missing statistic increment, and removal of register_sysctl_table().
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/Q1c5nzg9ZpmiCaGYfOMkJGb/4EFAmRJaIgACgkQYfOMkJGb
 /4HevA/8CXY3MQ3cP3hTh52wTWc3zS6RJwxIlkKv2ByORvEDmMKjZfsCPJuH8/T0
 FSa2hA7vBXBnDu7MZPfPNWMxNcemLME3H+qeBcgWfS26M/vUcGLSVJdQi9ZJyb8b
 KqF4IXEYreNvjjqLWzx9PQIlrA1S1Ej8wKamQfPYuR4QhtywZ+4ZiHHSUxNT2+Ku
 0N81qCmTVPe2knHp8jw89iqqWwSlc3eYrf2hNdsWPgXH1Hu3eLoWmh2l9qnanTDb
 DyJfier9Y/ztGn11zRxbKTPyCcp07+NwnlV/411pnI7Try2NIu8uzVcVddzZa6JG
 TkACKmBW3qNW/4jAaycJQBbYjT0O1MR/ADmIjno10PJ6sy/4n9FUtsyNxRdEefjl
 pKH3TgBiwd9dYDl9OV+wmMGa2PC9jdga++oM6Bw/XLRw3N162HWEurTOo0Y6MsvE
 1VuAQt0jwjAARvEqCvqev57lTKrcyUPzUH614i0Q2pAs7gI3kjTALrlUiUNhwI79
 phpaTSx01pMCv33MyLRNEyT54CqjaZyye3S0UIN6vGJey0U1Qg5+4KWJ2zo6tTWM
 UQfSYa488y1solehMlYzWmMOXvgNnRQ5Ok8oPwxokH45mkkyl6p5/q8doogkMERv
 yW5ZPXve9R1JF4dQZCMO8mdyC5tRiy/cebuAeR8q3Vfdk/ejARo=
 =ZavT
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-6.4-1' of https://github.com/cminyard/linux-ipmi

Pull IPMI updates from Corey Minyard:
 "Minor bug fixes for the IPMI driver

  There was a bug in the SSIF driver where in certain conditions it
  could stop working.

  Outside of that: spelling fixes, removing some dead code, re-adding a
  missing statistic increment, and removal of register_sysctl_table()"

* tag 'for-linus-6.4-1' of https://github.com/cminyard/linux-ipmi:
  ipmi:ssif: Drop if blocks with always false condition
  ipmi: fix SSIF not responding under certain cond.
  ipmi:ssif: Add send_retries increment
  char:ipmi:Fix spelling mistake "asychronously" -> "asynchronously"
  ipmi: simplify sysctl registration
  ipmi: ASPEED_BT_IPMI_BMC: select REGMAP_MMIO instead of depending on it
This commit is contained in:
Linus Torvalds 2023-04-27 11:07:18 -07:00
commit d91f6a7307
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/ipmi/Kconfig
View File

@ -162,7 +162,8 @@ config IPMI_KCS_BMC_SERIO
config ASPEED_BT_IPMI_BMC
depends on ARCH_ASPEED || COMPILE_TEST
depends on REGMAP && REGMAP_MMIO && MFD_SYSCON
depends on MFD_SYSCON
select REGMAP_MMIO
tristate "BT IPMI bmc driver"
help
Provides a driver for the BT (Block Transfer) IPMI interface

16
drivers/char/ipmi/ipmi_poweroff.c
View File

@ -659,20 +659,6 @@ static struct ctl_table ipmi_table[] = {
{ }
};
static struct ctl_table ipmi_dir_table[] = {
{ .procname = "ipmi",
.mode = 0555,
.child = ipmi_table },
{ }
};
static struct ctl_table ipmi_root_table[] = {
{ .procname = "dev",
.mode = 0555,
.child = ipmi_dir_table },
{ }
};
static struct ctl_table_header *ipmi_table_header;
#endif /* CONFIG_PROC_FS */
@ -689,7 +675,7 @@ static int __init ipmi_poweroff_init(void)
pr_info("Power cycle is enabled\n");
#ifdef CONFIG_PROC_FS
ipmi_table_header = register_sysctl_table(ipmi_root_table);
ipmi_table_header = register_sysctl("dev/ipmi", ipmi_table);
if (!ipmi_table_header) {
pr_err("Unable to register powercycle sysctl\n");
rv = -ENOMEM;

16
drivers/char/ipmi/ipmi_ssif.c
View File

@ -557,8 +557,10 @@ static void retry_timeout(struct timer_list *t)
if (waiting)
start_get(ssif_info);
if (resend)
if (resend) {
start_resend(ssif_info);
ssif_inc_stat(ssif_info, send_retries);
}
}
static void watch_timeout(struct timer_list *t)
@ -784,9 +786,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
} else if (data[0] != (IPMI_NETFN_APP_REQUEST | 1) << 2
|| data[1] != IPMI_GET_MSG_FLAGS_CMD) {
/*
* Don't abort here, maybe it was a queued
* response to a previous command.
* Recv error response, give up.
*/
ssif_info->ssif_state = SSIF_IDLE;
ipmi_ssif_unlock_cond(ssif_info, flags);
dev_warn(&ssif_info->client->dev,
"Invalid response getting flags: %x %x\n",
@ -1279,11 +1281,8 @@ static void ssif_remove(struct i2c_client *client)
struct ssif_info *ssif_info = i2c_get_clientdata(client);
struct ssif_addr_info *addr_info;
if (!ssif_info)
return;
/*
* After this point, we won't deliver anything asychronously
* After this point, we won't deliver anything asynchronously
* to the message handler. We can unregister ourself.
*/
ipmi_unregister_smi(ssif_info->intf);
@ -2071,9 +2070,6 @@ static int ssif_platform_remove(struct platform_device *dev)
{
struct ssif_addr_info *addr_info = dev_get_drvdata(&dev->dev);
if (!addr_info)
return 0;
mutex_lock(&ssif_infos_mutex);
list_del(&addr_info->link);
kfree(addr_info);