From patchwork Fri Mar 18 08:46:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Glauber X-Patchwork-Id: 599362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qRJns2DVCz9s6r for ; Fri, 18 Mar 2016 19:50:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753970AbcCRIsL (ORCPT ); Fri, 18 Mar 2016 04:48:11 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36555 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751094AbcCRIq7 (ORCPT ); Fri, 18 Mar 2016 04:46:59 -0400 Received: by mail-wm0-f68.google.com with SMTP id l68so4327624wml.3; Fri, 18 Mar 2016 01:46:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=XKlNLDrSpMrH4fdUge1xrNzBr0zq+03AvL440FsAMTY=; b=cBLKOrjAYgL8sQ9zSn2tr3msBfjGfu99TzcypiWkMqRnSUfa+CofeMGtxaSmrDqwyD +9OMTTf5CPnJfA4porl3qcfysAbiQd4ppdTrmYCMGjRn+848b5rLt+dWd7siqlMEtb/E 4wi/dkZlcUXYVZEeIYcHqQXQZrzZlGn9PlITxo5xyp3/Aqy1ZgP55rJekpemH+f/dqO0 l+0QEudJWc1RPqaRvMvqaCeMJyCfQgZpOohjNCCqGNa0n4MG9hGYuFNwergujlzcxd2r ocS8SNcBB7txoBIcHYpjWlJjjlCP/ankSWp4I6HnvlObUTNg/7Oa973Kytixmnood533 G/RQ== X-Gm-Message-State: AD7BkJLklYfpBG4I9GS94fyJkbthotVNQ34WDjhjwa7S+GkzTjI2lCcP1C2yLOyLA1mmRQ== X-Received: by 10.28.105.77 with SMTP id e74mr16238607wmc.87.1458290817725; Fri, 18 Mar 2016 01:46:57 -0700 (PDT) Received: from wintermute.fritz.box (HSI-KBW-109-193-047-197.hsi7.kabel-badenwuerttemberg.de. [109.193.47.197]) by smtp.gmail.com with ESMTPSA id jo6sm11221214wjb.48.2016.03.18.01.46.56 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 Mar 2016 01:46:57 -0700 (PDT) From: Jan Glauber To: Wolfram Sang Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, David Daney , Peter Swain , Jan Glauber Subject: [PATCH v4 08/14] i2c-octeon: Flush TWSI writes with readback Date: Fri, 18 Mar 2016 09:46:33 +0100 Message-Id: <9fb795905eb30c878f480f85cfe1f83b628cdb79.1458289385.git.jglauber@cavium.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Peter Swain Signed-off-by: Peter Swain Signed-off-by: Jan Glauber Acked-by: David Daney --- drivers/i2c/busses/i2c-octeon.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c index f409f8f..aa676ce 100644 --- a/drivers/i2c/busses/i2c-octeon.c +++ b/drivers/i2c/busses/i2c-octeon.c @@ -129,6 +129,12 @@ struct octeon_i2c { static int reset_how; +static void writeqflush(u64 val, void __iomem *addr) +{ + __raw_writeq(val, addr); + __raw_readq(addr); /* wait for write to land */ +} + /** * octeon_i2c_write_sw - write an I2C core register * @i2c: The struct octeon_i2c @@ -189,8 +195,7 @@ static u8 octeon_i2c_read_sw(struct octeon_i2c *i2c, u64 eop_reg) */ static void octeon_i2c_write_int(struct octeon_i2c *i2c, u64 data) { - __raw_writeq(data, i2c->twsi_base + TWSI_INT); - __raw_readq(i2c->twsi_base + TWSI_INT); + writeqflush(data, i2c->twsi_base + TWSI_INT); } /** @@ -576,10 +581,10 @@ static int octeon_i2c_simple_write(struct octeon_i2c *i2c, struct i2c_msg *msgs) for (i = 0; i < msgs[0].len - 4 && i < 4; i++, j--) ext |= (u64) msgs[0].buf[j] << (8 * i); - __raw_writeq(ext, i2c->twsi_base + SW_TWSI_EXT); + writeqflush(ext, i2c->twsi_base + SW_TWSI_EXT); } - __raw_writeq(cmd, i2c->twsi_base + SW_TWSI); + writeqflush(cmd, i2c->twsi_base + SW_TWSI); ret = octeon_i2c_hlc_wait(i2c); if (ret) @@ -625,7 +630,7 @@ static int octeon_i2c_ia_read(struct octeon_i2c *i2c, struct i2c_msg *msgs) cmd |= (u64) msgs[0].buf[0] << SW_TWSI_IA_SHIFT; octeon_i2c_hlc_int_clear(i2c); - __raw_writeq(cmd, i2c->twsi_base + SW_TWSI); + writeqflush(cmd, i2c->twsi_base + SW_TWSI); ret = octeon_i2c_hlc_wait(i2c); if (ret) @@ -685,10 +690,10 @@ static int octeon_i2c_ia_write(struct octeon_i2c *i2c, struct i2c_msg *msgs) set_ext = true; } if (set_ext) - __raw_writeq(ext, i2c->twsi_base + SW_TWSI_EXT); + writeqflush(ext, i2c->twsi_base + SW_TWSI_EXT); octeon_i2c_hlc_int_clear(i2c); - __raw_writeq(cmd, i2c->twsi_base + SW_TWSI); + writeqflush(cmd, i2c->twsi_base + SW_TWSI); ret = octeon_i2c_hlc_wait(i2c); if (ret)