From patchwork Mon Dec 21 14:20:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christoph Lameter (Ampere)" X-Patchwork-Id: 7896011 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4FE9D9F318 for ; Mon, 21 Dec 2015 14:20:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67C5A2053D for ; Mon, 21 Dec 2015 14:20:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C0442055D for ; Mon, 21 Dec 2015 14:20:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750870AbbLUOUp (ORCPT ); Mon, 21 Dec 2015 09:20:45 -0500 Received: from resqmta-ch2-01v.sys.comcast.net ([69.252.207.33]:33131 "EHLO resqmta-ch2-01v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751040AbbLUOUm (ORCPT ); Mon, 21 Dec 2015 09:20:42 -0500 Received: from resomta-ch2-07v.sys.comcast.net ([69.252.207.103]) by resqmta-ch2-01v.sys.comcast.net with comcast id wEL21r0042EPM3101ELh6b; Mon, 21 Dec 2015 14:20:41 +0000 Received: from gentwo.org ([98.222.162.64]) by resomta-ch2-07v.sys.comcast.net with comcast id wELh1r0011PgSZ601ELhKA; Mon, 21 Dec 2015 14:20:41 +0000 Received: by gentwo.org (Postfix, from userid 1001) id 5C314704DC; Mon, 21 Dec 2015 08:20:39 -0600 (CST) Message-Id: <20151221142039.281989535@linux.com> Date: Mon, 21 Dec 2015 08:20:28 -0600 From: Christoph Lameter To: Hal Rosenstock Cc: "ira.weiny" , Hal Rosenstock Cc: dledford@redhat.com Cc: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH 2/3] Specify attribute_id in port_table_attribute References: <20151221142026.238104419@linux.com> Content-Disposition: inline; filename=0002-IB-core-counters-Specify-attribute_id-in-port_table_.patch DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1450707641; bh=IZLYzQPaTlOP/SniKhGj3lr9wN0oR0rOBVYVl0/5qno=; h=Received:Received:Received:Message-Id:Date:From:To:Subject: Content-Type; b=mdqE2braqYTKSo8FGgV55kEYx1AN0q/Bwdn3BGEDvA9CKiQN2WXx1twbFsT8fB7vS AkYCryIaMyLytxubsAahkKwdvfWrjQhg48uInUgdZ5unBalY8jMakOwIQKDcrzNVa1 auP7Fx+ZqKLpenuyuiirfHIA+BN5qZ76TSRaoi/qnLIwsFTPKI5tx1PieD1+lshVGD Fe9OC7IiFFoBAcwpwVplb2zwxihc/gviIFbd5QUPNmLwfUm3j0MVtGwlqCA00TcetI c5d7gI85LSppb/BJWy3eAxgrqv8pUzlN1iH0BHzrn19n6mcnolh4eEYxTD5+wNLg4d /ghThhqcdzU8A== Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the attr_id on port_table_attribute since we will have to add a different port_table_attribute for the extended attribute soon. Reviewed-by: Hal Rosenstock Signed-off-by: Christoph Lameter Reviewed-by: Ira Weiny --- drivers/infiniband/core/sysfs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index acefe85..34dcc23 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -39,6 +39,7 @@ #include #include +#include struct ib_port { struct kobject kobj; @@ -65,6 +66,7 @@ struct port_table_attribute { struct port_attribute attr; char name[8]; int index; + int attr_id; }; static ssize_t port_attr_show(struct kobject *kobj, @@ -314,7 +316,8 @@ static ssize_t show_port_pkey(struct ib_port *p, struct port_attribute *attr, #define PORT_PMA_ATTR(_name, _counter, _width, _offset) \ struct port_table_attribute port_pma_attr_##_name = { \ .attr = __ATTR(_name, S_IRUGO, show_pma_counter, NULL), \ - .index = (_offset) | ((_width) << 16) | ((_counter) << 24) \ + .index = (_offset) | ((_width) << 16) | ((_counter) << 24), \ + .attr_id = IB_PMA_PORT_COUNTERS , \ } /* @@ -376,7 +379,7 @@ static ssize_t show_pma_counter(struct ib_port *p, struct port_attribute *attr, ssize_t ret; u8 data[8]; - ret = get_perf_mad(p->ibdev, p->port_num, cpu_to_be16(0x12), &data, + ret = get_perf_mad(p->ibdev, p->port_num, tab_attr->attr_id, &data, 40 + offset / 8, sizeof(data)); if (ret < 0) return sprintf(buf, "N/A (no PMA)\n");