redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

fsi: scom: Fixup endian annotations 

Use the proper annotated type __be32 and fixup the
accessor used for get_scom()

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Eddie James <eajames@linux.vnet.ibm.com>
hifive-unleashed-5.1
Benjamin Herrenschmidt 2018-06-12 15:19:09 +10:00
parent bd21336457
commit 5a3c2f7656
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/fsi/fsi-scom.c
View File

@ -51,8 +51,8 @@ static DEFINE_IDA(scom_ida);
static int put_scom(struct scom_device *scom_dev, uint64_t value, static int put_scom(struct scom_device *scom_dev, uint64_t value,
uint32_t addr) uint32_t addr)
{ {
__be32 data;
int rc; int rc;
uint32_t data;
mutex_lock(&scom_dev->lock); mutex_lock(&scom_dev->lock);
@ -79,7 +79,7 @@ static int put_scom(struct scom_device *scom_dev, uint64_t value,
static int get_scom(struct scom_device *scom_dev, uint64_t *value, static int get_scom(struct scom_device *scom_dev, uint64_t *value,
uint32_t addr) uint32_t addr)
{ {
uint32_t result, data; __be32 result, data;
int rc; int rc;
@ -96,14 +96,13 @@ static int get_scom(struct scom_device *scom_dev, uint64_t *value,
if (rc) if (rc)
goto bail; goto bail;
*value |= (uint64_t)cpu_to_be32(result) << 32; *value |= (uint64_t)be32_to_cpu(result) << 32;
rc = fsi_device_read(scom_dev->fsi_dev, SCOM_DATA1_REG, &result, rc = fsi_device_read(scom_dev->fsi_dev, SCOM_DATA1_REG, &result,
sizeof(uint32_t)); sizeof(uint32_t));
if (rc) if (rc)
goto bail; goto bail;
*value |= cpu_to_be32(result); *value |= be32_to_cpu(result);
bail: bail:
mutex_unlock(&scom_dev->lock); mutex_unlock(&scom_dev->lock);
return rc; return rc;