Unverified Commit d17c4bf2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'scmi-fixes-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes

Arm SCMI fixes for v5.16

Couple of fixes for sparse warnings(type error assignment in voltage and
sensor protocols), add proper propagation of error from scmi_pm_domain_probe
handling agent discovery response in base protocol correctly and a fix
to avoid null pointer de-reference in the error path.

* tag 'scmi-fixes-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_scmi: Fix type error assignment in voltage protocol
  firmware: arm_scmi: Fix type error in sensor protocol
  firmware: arm_scmi: pm: Propagate return value to caller
  firmware: arm_scmi: Fix base agent discover response
  firmware: arm_scmi: Fix null de-reference on error path

Link: https://lore.kernel.org/r/20211118121656.4014764-1-sudeep.holla@arm.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d063f307 026d9835

drivers/firmware/arm_scmi/base.c

+12 −3
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ struct scmi_msg_resp_base_attributes { 
	__le16 reserved;

};



struct scmi_msg_resp_base_discover_agent {

	__le32 agent_id;

	u8 name[SCMI_MAX_STR_SIZE];

};





struct scmi_msg_base_error_notify {

	__le32 event_control;

#define BASE_TP_NOTIFY_ALL	BIT(0)
@@ -225,18 +231,21 @@ static int scmi_base_discover_agent_get(const struct scmi_protocol_handle *ph, 
					int id, char *name)

{

	int ret;

	struct scmi_msg_resp_base_discover_agent *agent_info;

	struct scmi_xfer *t;



	ret = ph->xops->xfer_get_init(ph, BASE_DISCOVER_AGENT,

				      sizeof(__le32), SCMI_MAX_STR_SIZE, &t);

				      sizeof(__le32), sizeof(*agent_info), &t);

	if (ret)

		return ret;



	put_unaligned_le32(id, t->tx.buf);



	ret = ph->xops->do_xfer(ph, t);

	if (!ret)

		strlcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE);

	if (!ret) {

		agent_info = t->rx.buf;

		strlcpy(name, agent_info->name, SCMI_MAX_STR_SIZE);

	}



	ph->xops->xfer_put(ph, t);

drivers/firmware/arm_scmi/scmi_pm_domain.c

+1 −3
Original line number Diff line number Diff line
@@ -138,9 +138,7 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) 
	scmi_pd_data->domains = domains;

	scmi_pd_data->num_domains = num_domains;



	of_genpd_add_provider_onecell(np, scmi_pd_data);



	return 0;

	return of_genpd_add_provider_onecell(np, scmi_pd_data);

}



static const struct scmi_device_id scmi_id_table[] = {

drivers/firmware/arm_scmi/sensors.c

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static int scmi_sensor_config_get(const struct scmi_protocol_handle *ph, 
	if (ret)

		return ret;



	put_unaligned_le32(cpu_to_le32(sensor_id), t->tx.buf);

	put_unaligned_le32(sensor_id, t->tx.buf);

	ret = ph->xops->do_xfer(ph, t);

	if (!ret) {

		struct sensors_info *si = ph->get_priv(ph);

drivers/firmware/arm_scmi/virtio.c

+5 −5
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ static bool scmi_vio_have_vq_rx(struct virtio_device *vdev) 
}



static int scmi_vio_feed_vq_rx(struct scmi_vio_channel *vioch,

			       struct scmi_vio_msg *msg)

			       struct scmi_vio_msg *msg,

			       struct device *dev)

{

	struct scatterlist sg_in;

	int rc;
@@ -94,8 +95,7 @@ static int scmi_vio_feed_vq_rx(struct scmi_vio_channel *vioch, 


	rc = virtqueue_add_inbuf(vioch->vqueue, &sg_in, 1, msg, GFP_ATOMIC);

	if (rc)

		dev_err_once(vioch->cinfo->dev,

			     "failed to add to virtqueue (%d)\n", rc);

		dev_err_once(dev, "failed to add to virtqueue (%d)\n", rc);

	else

		virtqueue_kick(vioch->vqueue);
@@ -108,7 +108,7 @@ static void scmi_finalize_message(struct scmi_vio_channel *vioch, 
				  struct scmi_vio_msg *msg)

{

	if (vioch->is_rx) {

		scmi_vio_feed_vq_rx(vioch, msg);

		scmi_vio_feed_vq_rx(vioch, msg, vioch->cinfo->dev);

	} else {

		/* Here IRQs are assumed to be already disabled by the caller */

		spin_lock(&vioch->lock);
@@ -269,7 +269,7 @@ static int virtio_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, 
			list_add_tail(&msg->list, &vioch->free_list);

			spin_unlock_irqrestore(&vioch->lock, flags);

		} else {

			scmi_vio_feed_vq_rx(vioch, msg);

			scmi_vio_feed_vq_rx(vioch, msg, cinfo->dev);

		}

	}

drivers/firmware/arm_scmi/voltage.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int scmi_voltage_descriptors_get(const struct scmi_protocol_handle *ph, 
			int cnt;



			cmd->domain_id = cpu_to_le32(v->id);

			cmd->level_index = desc_index;

			cmd->level_index = cpu_to_le32(desc_index);

			ret = ph->xops->do_xfer(ph, tl);

			if (ret)

				break;