Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Jeff Daly <jeffd@silicom-usa.com>
To:     intel-wired-lan@osuosl.org
Cc:     Stephen Douthit <stephend@silicom-usa.com>,
        Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Tony Nguyen <anthony.l.nguyen@intel.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Don Skidmore <donald.c.skidmore@intel.com>,
        Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
        intel-wired-lan@lists.osuosl.org (moderated list:INTEL ETHERNET DRIVERS),
        netdev@vger.kernel.org (open list:NETWORKING DRIVERS),
        linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/1] ixgbe: correct SDP0 check of SFP cage for X550
Date:   Wed, 20 Apr 2022 16:51:30 -0400
Message-Id: <20220420205130.23616-1-jeffd@silicom-usa.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FAhNooq9rQjaTRX1oFwrACdrVekyyocNc1NJ3ZSLwUckDZRP2fv09qriSGR7?=
 =?us-ascii?Q?3h3MsNAF9elqtehJIMkgE5nEJpDrJKfjaZRFUiBAdqxgOosU19SKZq4460ZC?=
 =?us-ascii?Q?U2eTJmn5rLLEpptWc0sjKZHy1a5pFNFO/CMzPiduKpEamnmKWRMaogA55b8/?=
 =?us-ascii?Q?opYBcZ110SEM6k6JDHkMLi7SLIkV10r9URLRGg5YURsNURqHkev9ZpvrwFI6?=
 =?us-ascii?Q?ncFaJLCSFb9GSbLir+wl8Yg54vTdJ6F9HUXMaRFmfFpUy9nRBeluIo5581Lh?=
 =?us-ascii?Q?x0AQr3gS354/TFRhqtMNJsWS2HoJS6BTaZusIyTfs6SzmPvWlaUG6XsGz2nc?=
 =?us-ascii?Q?zAfcKFfhmfZyJd4jAFUZcclwgnr2jc67KZgmeEhYUqVDrEazRUjuBsyDOrac?=
 =?us-ascii?Q?UyvmqCrEiHtogypXedr90PaSDsDZ9g2bX084PXsiiVj5PM+f4yOxVimHwiVn?=
 =?us-ascii?Q?e8QTNx3Bsm720a/KWt+FEJM7+jgXF4p0ip6g9XtrMqMb066wn4Iuw5y3JfZh?=
 =?us-ascii?Q?u3pZNKsvuks7Zj2SoUJisyeHBPe23tv515a11hwQA4kjL3Mf5q7InuvL2vHU?=
 =?us-ascii?Q?Kjf49GehlIx0pMyFByjwiUtzIvw5rco6ZhrzfNGiO7ecNAEhuhtXBWq1k3tb?=
 =?us-ascii?Q?d8Q4CJpFnuDb8N+ulJYJo8INb0nUPf9Ik0Vm6/EnrxFrvik9Qg08OA+eX8F7?=
 =?us-ascii?Q?5f7BjJhskXI7azHsE0gAvRToNibPHi2rP6fElXRd6QDFOKgHnm4vprxxlc94?=
 =?us-ascii?Q?Sy4/H7SM8dia7iyg0WKWA+qH//xEoZ1FkF/oi1C9yrBHFplsTVeb5cKEHu5S?=
 =?us-ascii?Q?ZnUCanAiRlASQPfZJlcTfwNGNfh+NJzNSolQc81cXOkgNlk8wQBIj4o86zsy?=
 =?us-ascii?Q?rsqO1yzGC5Xj9zsC67THOD/v8cngBO8nsGFqs6sT4T42TFzfOuksA+Tr07WU?=
 =?us-ascii?Q?bY+G18obz6CD8gY5tNGhUlbYywAz544+ZUXXXTYhD7fOoNUzKSZGnIs45DRy?=
 =?us-ascii?Q?p+MqF9Kt6eaQYxGXQ8e/aH5M4Oku32VQw9JhKUYvGAYCUNwc/xLdvCaql4Im?=
 =?us-ascii?Q?PqTLSOMMdKb1Oa0xFa1wUpDYHOYcnUqrNWiV8Twbv2xhgxvB7QaPp1FkPT8k?=
 =?us-ascii?Q?vp6Bq3J2yyjPLxRY1SCAlyvK88se7W8PalHvVRd86X0DDJPLpVoASYr8UmUB?=
 =?us-ascii?Q?ON+FrehAngLQrLsRkfZxqx9hqmsosZbJABbF4ZtFToChgN/pJtZ5T+W2k/jf?=
 =?us-ascii?Q?m4ADRnc0dX+DRxEKoVPsYJQoVivKBhQuzcO2McBwlS5t+H2X6A0vadzZQmUe?=
 =?us-ascii?Q?cGxnRPXj1+xatwh32SfBpr70yHjxq7sQw+l5zj5ITOHsgicsouqguQiH5az5?=
 =?us-ascii?Q?46wbbAZ1a960cyMwTpT9anw9TuQiENbe7+FEXfgLBz8ALjC39boT1jfxRvOm?=
 =?us-ascii?Q?yLadWqVV4CAfytTcBnSjbCJ1mWlzbcanRQoF/Dh56oWGcVRJvPc57TY3yaA+?=
 =?us-ascii?Q?Plo0oPM3F2Fj3ra2nejF775vf5pUvADAVb4nDoW6veq1xfjgwGPrCyaI0uPn?=
 =?us-ascii?Q?JxneZuW6n5La47Dc6E0KTAuYRsqwV6GPhFuZcsH1YC2VmpajHQfAQIHHSi28?=
 =?us-ascii?Q?QlFo6D+fhEZ3CLT0Sv5t7DxZcNH1VtCpxRxSe8E7iw4J0UWV32dYX6ONddF+?=
 =?us-ascii?Q?vicOA1ljx7m92o3VY6CN6QRkz6RmJkL9mjyHPu6qtG/uqGv2k9D9gDYHBUQE?=
 =?us-ascii?Q?JrVbvL4jiw=3D=3D?=
X-OriginatorOrg: silicom-usa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: df23258d-0d95-46b7-b96f-08da230f9402
X-MS-Exchange-CrossTenant-AuthSource: AM0PR0402MB3506.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2022 20:51:44.3534
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: c9e326d8-ce47-4930-8612-cc99d3c87ad1
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zvxcMskD6CkHDN54sodZKERmF6DXmDsgzBc4FZOFSH5kBE8PveQJC14hp3+lDFoU46hfpWdoUytx5JSf93jrBQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8647
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE,
	SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

SDP0 for X550 NICs is active low to indicate the presence of an SFP in the
cage (MOD_ABS#).  Invert the results of the logical AND to set
sfp_cage_full variable correctly.

Fixes: aac9e053f104 ("ixgbe: cleanup crosstalk fix")

Suggested-by: Stephen Douthit <stephend@silicom-usa.com>
Signed-off-by: Jeff Daly <jeffd@silicom-usa.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 4c26c4b92f07..26d16bc85c59 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -3308,8 +3308,8 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
 			break;
 		case ixgbe_mac_X550EM_x:
 		case ixgbe_mac_x550em_a:
-			sfp_cage_full = IXGBE_READ_REG(hw, IXGBE_ESDP) &
-					IXGBE_ESDP_SDP0;
+			sfp_cage_full = !(IXGBE_READ_REG(hw, IXGBE_ESDP) &
+					IXGBE_ESDP_SDP0);
 			break;
 		default:
 			/* sanity check - No SFP+ devices here */
-- 
2.25.1