mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
SCPI updates and fixes for v4.6
1. Minor fix to restore functionality in big-endian mode 2. Fix race by decreasing Tx timeout to 20ms 3. Adds support for 64-bit sensor values and energy meter -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJWwuygAAoJEABBurwxfuKYWLEP/0XYsixGBJaSVqmEUk9HJEz6 dv8+KfsFtdpDj2PnUn7crt0IEnUzsKKU5Rj/myjgKZSE2d1cYF+AC2UhD75Mr3mC 1+tsAA6BoplyIS60kHp/Ac9LK+wMkvkH3UcbAoJov78YNp5G+uvtc5HhC+KFfi3H SBR/bPTDLsGBFVHB+KmgFWY5PzmXKbcMIdxTzSKUqQtyirLElaqeJXFvV9Gj11wl SItSRtQ59MD3IGWsXrT6j56FQsR6NeITMOmKuhZGuxy3KGhz9iIP9Tlj/AZwASm6 mt0VCjWmjSywXQry2HxPzZ4J+7vA6YQGvQziPOUh21k9CfAjquUhnRiiIzG/syfW JO+qYDiOfRccokVCOVOsqF+ZS5ZxEDRhFkrxeERIMX17ZMDo1fplBef6DuRbIIMW hpE2v4BcoXq9sMYWWQ7V4XZEH78phRnozapif1Jk4+JF1HuFDWkRB77YebEkNZZk ggQ2UU27a0TwpqYDtUDzC8czQxG8zOklWPXb8jTaOaOILSg94D1tamHdBRYYAaNG WaLkYqJyZpVTwSPJGdTuKmL93GTRuXXGPgHKKAR1HzWr37JA0K04yVZ2jxIb2o7m NLin0XndJUKBOQCZFkmNyFcYp43A3M4bIkSo7acu2H+qJGLvrlfflsGBk1xDuSTR NskMFEAkgsy2JyDDPdDX =HnG3 -----END PGP SIGNATURE----- Merge tag 'scpi-for-v4.6/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/drivers SCPI updates and fixes for v4.6 1. Minor fix to restore functionality in big-endian mode 2. Fix race by decreasing Tx timeout to 20ms 3. Adds support for 64-bit sensor values and energy meter * tag 'scpi-for-v4.6/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: hwmon: (scpi) add energy meter support firmware: arm_scpi: add support for 64-bit sensor values firmware: arm_scpi: decrease Tx timeout to 20ms firmware: arm_scpi: fix send_message and sensor_get_value for big-endian Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
962f08f859
3 changed files with 23 additions and 11 deletions
|
@ -80,7 +80,7 @@
|
|||
#define FW_REV_MINOR(x) (((x) & FW_REV_MINOR_MASK) >> FW_REV_MINOR_BITS)
|
||||
#define FW_REV_PATCH(x) ((x) & FW_REV_PATCH_MASK)
|
||||
|
||||
#define MAX_RX_TIMEOUT (msecs_to_jiffies(20))
|
||||
#define MAX_RX_TIMEOUT (msecs_to_jiffies(30))
|
||||
|
||||
enum scpi_error_codes {
|
||||
SCPI_SUCCESS = 0, /* Success */
|
||||
|
@ -231,7 +231,8 @@ struct _scpi_sensor_info {
|
|||
};
|
||||
|
||||
struct sensor_value {
|
||||
__le32 val;
|
||||
__le32 lo_val;
|
||||
__le32 hi_val;
|
||||
} __packed;
|
||||
|
||||
static struct scpi_drvinfo *scpi_info;
|
||||
|
@ -373,7 +374,7 @@ static int scpi_send_message(u8 cmd, void *tx_buf, unsigned int tx_len,
|
|||
ret = -ETIMEDOUT;
|
||||
else
|
||||
/* first status word */
|
||||
ret = le32_to_cpu(msg->status);
|
||||
ret = msg->status;
|
||||
out:
|
||||
if (ret < 0 && rx_buf) /* remove entry from the list if timed-out */
|
||||
scpi_process_cmd(scpi_chan, msg->cmd);
|
||||
|
@ -525,15 +526,17 @@ static int scpi_sensor_get_info(u16 sensor_id, struct scpi_sensor_info *info)
|
|||
return ret;
|
||||
}
|
||||
|
||||
int scpi_sensor_get_value(u16 sensor, u32 *val)
|
||||
int scpi_sensor_get_value(u16 sensor, u64 *val)
|
||||
{
|
||||
__le16 id = cpu_to_le16(sensor);
|
||||
struct sensor_value buf;
|
||||
int ret;
|
||||
|
||||
ret = scpi_send_message(SCPI_CMD_SENSOR_VALUE, &sensor, sizeof(sensor),
|
||||
ret = scpi_send_message(SCPI_CMD_SENSOR_VALUE, &id, sizeof(id),
|
||||
&buf, sizeof(buf));
|
||||
if (!ret)
|
||||
*val = le32_to_cpu(buf.val);
|
||||
*val = (u64)le32_to_cpu(buf.hi_val) << 32 |
|
||||
le32_to_cpu(buf.lo_val);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -699,7 +702,7 @@ static int scpi_probe(struct platform_device *pdev)
|
|||
cl->rx_callback = scpi_handle_remote_msg;
|
||||
cl->tx_prepare = scpi_tx_prepare;
|
||||
cl->tx_block = true;
|
||||
cl->tx_tout = 50;
|
||||
cl->tx_tout = 20;
|
||||
cl->knows_txdone = false; /* controller can't ack */
|
||||
|
||||
INIT_LIST_HEAD(&pchan->rx_pending);
|
||||
|
|
|
@ -52,7 +52,7 @@ static int scpi_read_temp(void *dev, int *temp)
|
|||
struct scpi_sensors *scpi_sensors = zone->scpi_sensors;
|
||||
struct scpi_ops *scpi_ops = scpi_sensors->scpi_ops;
|
||||
struct sensor_data *sensor = &scpi_sensors->data[zone->sensor_id];
|
||||
u32 value;
|
||||
u64 value;
|
||||
int ret;
|
||||
|
||||
ret = scpi_ops->sensor_get_value(sensor->info.sensor_id, &value);
|
||||
|
@ -70,7 +70,7 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf)
|
|||
struct scpi_sensors *scpi_sensors = dev_get_drvdata(dev);
|
||||
struct scpi_ops *scpi_ops = scpi_sensors->scpi_ops;
|
||||
struct sensor_data *sensor;
|
||||
u32 value;
|
||||
u64 value;
|
||||
int ret;
|
||||
|
||||
sensor = container_of(attr, struct sensor_data, dev_attr_input);
|
||||
|
@ -79,7 +79,7 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
return sprintf(buf, "%u\n", value);
|
||||
return sprintf(buf, "%llu\n", value);
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
|
@ -114,6 +114,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
|
|||
{
|
||||
u16 nr_sensors, i;
|
||||
int num_temp = 0, num_volt = 0, num_current = 0, num_power = 0;
|
||||
int num_energy = 0;
|
||||
struct scpi_ops *scpi_ops;
|
||||
struct device *hwdev, *dev = &pdev->dev;
|
||||
struct scpi_sensors *scpi_sensors;
|
||||
|
@ -182,6 +183,13 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
|
|||
"power%d_label", num_power + 1);
|
||||
num_power++;
|
||||
break;
|
||||
case ENERGY:
|
||||
snprintf(sensor->input, sizeof(sensor->input),
|
||||
"energy%d_input", num_energy + 1);
|
||||
snprintf(sensor->label, sizeof(sensor->input),
|
||||
"energy%d_label", num_energy + 1);
|
||||
num_energy++;
|
||||
break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -33,6 +33,7 @@ enum scpi_sensor_class {
|
|||
VOLTAGE,
|
||||
CURRENT,
|
||||
POWER,
|
||||
ENERGY,
|
||||
};
|
||||
|
||||
struct scpi_sensor_info {
|
||||
|
@ -68,7 +69,7 @@ struct scpi_ops {
|
|||
struct scpi_dvfs_info *(*dvfs_get_info)(u8);
|
||||
int (*sensor_get_capability)(u16 *sensors);
|
||||
int (*sensor_get_info)(u16 sensor_id, struct scpi_sensor_info *);
|
||||
int (*sensor_get_value)(u16, u32 *);
|
||||
int (*sensor_get_value)(u16, u64 *);
|
||||
};
|
||||
|
||||
#if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL)
|
||||
|
|
Loading…
Reference in a new issue