From patchwork Mon Apr 11 15:28:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Glauber X-Patchwork-Id: 608859 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 3qkDbQ1Dn6z9t3b for ; Tue, 12 Apr 2016 01:32:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754599AbcDKPcI (ORCPT ); Mon, 11 Apr 2016 11:32:08 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35431 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755157AbcDKP3N (ORCPT ); Mon, 11 Apr 2016 11:29:13 -0400 Received: by mail-wm0-f66.google.com with SMTP id a140so22103628wma.2; Mon, 11 Apr 2016 08:29:12 -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=wisyxmYA1My2WOmHXxpOCSCnuRe/fvL2JLBiWzbNuQk=; b=WUwktW9VBkokpEAi/zZdDteuv5FJZC9h86N9CeKBkHM0uZ3lYnqy5WuHMt8vSM0Gqi KANKLDOowpEfNUy0xOZ+5FyE93xf0r6S9wNU6LG2JtakOJNdfGUccsOtZnbQej12ts1Q EFWZIMNqRBTtwWWbqrc1VsEeROQ9QBWR5oAdQpAdt542c75kroNZSQHQY6qLOOoCbx6s Rs8N9yXhKPrso26iFSvH4v3GK9bvFsC47GuOncZzmVdEV/zuyBl3Vkw5drBCbiiha7Qd cK0QjLe3li3tZF+vGIRz54mR8KFvsJszbCajdYIIspxf48wL/MpdqBVV2Az7m7vKSu2I HLZA== X-Gm-Message-State: AD7BkJJljwa9QeLbzaKLON4xQZPYz/gLfy2BdmEEHKpW9gTdMqOT2oQC2Uap9N4qchZ3/A== X-Received: by 10.28.50.138 with SMTP id y132mr20291300wmy.52.1460388550986; Mon, 11 Apr 2016 08:29:10 -0700 (PDT) Received: from localhost.localdomain (dslb-088-066-101-161.088.066.pools.vodafone-ip.de. [88.66.101.161]) by smtp.gmail.com with ESMTPSA id c187sm14843611wme.16.2016.04.11.08.29.09 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Apr 2016 08:29:10 -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 v6 11/19] i2c: octeon: Flush TWSI writes with readback Date: Mon, 11 Apr 2016 17:28:42 +0200 Message-Id: <0a859e6918a2c7fbe0e71040a840e770e5b2d10a.1460387640.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 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c index fff1ac0..8d54fc9 100644 --- a/drivers/i2c/busses/i2c-octeon.c +++ b/drivers/i2c/busses/i2c-octeon.c @@ -127,6 +127,12 @@ struct octeon_i2c { atomic_t hlc_int_en_cnt; }; +static void writeqflush(u64 val, void __iomem *addr) +{ + __raw_writeq(val, addr); + __raw_readq(addr); /* wait for write to land */ +} + /** * octeon_i2c_reg_write - write an I2C core register * @i2c: The struct octeon_i2c @@ -197,8 +203,7 @@ static u64 octeon_i2c_read_int(struct octeon_i2c *i2c) */ 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); } /** @@ -487,7 +492,7 @@ static int octeon_i2c_hlc_read(struct octeon_i2c *i2c, struct i2c_msg *msgs) else cmd |= SW_TWSI_OP_7; - __raw_writeq(cmd, i2c->twsi_base + SW_TWSI); + writeqflush(cmd, i2c->twsi_base + SW_TWSI); ret = octeon_i2c_hlc_wait(i2c); if (ret) goto err; @@ -541,10 +546,10 @@ static int octeon_i2c_hlc_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) goto err; @@ -589,7 +594,7 @@ static int octeon_i2c_hlc_comp_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) @@ -649,10 +654,10 @@ static int octeon_i2c_hlc_comp_write(struct octeon_i2c *i2c, struct i2c_msg *msg 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)