From patchwork Wed Sep 30 17:53:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Leedom X-Patchwork-Id: 524514 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D14D1140D4D for ; Thu, 1 Oct 2015 03:53:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932628AbbI3Rxy (ORCPT ); Wed, 30 Sep 2015 13:53:54 -0400 Received: from stargate.chelsio.com ([67.207.112.58]:14488 "EHLO stargate.chelsio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753272AbbI3Rxx convert rfc822-to-8bit (ORCPT ); Wed, 30 Sep 2015 13:53:53 -0400 Received: from nice.asicdesigners.com (nice.asicdesigners.com [10.192.160.7]) by stargate.chelsio.com (8.13.8/8.13.8) with ESMTP id t8UHrqUE005586; Wed, 30 Sep 2015 10:53:52 -0700 Received: from NICE.asicdesigners.com ([fe80::51b2:ba95:9d72:babc]) by nice.asicdesigners.com ([fe80::51b2:ba95:9d72:babc%15]) with mapi id 14.03.0123.003; Wed, 30 Sep 2015 10:53:51 -0700 From: Casey Leedom To: Hariprasad S , "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Nirranjan Kirubaharan , Hariprasad S Subject: RE: [PATCHv2 net-next 2/4] cxgb4: For T4, don't read the Firmware Mailbox Control register Thread-Topic: [PATCHv2 net-next 2/4] cxgb4: For T4, don't read the Firmware Mailbox Control register Thread-Index: AQHQ+5EUpBiZqxlygUmr/e+a4iZbd55VWn2y Date: Wed, 30 Sep 2015 17:53:50 +0000 Message-ID: <4985EFDD773FCB459EF7915D2A3621AD93BB822C@nice.asicdesigners.com> References: <1443625411-12096-1-git-send-email-hariprasad@chelsio.com>, <1443625411-12096-3-git-send-email-hariprasad@chelsio.com> In-Reply-To: <1443625411-12096-3-git-send-email-hariprasad@chelsio.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [67.207.112.58] MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hari, I think you missed the corresponding change that's needed for the const char *owner[] array. You need to add an "" entry so the index of "4" makes sense. Casey diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c index 0a87a32..8001619 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c @@ -1134,12 +1134,20 @@ static int mbox_show(struct seq_file *seq, void *v) unsigned int mbox = (uintptr_t)seq->private & 7; struct adapter *adap = seq->private - mbox; void __iomem *addr = adap->regs + PF_REG(mbox, CIM_PF_MAILBOX_DATA_A); - unsigned int ctrl_reg = (is_t4(adap->params.chip) - ? CIM_PF_MAILBOX_CTRL_A - : CIM_PF_MAILBOX_CTRL_SHADOW_COPY_A); - void __iomem *ctrl = adap->regs + PF_REG(mbox, ctrl_reg); - i = MBOWNER_G(readl(ctrl)); + /* For T4 we don't have a shadow copy of the Mailbox Control register. + * And since reading that real register causes a side effect of + * granting ownership, we're best of simply not reading it at all. + */ + if (is_t4(adap->params.chip)) { + i = 4; /* index of "" */ + } else { + unsigned int ctrl_reg = CIM_PF_MAILBOX_CTRL_SHADOW_COPY_A; + void __iomem *ctrl = adap->regs + PF_REG(mbox, ctrl_reg); + + i = MBOWNER_G(readl(ctrl)); + } + seq_printf(seq, "mailbox owned by %s\n\n", owner[i]); for (i = 0; i < MBOX_LEN; i += 8)