ARM SCMI fixes for v5.13

A fix for very old possible ternary operation sign extention bug in the old
 ARM SCPI firmware driver and a cleanup to remove duplicate structure declartion
 in SCMI driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEunHlEgbzHrJD3ZPhAEG6vDF+4pgFAmCJKXMACgkQAEG6vDF+
 4pjLTQ//SKx1LcYJy4UGzxxRe+9P4mVQk2YTi6XjaRdEKwtWkl6biNf9WfW9tVNA
 WawTzsNHPL6VZemKi+EIVD+280pSn3JqO2PbLHGiCFO+tZhUnYkXzb3m8ZXTm6Cu
 w/sOVxz0kQIxoqgPgPxnzC3XHCmzHfiCEwLYdHJR4tLOOxYbEF0R61he/POScw+t
 QEOUjGSs2GiGJYZk154Bssg6DthS6k9CKwZuV0KCAx3CF1LN2MTzlU/nwYDwZlAa
 Ty+woNRX1FYcx7KYAy0nw7td09VRP2NV0OWZHvWHEr2MRGA6Un91BLZdEW6MNb7K
 tMyWcyhK8TDNmRngxPCHOC9iU/Lp3xLmoyKqgEVHBuKbTQDXKq2iWcVtie/8QSs2
 2JZwyPbpklKUETzphYG8JfA78xjqQKbbkLhFjYDgSdIM90byTNUCrnMeq5bqEUSu
 qtF2FY24q8raYRS8YJXSQtlBCQ0s/s5yCgadBjymxQ4WPVw0kefGdahlZoU3RitR
 AvquMy+DCnWvxMTJFixoJxfGioq7VN3PrABYP33vurY+1ZYNeARo/qGfYNw1K1M4
 VMop6ffetklG7NWTnTTtT6gmCO37w7oLHuNW+6pY/l3QEqyQwYqogYsrXNDWhs/a
 B3K67qwsWDm0hOLp/3aKOarO1euhIqyyuttRezvsWlPxra7iT5U=
 =DwOR
 -----END PGP SIGNATURE-----

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

ARM SCMI fixes for v5.13

A fix for very old possible ternary operation sign extention bug in the old
ARM SCPI firmware driver and a cleanup to remove duplicate structure declartion
in SCMI driver.

* tag 'scmi-fixes-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_scmi: Remove duplicate declaration of struct scmi_protocol_handle
  firmware: arm_scpi: Prevent the ternary sign expansion bug

Link: https://lore.kernel.org/r/20210428093148.flrcowzr2dsj7byz@bogus
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-04-28 11:49:02 +02:00
commit e393cc4e9c
2 changed files with 3 additions and 3 deletions

View File

@ -79,8 +79,6 @@ struct scmi_protocol_events {
int scmi_notification_init(struct scmi_handle *handle);
void scmi_notification_exit(struct scmi_handle *handle);
struct scmi_protocol_handle;
int scmi_register_protocol_events(const struct scmi_handle *handle, u8 proto_id,
const struct scmi_protocol_handle *ph,
const struct scmi_protocol_events *ee);

View File

@ -552,8 +552,10 @@ static unsigned long scpi_clk_get_val(u16 clk_id)
ret = scpi_send_message(CMD_GET_CLOCK_VALUE, &le_clk_id,
sizeof(le_clk_id), &rate, sizeof(rate));
if (ret)
return 0;
return ret ? ret : le32_to_cpu(rate);
return le32_to_cpu(rate);
}
static int scpi_clk_set_val(u16 clk_id, unsigned long rate)