From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754466AbcEDUQS (ORCPT ); Wed, 4 May 2016 16:16:18 -0400 Received: from mail-db5eur01on0097.outbound.protection.outlook.com ([104.47.2.97]:51128 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754220AbcEDUQN (ORCPT ); Wed, 4 May 2016 16:16:13 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=axentia.se; From: Peter Rosin To: CC: Peter Rosin , Wolfram Sang , Jonathan Corbet , Peter Korsgaard , Guenter Roeck , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald , Antti Palosaari , Mauro Carvalho Chehab , Rob Herring , Frank Rowand , Grant Likely , Andrew Morton , "David S. Miller" , Greg Kroah-Hartman , Kalle Valo , Jiri Slaby , Daniel Baluta , Lucas De Marchi , Matt Ranostay , Krzysztof Kozlowski , Hans Verkuil , Terry Heo , Arnd Bergmann , Tommi Rantala , Crestez Dan Leonard , , , , , Subject: [PATCH v9 2/9] i2c: muxes always lock the parent adapter Date: Wed, 4 May 2016 22:15:28 +0200 Message-ID: <1462392935-28011-3-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462392935-28011-1-git-send-email-peda@axentia.se> References: <1462392935-28011-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: AM3PR04CA0090.eurprd04.prod.outlook.com (10.163.180.144) To VI1PR02MB1312.eurprd02.prod.outlook.com (10.165.231.154) X-MS-Office365-Filtering-Correlation-Id: 564281b4-b4ad-42cb-42dd-08d37458ed7f X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;2:egOeCLc5++j4+0jiD8L3CPExktrMuEZ9Y5WeYJJwhBBy1Vec75G3XhrMZlOYlaEDS2MnIr3DFOJ9rK4lzbPqy+1iN59cgtand8rnAceMHs2VFg6fVPI9bincLB//ERV+ZvmwDRKFk1vuFL7yYkvUVULsZy2Yl0OLrtWzfiGkL03rHzPCicaZIRlrwd5uFKdM;3:XNf576WJFEWl3XMhIdK2nTy6pHNvRXSw99dCBBivhev8DvroLVbfXDYKyywfXzODLrZe6uM7HdyYNO9ODqKSa4V8OQ+jfvXbnWJ+ntZ8jekaahOKengi2lYqZB9YZ8a1;25:a4S2C38SE4XOYsjIVPiCTtd2MhWvGBE3gir6cn/C1bM8htkw0ArJ5yO/n+2PSmZjZljL/1XIwGKQKT0KIyb4I2H8Zwc3BeL8arC8INmYKvKRCWxrOg3Q0wxsSrupBkzmBt06zcALlc8lGeZA498oNmMaOQVB/Ini5/d0yHIq6TWuVyIZAxOuvevDyRBScLj9HgKPw92S5nY/DFixBtZkB17WpJ3Dq+a4Q7DUsi77fi65d7xbxXQLH7DM0AcrRpRvW5wCbgUvVPnWnzr/kkcGDuzHo9rUj4wmZeBrMKrxgFUhneAH3V+K0Gd6B9uL6iuMCTtUOtv+6n8klX0ll4m8D3uTFyjP/54R1ReglTZgAp+rlXDAC2aHjaQTXwdvFHsAFCAzDHvnS1wH1TR7LgffOV2s7NSrOFIM3bfP0BhnMGKtC2WzTJLLqFpysJW1pCkq X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR02MB1312; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101528026)(9101521098)(6040130)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041072)(6043046);SRVR:VI1PR02MB1312;BCL:0;PCL:0;RULEID:;SRVR:VI1PR02MB1312; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;4:ffJ1EZo1sccTBfZROzspOdGXFCkwQvMFO5nBWFLEoWR97/NcQIzMSewuEz2sqlSf0Vm+kYRcRcIkl2TmXpONDkKyKbskTYkd6MQlkIdJn6qrvdHHrEzCl3K6CdGcToZ/+Ki4zRNb/5m1Yb1kTy33BsoruNVvPBZTSG4dLbISsw0B+vItvtYWUg8c/BO+s7DU1JKIPhBo8hsPgteZSi+5TlRKfpsOZhsJIm24l+a/CcitMHQMDFGHMTAaEQanILBiyg1GNilMfz7UFK27vjxaQoA8F7vApxYvicQXozwN9EY2nDQM7x6JqWPzWd+uyEqheZIlyYca1//waJEeNhpQMx5ig8Vag+r8L3TqViXixUJvWy4QPji3cgz4fbewHt2rWWDGSgfXPiAm7KFbK8+dKDLm4EfiNtnASazvFdNIgGbdRCQ7bDgzOOJkuGMgCxyBPeNFlkWxmeBV2ke398VRtMyOOOBnZDoikXsgW7FMIH4= X-Forefront-PRVS: 093290AD39 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(4326007)(19580405001)(575784001)(86362001)(2351001)(229853001)(189998001)(586003)(6116002)(3846002)(19580395003)(110136002)(33646002)(47776003)(74482002)(81166005)(2906002)(50466002)(92566002)(48376002)(50986999)(77096005)(76176999)(5003940100001)(42186005)(50226002)(5004730100002)(2950100001)(36756003)(5008740100001)(7059030)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR02MB1312;H:localhost.localdomain;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;23:m8lx9ZPD/TyeFeIrfah2aE+xxy+cfRGo5rSKTg2AReeFVhwHiN87L+XY9OAeZ7DhNdLrWzP4rrrDTguoDhRzu9kLPEvcYEF+df5+I+8n6CM8H65IQnDiPUjuejb7BZYZUzLK9ef2FqJKELkiwllqhcmt13ZowFSGOF6++AZ+pF9LFgS+KQMzdsgkvaAz9vPbQu+M5GXA1LKZdOX1aafbpIj+8R3iKoc9anDQ57+0iRd7r1+Y1iLj4NXlJZdu6ID3jYeRMactHOukgnoSm+3u/UspX6GJbA8PxII27ttUuFnZXtRDOkDQWR0OS8uVKIIjASn4t9tfnAbzrQwHRVUEK52ala/dQA8J18LFOrp99XLxtGA4H8qodDyk86IeL7NTiRf7/BmNBZPFR1c7K1NJGx75PxYwBnUreXI7CaG/nM5orINDf7Rc4xyrW5+Li0Ah6Gcny+DGmZu6qGiaJTNm+DPhE0LQb25KDqZha2vCZ8zSvUqLMUvBoHrmakMz1+OLCc/DkTQ8VbT2Jz9XCYmvB7J9p1LefHSrfrFFNus9LcnvZMOt2FvXVAbVR/sQfzhSJzyH8Ey6xz9IQKg64ADD7pQmBIksoc8lshvdX3Chvf/+jfR+aN2p29Ngysh30Kj4gkmR9Fro6hV1dfxh0XgxWwl6guxYVkpKycdgroKKJCd5S8tSb9+FCgQG8UGsTiA9GKoMwqenvSs1S3QCZc3VjjXjeduBZG2//d7K+21We/AayRCF49nBV/fq5g2GrWcx4dV+hFdsnYCRJPVxfycq+D1vo9EcJ3QrOskcinFpqFPVXI/AilihFa/QA8eNyIcYiTZa85m9vFS26Ihens/dCnS1niR9Nxh/xgDJ+S85QDF/RuBQIOAyMU9bbixVM9oUk4iez2wiPjAFoLdKCeUB7tWlOgaTSLG1qyFRmfrL6oU= X-Microsoft-Exchange-Diagnostics: 1;VI1PR02MB1312;5:Z4y2Hsyv5OB9waKVaRfShdt2Cc+cxrRM9uJOwZki9X7Je53IpYESBA4t14YQJ34M2QWM3yzZj+RgDmU/KQDAOslsAPEeGDn+gYUklg7LgHJyovv5Jux6FgX/TDA/cH9ZFRtP2klzZohnuKeflcfVtg==;24:aX9gmO+2fAjwZeWhJyF7dAAXQLxuMkFOzzMWpHi9qO59mAcZ9mrZCIziuYNSyrENOcueb01Qy+ulOWm4s4O+CGpAiq92G2jz5jxZ7G21BTU=;7:uJQpfmdhcl9VdF6IP9/YaZ9LA2DFDnoE8EqslRHImsEKY1jgVYo77YYvUh8O4c1/iO1oYmHYuQhA3/5oQch0aT+j26G93hJoVIPCGyM4JW867Z1PwsK/JGrdPVr9vsuR8bVxJgrnVyC1pHLgQzB05rMcSeV7qW8O2e36U0npaJmG+LeNq6jU9G7+/qK36/+4 SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2016 20:16:04.8293 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR02MB1312 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of checking for i2c parent adapters for every lock/unlock, simply override the locking for muxes to always lock/unlock the parent adapter directly. Signed-off-by: Peter Rosin --- drivers/i2c/i2c-core.c | 21 +++------------------ drivers/i2c/i2c-mux.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 7ef5bd085476..afdee66002db 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -962,12 +962,7 @@ static int i2c_check_addr_busy(struct i2c_adapter *adapter, int addr) static void i2c_adapter_lock_bus(struct i2c_adapter *adapter, unsigned int flags) { - struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter); - - if (parent) - i2c_lock_adapter(parent); - else - rt_mutex_lock(&adapter->bus_lock); + rt_mutex_lock(&adapter->bus_lock); } /** @@ -979,12 +974,7 @@ static void i2c_adapter_lock_bus(struct i2c_adapter *adapter, static int i2c_adapter_trylock_bus(struct i2c_adapter *adapter, unsigned int flags) { - struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter); - - if (parent) - return parent->trylock_bus(parent, flags); - else - return rt_mutex_trylock(&adapter->bus_lock); + return rt_mutex_trylock(&adapter->bus_lock); } /** @@ -996,12 +986,7 @@ static int i2c_adapter_trylock_bus(struct i2c_adapter *adapter, static void i2c_adapter_unlock_bus(struct i2c_adapter *adapter, unsigned int flags) { - struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter); - - if (parent) - i2c_unlock_adapter(parent); - else - rt_mutex_unlock(&adapter->bus_lock); + rt_mutex_unlock(&adapter->bus_lock); } static void i2c_dev_set_name(struct i2c_adapter *adap, diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 25e9336b0e6e..5fa8af715e24 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -98,6 +98,33 @@ static unsigned int i2c_mux_parent_classes(struct i2c_adapter *parent) return class; } +static void i2c_parent_lock_bus(struct i2c_adapter *adapter, + unsigned int flags) +{ + struct i2c_mux_priv *priv = adapter->algo_data; + struct i2c_adapter *parent = priv->muxc->parent; + + parent->lock_bus(parent, flags); +} + +static int i2c_parent_trylock_bus(struct i2c_adapter *adapter, + unsigned int flags) +{ + struct i2c_mux_priv *priv = adapter->algo_data; + struct i2c_adapter *parent = priv->muxc->parent; + + return parent->trylock_bus(parent, flags); +} + +static void i2c_parent_unlock_bus(struct i2c_adapter *adapter, + unsigned int flags) +{ + struct i2c_mux_priv *priv = adapter->algo_data; + struct i2c_adapter *parent = priv->muxc->parent; + + parent->unlock_bus(parent, flags); +} + struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent, struct device *dev, int max_adapters, int sizeof_priv, u32 flags, @@ -165,6 +192,9 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, priv->adap.retries = parent->retries; priv->adap.timeout = parent->timeout; priv->adap.quirks = parent->quirks; + priv->adap.lock_bus = i2c_parent_lock_bus; + priv->adap.trylock_bus = i2c_parent_trylock_bus; + priv->adap.unlock_bus = i2c_parent_unlock_bus; /* Sanity check on class */ if (i2c_mux_parent_classes(parent) & class) -- 2.1.4