[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180212051549.8575-3-joel@jms.id.au>
Date: Mon, 12 Feb 2018 15:45:41 +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: Jeremy Kerr <jk@...abs.org>,
Christopher Bostic <cbostic@...ux.vnet.ibm.com>,
Brad Bishop <bradleyb@...ziesquirrel.com>,
Edward James <eajames@...ibm.com>,
linux-kernel@...r.kernel.org, devicetree@...r.kernel.org
Subject: [PATCH 02/10] fsi: master-gpio: Add locking during break and link enable
From: Jeremy Kerr <jk@...abs.org>
Currently, we perform GPIO accesses in fsi_master_gpio_break and
fsi_master_link_enable, without holding cmd_lock. This change adds the
appropriate locking.
Signed-off-by: Jeremy Kerr <jk@...abs.org>
Reviewed-by: Joel Stanley <joel@....id.au>
Reviewed-by: Christopher Bostic <clbostic@...ux.vnet.ibm.com>
Signed-off-by: Joel Stanley <joel@....id.au>
---
drivers/fsi/fsi-master-gpio.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/fsi/fsi-master-gpio.c b/drivers/fsi/fsi-master-gpio.c
index ae2618768508..a6d602e89c11 100644
--- a/drivers/fsi/fsi-master-gpio.c
+++ b/drivers/fsi/fsi-master-gpio.c
@@ -461,12 +461,14 @@ static int fsi_master_gpio_term(struct fsi_master *_master,
static int fsi_master_gpio_break(struct fsi_master *_master, int link)
{
struct fsi_master_gpio *master = to_fsi_master_gpio(_master);
+ unsigned long flags;
if (link != 0)
return -ENODEV;
trace_fsi_master_gpio_break(master);
+ spin_lock_irqsave(&master->cmd_lock, flags);
set_sda_output(master, 1);
sda_out(master, 1);
clock_toggle(master, FSI_PRE_BREAK_CLOCKS);
@@ -475,6 +477,7 @@ static int fsi_master_gpio_break(struct fsi_master *_master, int link)
echo_delay(master);
sda_out(master, 1);
clock_toggle(master, FSI_POST_BREAK_CLOCKS);
+ spin_unlock_irqrestore(&master->cmd_lock, flags);
/* Wait for logic reset to take effect */
udelay(200);
@@ -497,10 +500,14 @@ static void fsi_master_gpio_init(struct fsi_master_gpio *master)
static int fsi_master_gpio_link_enable(struct fsi_master *_master, int link)
{
struct fsi_master_gpio *master = to_fsi_master_gpio(_master);
+ unsigned long flags;
if (link != 0)
return -ENODEV;
+
+ spin_lock_irqsave(&master->cmd_lock, flags);
gpiod_set_value(master->gpio_enable, 1);
+ spin_unlock_irqrestore(&master->cmd_lock, flags);
return 0;
}
--
2.15.1
Powered by blists - more mailing lists