From patchwork Wed Dec 5 20:57:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 203953 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 E78362C00EC for ; Thu, 6 Dec 2012 07:58:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964818Ab2LEU5y (ORCPT ); Wed, 5 Dec 2012 15:57:54 -0500 Received: from mail-ye0-f202.google.com ([209.85.213.202]:63434 "EHLO mail-ye0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964819Ab2LEU5w (ORCPT ); Wed, 5 Dec 2012 15:57:52 -0500 Received: by mail-ye0-f202.google.com with SMTP id l7so677654yen.1 for ; Wed, 05 Dec 2012 12:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=MTsTBq7jnBNK6b6c45JNZO4kqbeaLoZXOps2O+AoLRg=; b=BC3xjJHqGqt/Ky9FMLtoghXnTpPfvaIuhf+Rb4fpQB7kZbcAYFDGdCuafiIw2B0S0D y1BPFd/dt77gebwLJDzAN3qZ2ZxUDB8L7FxPiIcPEqIPsaumMae6YBFoaI4aioU1grVR SHUvywwCvboEYlseKrl52bJYIJGSPnmU4nSk/B5o7AWkeJwm+PgP+2KqdM/ElKSVuIRo Jn4Qn4LUa3pPUAuN8UcJfvmaaS9DIT3BA8xwiJBZNVxNGKhh4o0geQgyPTKjMt9MRwdS oRPEuhZwu2ZCs1T6H612SaEx9mgnZjWZgyn8m9Zo9xnmRlAXTsxubHPf6nytbhPMlOX4 NylQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=MTsTBq7jnBNK6b6c45JNZO4kqbeaLoZXOps2O+AoLRg=; b=g9dyT3DWLQuEN0jAPU5qnkuAJYqpCUpjECSqAJ4k2c45d0Uiwz3TDsC/8157Q7wvV4 lmVcSaHYJKu1SpVgcvoQzhfKWvwzPJwGKdQ8VkRKXW5sSDwM1Jb9mVG49SdubRajD/mF fI5Wu0WeZUQYuuPXCVtAYIOFHLDQB9MtgzqtPtbFFtBqXP92qt/YUWPIikTieTzvqynm c4cYU4KY+2qE+KFpSgZK+HpW9WjOtUjEdys6MLHa2tdkdf4m4y5jumk8QsNjC60Ud5ve q4/EeRwn23b6ynmxrviILHoCEsx0v136sPBwEb2gzRRWeojjOLZFEmuoDRw17EKSsiHO UCAg== Received: by 10.236.149.111 with SMTP id w75mr12064567yhj.27.1354741071332; Wed, 05 Dec 2012 12:57:51 -0800 (PST) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id j36si250655anp.0.2012.12.05.12.57.51 (version=TLSv1/SSLv3 cipher=AES128-SHA); Wed, 05 Dec 2012 12:57:51 -0800 (PST) Received: from bhelgaas.mtv.corp.google.com (bhelgaas.mtv.corp.google.com [172.17.131.112]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id 2D032100047; Wed, 5 Dec 2012 12:57:51 -0800 (PST) Received: from bhelgaas.mtv.corp.google.com (unknown [IPv6:::1]) by bhelgaas.mtv.corp.google.com (Postfix) with ESMTP id DDB64180280; Wed, 5 Dec 2012 12:57:50 -0800 (PST) Subject: [PATCH 06/12] cxgb3: Use standard #defines for PCIe Capability ASPM fields To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: netdev@vger.kernel.org, Divy Le Ray Date: Wed, 05 Dec 2012 13:57:50 -0700 Message-ID: <20121205205750.13851.10893.stgit@bhelgaas.mtv.corp.google.com> In-Reply-To: <20121205205724.13851.50508.stgit@bhelgaas.mtv.corp.google.com> References: <20121205205724.13851.50508.stgit@bhelgaas.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQl31LSQnlrqzCXwLtN1T9Jr1kqRpT8f8ULWy/aDA2rchTPGgrL8JcNs8ncc/TEeZkX9jUUVEshCF0hfjtkVrZ7uhzQrTtV9WcebZo0iHeuBljLEeNsCR0Jrx5COr94PXtQSpC8q6MzfBnyZtAiD9jxV0WMK1GAtAPxYyV2H69glgwHxNS7yOPQbgyXwgu4SleKlf9J7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the standard #defines rather than bare numbers for PCIe Capability ASPM fields. Signed-off-by: Bjorn Helgaas CC: Divy Le Ray CC: netdev@vger.kernel.org Acked-by: David S. Miller --- drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c index aef45d3..3dee686 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c @@ -3307,7 +3307,7 @@ static void config_pcie(struct adapter *adap) G_NUMFSTTRNSEQRX(t3_read_reg(adap, A_PCIE_MODE)); log2_width = fls(adap->params.pci.width) - 1; acklat = ack_lat[log2_width][pldsize]; - if (val & 1) /* check LOsEnable */ + if (val & PCI_EXP_LNKCTL_ASPM_L0S) /* check LOsEnable */ acklat += fst_trn_tx * 4; rpllmt = rpl_tmr[log2_width][pldsize] + fst_trn_rx * 4;