Commit 52d543b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IPMI updates from Corey Minyard:

 - Little fixes for various things people have noticed.

 - One enhancement, the IPMI over IPMB (I2c) is modified to allow it to
   take a separate sender and receiver device. The Raspberry Pi has an
   I2C slave device that cannot send.

* tag 'for-linus-5.17-1' of https://github.com/cminyard/linux-ipmi:
  ipmi: initialize len variable
  ipmi: kcs: aspeed: Remove old bindings support
  ipmi:ipmb: Add the ability to have a separate slave and master device
  ipmi:ipmi_ipmb: Unregister the SMI on remove
  ipmi: kcs: aspeed: Add AST2600 compatible string
  ipmi: ssif: replace strlcpy with strscpy
  ipmi/watchdog: Constify ident
  ipmi: Add the git repository to the MAINTAINERS file
parents a452c4eb 8d10ea15

Documentation/devicetree/bindings/ipmi/ipmi-ipmb.yaml

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    description: Number of retries before a failure is declared.  Defaults to 1.



  slave-dev:

    $ref: /schemas/types.yaml#/definitions/phandle

    description: |

      The slave i2c device.  If not present, the main device is used. This

      lets you use two devices on the IPMB, one for master and one for slave,

      in case you have a slave device that can only be a slave.  The slave

      will receive messages and the master will transmit.



required:

  - compatible

  - reg

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10171,6 +10171,7 @@ M: Corey Minyard <minyard@acm.org> 
L:	openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)

S:	Supported

W:	http://openipmi.sourceforge.net/

T:	git https://github.com/cminyard/linux-ipmi.git for-next

F:	Documentation/driver-api/ipmi.rst

F:	Documentation/devicetree/bindings/ipmi/

F:	drivers/char/ipmi/

drivers/char/ipmi/ipmi_ipmb.c

+51 −9
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ MODULE_PARM_DESC(max_retries, "Max resends of a command before timing out."); 
struct ipmi_ipmb_dev {

	struct ipmi_smi *intf;

	struct i2c_client *client;

	struct i2c_client *slave;



	struct ipmi_smi_handlers handlers;
@@ -257,7 +258,7 @@ static void ipmi_ipmb_format_for_xmit(struct ipmi_ipmb_dev *iidev, 
		memcpy(iidev->xmitmsg + 5, msg->data + 1, msg->data_size - 1);

		iidev->xmitlen = msg->data_size + 4;

	}

	iidev->xmitmsg[3] = iidev->client->addr << 1;

	iidev->xmitmsg[3] = iidev->slave->addr << 1;

	if (((msg->data[0] >> 2) & 1) == 0)

		/* If it's a command, put in our own sequence number. */

		iidev->xmitmsg[4] = ((iidev->xmitmsg[4] & 0x03) |
@@ -427,12 +428,17 @@ static int ipmi_ipmb_remove(struct i2c_client *client) 
{

	struct ipmi_ipmb_dev *iidev = i2c_get_clientdata(client);



	if (iidev->client) {

		iidev->client = NULL;

		i2c_slave_unregister(client);

	if (iidev->slave) {

		i2c_slave_unregister(iidev->slave);

		if (iidev->slave != iidev->client)

			i2c_unregister_device(iidev->slave);

	}

	iidev->slave = NULL;

	iidev->client = NULL;

	ipmi_ipmb_stop_thread(iidev);



	ipmi_unregister_smi(iidev->intf);



	return 0;

}
@@ -441,6 +447,9 @@ static int ipmi_ipmb_probe(struct i2c_client *client, 
{

	struct device *dev = &client->dev;

	struct ipmi_ipmb_dev *iidev;

	struct device_node *slave_np;

	struct i2c_adapter *slave_adap = NULL;

	struct i2c_client *slave = NULL;

	int rv;



	iidev = devm_kzalloc(&client->dev, sizeof(*iidev), GFP_KERNEL);
@@ -464,14 +473,45 @@ static int ipmi_ipmb_probe(struct i2c_client *client, 
				 &iidev->max_retries) != 0)

		iidev->max_retries = max_retries;



	i2c_set_clientdata(client, iidev);

	client->flags |= I2C_CLIENT_SLAVE;

	slave_np = of_parse_phandle(dev->of_node, "slave-dev", 0);

	if (slave_np) {

		slave_adap = of_get_i2c_adapter_by_node(slave_np);

		if (!slave_adap) {

			dev_notice(&client->dev,

				   "Could not find slave adapter\n");

			return -EINVAL;

		}

	}



	rv = i2c_slave_register(client, ipmi_ipmb_slave_cb);

	if (rv)

	iidev->client = client;



	if (slave_adap) {

		struct i2c_board_info binfo;



		memset(&binfo, 0, sizeof(binfo));

		strscpy(binfo.type, "ipmb-slave", I2C_NAME_SIZE);

		binfo.addr = client->addr;

		binfo.flags = I2C_CLIENT_SLAVE;

		slave = i2c_new_client_device(slave_adap, &binfo);

		i2c_put_adapter(slave_adap);

		if (IS_ERR(slave)) {

			rv = PTR_ERR(slave);

			dev_notice(&client->dev,

				   "Could not allocate slave device: %d\n", rv);

			return rv;

		}

		i2c_set_clientdata(slave, iidev);

	} else {

		slave = client;

	}

	i2c_set_clientdata(client, iidev);

	slave->flags |= I2C_CLIENT_SLAVE;



	iidev->client = client;

	rv = i2c_slave_register(slave, ipmi_ipmb_slave_cb);

	if (rv)

		goto out_err;

	iidev->slave = slave;

	slave = NULL;



	iidev->handlers.flags = IPMI_SMI_CAN_HANDLE_IPMB_DIRECT;

	iidev->handlers.start_processing = ipmi_ipmb_start_processing;
@@ -502,6 +542,8 @@ static int ipmi_ipmb_probe(struct i2c_client *client, 
	return 0;



out_err:

	if (slave && slave != client)

		i2c_unregister_device(slave);

	ipmi_ipmb_remove(client);

	return rv;

}

drivers/char/ipmi/ipmi_ssif.c

+2 −2
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ static int ssif_detect(struct i2c_client *client, struct i2c_board_info *info) 
	if (rv)

		rv = -ENODEV;

	else

		strlcpy(info->type, DEVICE_NAME, I2C_NAME_SIZE);

		strscpy(info->type, DEVICE_NAME, I2C_NAME_SIZE);

	kfree(resp);

	return rv;

}
@@ -1625,7 +1625,7 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	unsigned char     *resp;

	struct ssif_info   *ssif_info;

	int               rv = 0;

	int               len;

	int               len = 0;

	int               i;

	u8		  slave_addr = 0;

	struct ssif_addr_info *addr_info = NULL;

drivers/char/ipmi/ipmi_watchdog.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int ipmi_heartbeat(void) 
	return rv;

}



static struct watchdog_info ident = {

static const struct watchdog_info ident = {

	.options	= 0,	/* WDIOF_SETTIMEOUT, */

	.firmware_version = 1,

	.identity	= "IPMI"