From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1DC7C64E7C for ; Wed, 2 Dec 2020 13:46:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52851208FE for ; Wed, 2 Dec 2020 13:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728038AbgLBNpr (ORCPT ); Wed, 2 Dec 2020 08:45:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46875 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbgLBNpq (ORCPT ); Wed, 2 Dec 2020 08:45:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606916659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wEbKnSjxCaf9CbaUIkfb6cxIFH129KXOzMycHrm3saE=; b=OrmHfdkrnocpUfB0TKeMmws5zE2/APhdZLlTdttt/SrwLusFa1vL9sXL61hOrYi8FLutyj nE4M8bGKdAGGFLszyZvi/W4y3py0DSXAht7of10qat4EaaTYs0+Q5u9ew1Lo3p6JG/4/I7 cWAdJW25sygBDnC5nuijVmUfn7zO+0g= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-448-Y5T6HqJ7Pu2-yYt1wbkJdg-1; Wed, 02 Dec 2020 08:44:16 -0500 X-MC-Unique: Y5T6HqJ7Pu2-yYt1wbkJdg-1 Received: by mail-qt1-f200.google.com with SMTP id n12so1411897qta.9 for ; Wed, 02 Dec 2020 05:44:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=wEbKnSjxCaf9CbaUIkfb6cxIFH129KXOzMycHrm3saE=; b=UaoQ6ipMAXVL24Z2qv3YznEilJT6X/uCpkqADBdlU5cBeOy0l4HIznBGF4qEIoNyS2 3o8UaKIjF1wxTRJ/KVV0Y3uqaTlnAXZ8Q/LyRWG28DvCnT0uhDszKUGGibfAUuG9qtco fsgtWfISM/s50DfNRUWSs4tBj+IdBffbvJIZoTpC+LwSVVeZ3YRzHDeAmLGJTFRhet4A se1OVu+QBvSMJmJSlAAtRpYQlCJgXCghiX34G8VA9tzu2bwtSA7b50BVxH76t9fn6q+W pbr0zHU29Dnyf1HqturvYVOvwX/MDndPtmvalQODq6G3DFVRJe5pkbsRw5++4+b/9DFG 7SrQ== X-Gm-Message-State: AOAM531yyHHZFz7XItv6AKJyt6MXfN1l3vnMSDspft9o6ir49WCbUdqh 7o99kW7fU2A0nQMZKeMk7G7pqN1iT5a7t+ExB7Sj/7DoZb7qJxeDhgpzj19LEAh5XjHzz4Mycfo v+xWZnfNnpLo1++Bq2JHoASKn X-Received: by 2002:ac8:5653:: with SMTP id 19mr2764259qtt.136.1606916656091; Wed, 02 Dec 2020 05:44:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPgjL3lN8GE4sTttE410jeAXf+ZMywrRPj/mfx+P/Qnj33YhkGkzEA2Tm/Yyfzo7HqueaevA== X-Received: by 2002:ac8:5653:: with SMTP id 19mr2764235qtt.136.1606916655746; Wed, 02 Dec 2020 05:44:15 -0800 (PST) Received: from trix.remote.csb (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id c14sm1643844qko.29.2020.12.02.05.44.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Dec 2020 05:44:15 -0800 (PST) Subject: Re: [PATCH v1 1/1] mfd: intel-m10-bmc: expose mac address and count To: Russ Weight , lee.jones@linaro.org, linux-kernel@vger.kernel.org Cc: lgoncalv@redhat.com, yilun.xu@intel.com, hao.wu@intel.com, matthew.gerlach@intel.com References: <20201201203646.200907-1-russell.h.weight@intel.com> <20201201203646.200907-2-russell.h.weight@intel.com> From: Tom Rix Message-ID: Date: Wed, 2 Dec 2020 05:44:13 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: <20201201203646.200907-2-russell.h.weight@intel.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/1/20 12:36 PM, Russ Weight wrote: > Create two sysfs entries for exposing the MAC address > and count from the MAX10 BMC register space. > > Signed-off-by: Russ Weight > Signed-off-by: Xu Yilun > --- > .../ABI/testing/sysfs-driver-intel-m10-bmc | 20 +++++++++ > drivers/mfd/intel-m10-bmc.c | 43 +++++++++++++++++++ > include/linux/mfd/intel-m10-bmc.h | 9 ++++ > 3 files changed, 72 insertions(+) > > diff --git a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc > index 979a2d62513f..c4febaefe0a7 100644 > --- a/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc > +++ b/Documentation/ABI/testing/sysfs-driver-intel-m10-bmc > @@ -13,3 +13,23 @@ Contact: Xu Yilun > Description: Read only. Returns the firmware version of Intel MAX10 > BMC chip. > Format: "0x%x". > + > +What: /sys/bus/spi/devices/.../mac_address > +Date: December 2020 > +KernelVersion: 5.11 > +Contact: Russ Weight > +Description: Read only. Returns the base mac address assigned to > + the board managed by the Intel MAX10 BMC. It is > + stored in flash and is mirrored in the MAX10 BMC > + register space. > + Format: "%02x:%02x:%02x:%02x:%02x:%02x". > + > +What: /sys/bus/spi/devices/.../mac_count > +Date: December 2020 > +KernelVersion: 5.11 > +Contact: Russ Weight > +Description: Read only. Returns the number of mac addresses > + assigned to the board managed by the Intel MAX10 > + BMC. This value is stored in flash and is mirrored > + in the MAX10 BMC register space. > + Format: "%u". > diff --git a/drivers/mfd/intel-m10-bmc.c b/drivers/mfd/intel-m10-bmc.c > index b84579b7b4f0..90720e84900e 100644 > --- a/drivers/mfd/intel-m10-bmc.c > +++ b/drivers/mfd/intel-m10-bmc.c > @@ -60,9 +60,52 @@ static ssize_t bmcfw_version_show(struct device *dev, > } > static DEVICE_ATTR_RO(bmcfw_version); > > +static ssize_t mac_address_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct intel_m10bmc *max10 = dev_get_drvdata(dev); > + unsigned int macaddr1, macaddr2; > + int ret; > + > + ret = m10bmc_sys_read(max10, M10BMC_MACADDR1, &macaddr1); > + if (ret) > + return ret; > + > + ret = m10bmc_sys_read(max10, M10BMC_MACADDR2, &macaddr2); > + if (ret) > + return ret; > + The mac_count implies there are more than 1 mac address. This logic looks like could only do one. How are the 2nd, 3rd  etc. mac addresses found ? > + return sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x\n", > + (u8)FIELD_GET(M10BMC_MAC_BYTE1, macaddr1), > + (u8)FIELD_GET(M10BMC_MAC_BYTE2, macaddr1), > + (u8)FIELD_GET(M10BMC_MAC_BYTE3, macaddr1), > + (u8)FIELD_GET(M10BMC_MAC_BYTE4, macaddr1), > + (u8)FIELD_GET(M10BMC_MAC_BYTE5, macaddr2), > + (u8)FIELD_GET(M10BMC_MAC_BYTE6, macaddr2)); consider using sysfs_emit over sprintf Tom > +} > +static DEVICE_ATTR_RO(mac_address); > + > +static ssize_t mac_count_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct intel_m10bmc *max10 = dev_get_drvdata(dev); > + unsigned int macaddr2; > + int ret; > + > + ret = m10bmc_sys_read(max10, M10BMC_MACADDR2, &macaddr2); > + if (ret) > + return ret; > + > + return sprintf(buf, "%u\n", > + (u8)FIELD_GET(M10BMC_MAC_COUNT, macaddr2)); > +} > +static DEVICE_ATTR_RO(mac_count); > + > static struct attribute *m10bmc_attrs[] = { > &dev_attr_bmc_version.attr, > &dev_attr_bmcfw_version.attr, > + &dev_attr_mac_address.attr, > + &dev_attr_mac_count.attr, > NULL, > }; > ATTRIBUTE_GROUPS(m10bmc); > diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h > index c8ef2f1654a4..2279e34f0814 100644 > --- a/include/linux/mfd/intel-m10-bmc.h > +++ b/include/linux/mfd/intel-m10-bmc.h > @@ -15,6 +15,15 @@ > > /* Register offset of system registers */ > #define NIOS2_FW_VERSION 0x0 > +#define M10BMC_MACADDR1 0x10 > +#define M10BMC_MAC_BYTE4 GENMASK(7, 0) > +#define M10BMC_MAC_BYTE3 GENMASK(15, 8) > +#define M10BMC_MAC_BYTE2 GENMASK(23, 16) > +#define M10BMC_MAC_BYTE1 GENMASK(31, 24) > +#define M10BMC_MACADDR2 0x14 > +#define M10BMC_MAC_BYTE6 GENMASK(7, 0) > +#define M10BMC_MAC_BYTE5 GENMASK(15, 8) > +#define M10BMC_MAC_COUNT GENMASK(23, 16) > #define M10BMC_TEST_REG 0x3c > #define M10BMC_BUILD_VER 0x68 > #define M10BMC_VER_MAJOR_MSK GENMASK(23, 16)