[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180212051549.8575-5-joel@jms.id.au>
Date: Mon, 12 Feb 2018 15:45:43 +1030
From: Joel Stanley <joel@....id.au>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Rob Herring <robh+dt@...nel.org>,
Mark Rutland <mark.rutland@....com>
Cc: Eddie James <eajames@...ibm.com>, Jeremy Kerr <jk@...abs.org>,
Christopher Bostic <cbostic@...ux.vnet.ibm.com>,
Brad Bishop <bradleyb@...ziesquirrel.com>,
linux-kernel@...r.kernel.org, devicetree@...r.kernel.org
Subject: [PATCH 04/10] fsi: Fix one and two byte bus reads/writes
From: Eddie James <eajames@...ibm.com>
Address checker fixed to allow one and two byte reads/writes.
Address alignments for each size verified.
Signed-off-by: Edward James <eajames@...ibm.com>
Signed-off-by: Christopher Bostic <cbostic@...ux.vnet.ibm.com>
Acked-by: Jeremy Kerr <jk@...abs.org>
Signed-off-by: Joel Stanley <joel@....id.au>
---
drivers/fsi/fsi-core.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 6e5aa9b26665..e5dfece248a5 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -656,10 +656,13 @@ static int fsi_slave_init(struct fsi_master *master, int link, uint8_t id)
/* FSI master support */
static int fsi_check_access(uint32_t addr, size_t size)
{
- if (size != 1 && size != 2 && size != 4)
- return -EINVAL;
-
- if ((addr & 0x3) != (size & 0x3))
+ if (size == 4) {
+ if (addr & 0x3)
+ return -EINVAL;
+ } else if (size == 2) {
+ if (addr & 0x1)
+ return -EINVAL;
+ } else if (size != 1)
return -EINVAL;
return 0;
--
2.15.1
Powered by blists - more mailing lists