From patchwork Tue Jun 2 18:45:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 479670 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 BA46B140273 for ; Wed, 3 Jun 2015 04:46:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754413AbbFBSqH (ORCPT ); Tue, 2 Jun 2015 14:46:07 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:32880 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754366AbbFBSqH (ORCPT ); Tue, 2 Jun 2015 14:46:07 -0400 Received: by padj3 with SMTP id j3so73110115pad.0 for ; Tue, 02 Jun 2015 11:46:06 -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; bh=SmaSIuXrDU/48pp6y1mKwf7yrCCQp6msNh3bMKd30uo=; b=Kj9+xHtdUXeNV+pfz4XSeFSUmW4aV7iY9ou9MQYE0hXjr9WB+VgRgZOkcmgRvYxp1K cVHgatJcaUNr0qpz8FgaJQj6gZ9/f4IfSyCeLuhiauFj7FwNZp6872SaENHRRlrncWNp CkT6634YoBuNa8b8aj40C4jPHi3asuF/yUrVd+Qz4au8tQEG4A05nwMMU5z9OYBWmLox 2J4/VsN4P+NhLXWYOk+BpxzPBTivu/9SPYLECcB9WgxUP3pA1vltz2QXH7NoGIoIA4Bb ftqouChGJwpok6fdzxG2vlVtNG7m13A4T/FDEdWros9LZYn5PHTvTUlTqDeQ6/MGqHFv XIfQ== X-Gm-Message-State: ALoCoQm/Lwk5a1L1C8AFP2FDorxXMH7lm3F3kdGa11OTOiUTZhs6CqgoI0foIfuDRTJZrTLuYZSq X-Received: by 10.66.199.8 with SMTP id jg8mr15256216pac.15.1433270766792; Tue, 02 Jun 2015 11:46:06 -0700 (PDT) Received: from localhost.localdomain ([223.190.86.187]) by mx.google.com with ESMTPSA id jx5sm18222527pbc.85.2015.06.02.11.45.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Jun 2015 11:46:05 -0700 (PDT) From: Vaibhav Hiremath To: linux-i2c@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, wsa@the-dreams.de, Vaibhav Hiremath , Haojian Zhuang Subject: [PATCH-RESEND 1/3] i2c: core: append hardware lock with bus lock Date: Wed, 3 Jun 2015 00:15:29 +0530 Message-Id: <1433270731-23790-2-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433270731-23790-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1433270731-23790-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org To justify the need for hardware lock, lets take a real usecase scenario - In case of Marvell SoC, PXA910 silicon, both AP and CP are present and these two ARM cores are sharing one pair of I2C pins. In order to keep I2C transaction operated with atomic, hardware lock (RIPC) is required. This patch extends support for atomic operation by adding hardware lock. History: The attempt has been made to push this patch-sets upstream sometime back in 2011, but not sure what happened later. I am making another attempt, hopefully will conclude it now. Link to previous patch: http://marc.info/?l=linux-i2c&m=130432846300735&w=2 Signed-off-by: Haojian Zhuang Signed-off-by: Vaibhav Hiremath --- drivers/i2c/i2c-core.c | 22 ++++++++++++++++++---- include/linux/i2c.h | 5 +++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 987c124..daea523 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -868,8 +868,11 @@ void i2c_lock_adapter(struct i2c_adapter *adapter) if (parent) i2c_lock_adapter(parent); - else + else { rt_mutex_lock(&adapter->bus_lock); + if (adapter->hardware_lock) + adapter->hardware_lock(adapter); + } } EXPORT_SYMBOL_GPL(i2c_lock_adapter); @@ -880,11 +883,19 @@ EXPORT_SYMBOL_GPL(i2c_lock_adapter); static int i2c_trylock_adapter(struct i2c_adapter *adapter) { struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter); + int ret = 0; if (parent) return i2c_trylock_adapter(parent); - else - return rt_mutex_trylock(&adapter->bus_lock); + else { + ret = rt_mutex_trylock(&adapter->bus_lock); + if (ret && adapter->hardware_trylock) { + ret = adapter->hardware_trylock(adapter); + if (!ret) + i2c_unlock_adapter(adapter); + } + return ret; + } } /** @@ -897,8 +908,11 @@ void i2c_unlock_adapter(struct i2c_adapter *adapter) if (parent) i2c_unlock_adapter(parent); - else + else { + if (adapter->hardware_unlock) + adapter->hardware_unlock(adapter); rt_mutex_unlock(&adapter->bus_lock); + } } EXPORT_SYMBOL_GPL(i2c_unlock_adapter); diff --git a/include/linux/i2c.h b/include/linux/i2c.h index e83a738..0758fb3 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -504,6 +504,11 @@ struct i2c_adapter { /* data fields that are valid for all devices */ struct rt_mutex bus_lock; + /* if hardware lock feature provided */ + void (*hardware_lock)(struct i2c_adapter *); + void (*hardware_unlock)(struct i2c_adapter *); + int (*hardware_trylock)(struct i2c_adapter *); + int timeout; /* in jiffies */ int retries; struct device dev; /* the adapter device */