From patchwork Thu Nov 30 06:49:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 842914 X-Patchwork-Delegate: bartekgola@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WxJEYkah"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynSgP3MrBz9sMN for ; Thu, 30 Nov 2017 17:49:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753058AbdK3GtU (ORCPT ); Thu, 30 Nov 2017 01:49:20 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35062 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753030AbdK3GtT (ORCPT ); Thu, 30 Nov 2017 01:49:19 -0500 Received: by mail-wm0-f65.google.com with SMTP id f9so10342992wmh.0 for ; Wed, 29 Nov 2017 22:49:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=/of3BwygMJmdFK3exgtde6lJ+DpCt4qys7f/wdjXG/4=; b=WxJEYkahXUzk4IjfYpoWAa0FGPxAqkW8bmsgvPgdnBPPxUkXz/pViwBIhvXN2CNe4N 5+etYAJ0gmaIZKjLGPYomXlYK7CxCru8NLY5PBNvKShNHujyZPmq6a1P9nD0/5yVT3qD uLy0L/IHYXK5Cc/nXO0Zy0KdG6RCbPTiP8IL6FsrDykN74/8OcaXpL4LEq6+KJ02+yOI 8WHhUafuIhcvJF4nXvAyr733gewoUj3kqZtNoEEG+fW8Zg0sIysRIzoHvLicdQHFkddt p0HQtLV2k2av9cuNvhW6xVEVUUx2kDnO7KSh/XQefUcuvkQot0u73pA0PRcgPOl/MbRh UOHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=/of3BwygMJmdFK3exgtde6lJ+DpCt4qys7f/wdjXG/4=; b=UClBvtRNd7zDd4+9mIMLuAToXKdft0XPeM67RBcQ+1JBV2duS+4SXhJC5+VnmX6ytw YKO+HmpXkTnCKrCFCsal4AI+FYslM0wLPslHUq7ARGp91MlWRk9uJKCfwXovzjqmvnp6 zSUi3ErUMo/+NUcpfiFIpsG/16+g1751ULuZQ79I5Zj3Hd1a9AQ1okTwp5YgWT9ldIbj V2VSwN8H4iJZqoeXfb67LAPYcoQGQLFGKONIB+IHAP5IrKH6pZUwMDsKmsi9xalNLWWI 3az786qznHuAJzSr3CTpB/XvZ9vYbWQNkYkagKWmR9MUl0mBZPwnao6TvQ5SaLMBXyFJ nMUQ== X-Gm-Message-State: AJaThX41eD5TzeSqLs5Q4NO5oBdMvzLO22X2nrx+wNFm7qLBOaO9aTaN aUQWbt/sEcnvDn2pfazrJr9HOw== X-Google-Smtp-Source: AGs4zMYlOoEitUbPQKTdpldcLfB0xj05zR7Gt0oVJNhp5c85Q69EvujyWtvMyHAdEFGhwksSHAiROQ== X-Received: by 10.80.136.124 with SMTP id c57mr11198808edc.191.1512024558441; Wed, 29 Nov 2017 22:49:18 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:18fb:3267:4d37:78c7? (p200300EA8BC0E40018FB32674D3778C7.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:18fb:3267:4d37:78c7]) by smtp.googlemail.com with ESMTPSA id j3sm2612596edh.55.2017.11.29.22.49.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 22:49:18 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 2/7] eeprom: at24: consider that SERIAL and MAC flags imply read-only To: Bartosz Golaszewski Cc: "linux-i2c@vger.kernel.org" References: Message-ID: Date: Thu, 30 Nov 2017 07:49:00 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Flags AT24_FLAG_SERIAL and AT24_FLAG_MAC imply read-only. Therefore handle this in the code instead of specifying AT24_FLAG_READONLY in the config data in these cases. Signed-off-by: Heiner Kallweit --- drivers/misc/eeprom/at24.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index c75bb9b45..90fefd1cf 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -131,38 +131,29 @@ static const struct i2c_device_id at24_ids[] = { { "24c00", AT24_DEVICE_MAGIC(128 / 8, AT24_FLAG_TAKE8ADDR) }, /* old variants can't be handled with this generic entry! */ { "24c01", AT24_DEVICE_MAGIC(1024 / 8, 0) }, - { "24cs01", AT24_DEVICE_MAGIC(16, - AT24_FLAG_SERIAL | AT24_FLAG_READONLY) }, + { "24cs01", AT24_DEVICE_MAGIC(16, AT24_FLAG_SERIAL) }, { "24c02", AT24_DEVICE_MAGIC(2048 / 8, 0) }, - { "24cs02", AT24_DEVICE_MAGIC(16, - AT24_FLAG_SERIAL | AT24_FLAG_READONLY) }, - { "24mac402", AT24_DEVICE_MAGIC(48 / 8, - AT24_FLAG_MAC | AT24_FLAG_READONLY) }, - { "24mac602", AT24_DEVICE_MAGIC(64 / 8, - AT24_FLAG_MAC | AT24_FLAG_READONLY) }, + { "24cs02", AT24_DEVICE_MAGIC(16, AT24_FLAG_SERIAL) }, + { "24mac402", AT24_DEVICE_MAGIC(48 / 8, AT24_FLAG_MAC) }, + { "24mac602", AT24_DEVICE_MAGIC(64 / 8, AT24_FLAG_MAC) }, /* spd is a 24c02 in memory DIMMs */ { "spd", AT24_DEVICE_MAGIC(2048 / 8, AT24_FLAG_READONLY | AT24_FLAG_IRUGO) }, { "24c04", AT24_DEVICE_MAGIC(4096 / 8, 0) }, - { "24cs04", AT24_DEVICE_MAGIC(16, - AT24_FLAG_SERIAL | AT24_FLAG_READONLY) }, + { "24cs04", AT24_DEVICE_MAGIC(16, AT24_FLAG_SERIAL) }, /* 24rf08 quirk is handled at i2c-core */ { "24c08", AT24_DEVICE_MAGIC(8192 / 8, 0) }, - { "24cs08", AT24_DEVICE_MAGIC(16, - AT24_FLAG_SERIAL | AT24_FLAG_READONLY) }, + { "24cs08", AT24_DEVICE_MAGIC(16, AT24_FLAG_SERIAL) }, { "24c16", AT24_DEVICE_MAGIC(16384 / 8, 0) }, - { "24cs16", AT24_DEVICE_MAGIC(16, - AT24_FLAG_SERIAL | AT24_FLAG_READONLY) }, + { "24cs16", AT24_DEVICE_MAGIC(16, AT24_FLAG_SERIAL) }, { "24c32", AT24_DEVICE_MAGIC(32768 / 8, AT24_FLAG_ADDR16) }, { "24cs32", AT24_DEVICE_MAGIC(16, AT24_FLAG_ADDR16 | - AT24_FLAG_SERIAL | - AT24_FLAG_READONLY) }, + AT24_FLAG_SERIAL) }, { "24c64", AT24_DEVICE_MAGIC(65536 / 8, AT24_FLAG_ADDR16) }, { "24cs64", AT24_DEVICE_MAGIC(16, AT24_FLAG_ADDR16 | - AT24_FLAG_SERIAL | - AT24_FLAG_READONLY) }, + AT24_FLAG_SERIAL) }, { "24c128", AT24_DEVICE_MAGIC(131072 / 8, AT24_FLAG_ADDR16) }, { "24c256", AT24_DEVICE_MAGIC(262144 / 8, AT24_FLAG_ADDR16) }, { "24c512", AT24_DEVICE_MAGIC(524288 / 8, AT24_FLAG_ADDR16) }, @@ -556,6 +547,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) chip.context = NULL; } + /* both flags imply read-only */ + if (chip.flags & AT24_FLAG_SERIAL || chip.flags & AT24_FLAG_MAC) + chip.flags |= AT24_FLAG_READONLY; + if (!is_power_of_2(chip.byte_len)) dev_warn(&client->dev, "byte_len looks suspicious (no power of 2)!\n");