openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor cleanups to the IPMI driver for 5.9 

Nothing of any major consequence.  Duplicate code, some missing \n's in
 sysfs files, some documentation and comment changes.
 
 -corey
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/Q1c5nzg9ZpmiCaGYfOMkJGb/4EFAl8um4MACgkQYfOMkJGb
 /4HGRw/7BMvFWb7n90R2ncF/vv0G9OTo7R7L06wzxCgB+yKsQVud6F868v31qOYW
 7nTuYucnZZkZAb0aBlmKE1ZOKeF65q7M3fB/VrdZDHyKkgBQHzUNSm+VVZ6S6p1p
 xYdzisAeKacV/RXlC0IXdFOvZQ7tgPwRDrN3kacu4+xfboQBDIk96xDjPRMqg5Vm
 DzVx9ReGtD+lgloZfVQlkAFhz2JDJLaW+k77sNpxiuvLJy5DrBMldt7/44hIxaXY
 GQ/H8Zq+zF+25M3lVNMHFSnZ+PADq182AvehPvnqEL+vnOJJ2eOSkIoruC4VlgPG
 Du7a63GWZySj1r2IiV2UzigFHE0EkIWv7Yk5g6O1fpENM+BLuwE4WX3xXpXLy5xg
 L9EOJfRlhP8tNJTXg+HlRFtJEp0DejxFN7R4CDHbirVokesjo/raKcTGxNflFDjE
 WuZoGwzzlnkbbuZvOVSjv+XAC+AgE6hiMTR6WxOhTgdof6z3QDNK7Eu5qr8tWAj2
 LJL0UEACJpwSa48RpkUHxoXKtq66c8tg+H/Bfcbef8OXtFmXrUekuEFLp7iimIre
 Zd7fEdOyDlkroy/XCEL8LeLMWVmWASZb1s62A/wJawXV7YxpkQ7ye/VXqSw6ukFG
 +PjT/be4LO2xPiFxWZgnG2wKODF/9Kqq5uj/TH0DTyCrp95D0L4=
 =TmGm
 -----END PGP SIGNATURE-----

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

Pull IPMI updates from Corey Minyard:
 "Minor cleanups to the IPMI driver for 5.9

  Nothing of any major consequence. Duplicate code, some missing \n's in
  sysfs files, some documentation and comment changes"

* tag 'for-linus-5.9-1' of git://github.com/cminyard/linux-ipmi:
  ipmi/watchdog: add missing newlines when printing parameters by sysfs
  ipmi: remve duplicate code in __ipmi_bmc_register()
  ipmi: ssif: Remove finished TODO comment about SMBus alert
  Doc: driver-api: ipmi: Add description of alerts_broken module param
This commit is contained in:
Linus Torvalds 2020-08-08 09:32:18 -07:00
parent 449dc8c970 634b06def1
commit 11030fe96b
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/driver-api/ipmi.rst
View File

@ -516,6 +516,7 @@ at module load time (for a module) with::
slave_addrs=<addr1>,<addr2>,... slave_addrs=<addr1>,<addr2>,...
tryacpi=[0|1] trydmi=[0|1] tryacpi=[0|1] trydmi=[0|1]
[dbg_probe=1] [dbg_probe=1]
alerts_broken
The addresses are normal I2C addresses. The adapter is the string The addresses are normal I2C addresses. The adapter is the string
name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name. name of the adapter, as shown in /sys/class/i2c-adapter/i2c-<n>/name.
@ -537,6 +538,9 @@ The slave_addrs specifies the IPMI address of the local BMC. This is
usually 0x20 and the driver defaults to that, but in case it's not, it usually 0x20 and the driver defaults to that, but in case it's not, it
can be specified when the driver starts up. can be specified when the driver starts up.
alerts_broken does not enable SMBus alert for SSIF. Otherwise SMBus
alert will be enabled on supported hardware.
Discovering the IPMI compliant BMC on the SMBus can cause devices on Discovering the IPMI compliant BMC on the SMBus can cause devices on
the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI
message as a block write to the I2C bus and waits for a response. message as a block write to the I2C bus and waits for a response.

2
drivers/char/ipmi/ipmi_msghandler.c
View File

@ -3080,8 +3080,6 @@ static int __ipmi_bmc_register(struct ipmi_smi *intf,
rv = sysfs_create_link(&bmc->pdev.dev.kobj, &intf->si_dev->kobj, rv = sysfs_create_link(&bmc->pdev.dev.kobj, &intf->si_dev->kobj,
intf->my_dev_name); intf->my_dev_name);
if (rv) { if (rv) {
kfree(intf->my_dev_name);
intf->my_dev_name = NULL;
dev_err(intf->si_dev, "Unable to create symlink to bmc: %d\n", dev_err(intf->si_dev, "Unable to create symlink to bmc: %d\n",
rv); rv);
goto out_free_my_dev_name; goto out_free_my_dev_name;

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

@ -22,11 +22,6 @@
* and drives the real SSIF state machine. * and drives the real SSIF state machine.
*/ */
/*
* TODO: Figure out how to use SMB alerts. This will require a new
* interface into the I2C driver, I believe.
*/
#define pr_fmt(fmt) "ipmi_ssif: " fmt #define pr_fmt(fmt) "ipmi_ssif: " fmt
#define dev_fmt(fmt) "ipmi_ssif: " fmt #define dev_fmt(fmt) "ipmi_ssif: " fmt

9
drivers/char/ipmi/ipmi_watchdog.c
View File

@ -232,12 +232,17 @@ static int set_param_str(const char *val, const struct kernel_param *kp)
static int get_param_str(char *buffer, const struct kernel_param *kp) static int get_param_str(char *buffer, const struct kernel_param *kp)
{ {
action_fn fn = (action_fn) kp->arg; action_fn fn = (action_fn) kp->arg;
int rv; int rv, len;
rv = fn(NULL, buffer); rv = fn(NULL, buffer);
if (rv) if (rv)
return rv; return rv;
return strlen(buffer);
len = strlen(buffer);
buffer[len++] = '\n';
buffer[len] = 0;
return len;
} }