Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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>,
        Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
        Don Skidmore <donald.c.skidmore@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 v2 1/1] ixgbe: correct SDP0 check of SFP cage for X550
Date:   Mon, 25 Apr 2022 09:17:57 -0400
Message-Id: <20220425131758.4749-1-jeffd@silicom-usa.com>
In-Reply-To: <20220420205130.23616-1-jeffd@silicom-usa.com>
References: <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?INlnzVpyJCreRSGX2C/k5slSnGGPbboxRafVpVYkymPWQZe0ddT4d5LQ2i/L?=
 =?us-ascii?Q?MRgm4RGhe3IwIni/qZiWoJTulehtdS6YTxW4tIK5Ovrzhbz/nwzOYX9+M1+G?=
 =?us-ascii?Q?x30dLBMgNTIoCuHLXiU3kUTFzhFaFRIRdZsJ0GB/DGqEefF7X1vkdI63zkFB?=
 =?us-ascii?Q?ruD0tpqeIYFVMb+bzwNRKW4K8D6PpNLfVIfL111fSBELDmsJfblWuQoX845s?=
 =?us-ascii?Q?E5pgeFGCVmGCGrdwDhPPCx8cF5J0fx1p9ek2OD1xWDE0cL6PtXkUFn3vPD+R?=
 =?us-ascii?Q?EFoRp0laQVEONhtaIvTt8NvhMD1K/FV3dVUTYu/pNbFKvKAGbjCbRjGeypB4?=
 =?us-ascii?Q?yLm/CLiOQHeTmt8M3My0k2ap4tNrfPUSmEKivARhSzn8Tn6Pd+d5SbjpmDjC?=
 =?us-ascii?Q?0hAjRK63LCbSofeD0SCxeG4bbLyeQre8Ivh0Qq2HwQshh2h/1XI3bVwqooQv?=
 =?us-ascii?Q?BXfb/kcdsbaoozrzkFKQExlpuSqtprUPjepeGwL2B7g/jASxJ/vYztmgbrmM?=
 =?us-ascii?Q?nNDoULCaSyIJk5AyGZRIZHcBzJdo7tPjgxtJBpifDOJnbPD3SzUuJsRjbxQ3?=
 =?us-ascii?Q?vwmZR55adw1krP7eqVR72xVZSRKoGKMuF0bbISkoKSFDH+kyoMaLy4kc5/R9?=
 =?us-ascii?Q?hW7iQ062UTqV/dOTa5bsoI3jSzMEUXoTvciLXml4sbI3eH+F85YFeHccjhy7?=
 =?us-ascii?Q?D9x+lbxWaAsf7REG/1NnCDtFp98B7xDROoMSAVd6OLMlSASi2H+Gaf1m8ayb?=
 =?us-ascii?Q?znOVKghFOVTh+aJO/gmbgft/psAPJn8ydr0UKmad6pj3gf/O8UwzeZAmUnRq?=
 =?us-ascii?Q?zk48PloErFSA0X6HE2RlQ2mKAg5tlgnJgc0zDPbCCgHG0qZz9CIaQdt0ejyO?=
 =?us-ascii?Q?7mmESfdCCI2wa7/7+FMI0gIAiKc/b0ebkgbJj65YjUrZ802c40yMCagliE0r?=
 =?us-ascii?Q?hRQ/x1u5fWBb/RcgxuNaFf9FkzsKfkmxJNz+H0L4+vGrSYOR/tDZotiNzKpx?=
 =?us-ascii?Q?sF4Kbt/KCvW5KwlJpxH68Z+OV2cu25b5LFTsPRJPJeOvy0zjmdhU/Dtrp/cG?=
 =?us-ascii?Q?pfJvC6ma8i5AD6V9yuOzKJHfRY9F6DySG5sUFKLIm4017HZBThaT8+E6jmhN?=
 =?us-ascii?Q?DYMig6XuBSdGStZoZ74By5P9IMrHRCWPfGGyVAjyJwfdY3EKI5+cSW/5LlHe?=
 =?us-ascii?Q?WG6zTVtY2VsbH/Gd4gGnfc4muCZhvA7eyodcjEQS3p7XsZqGYAH/Ix5+V3M5?=
 =?us-ascii?Q?b6lNkbrWxezRdo5fgtbh3EcFGYxoQvQEjDn29y7skzM76bK1q0pNpj95+eth?=
 =?us-ascii?Q?XGR8qBM74A0Iaa3VkELVl0jUr18fR3mJpNMrl3d8eg9OkmQ4JEL0nFIWpX04?=
 =?us-ascii?Q?LIruAMri0K8Jzo/DfKxYa5zdXjG9BawZ2BOAu0VEDlgZmfpKXGLAoCsKUEe4?=
 =?us-ascii?Q?Z2YX5+5M8Y4zAeONMugErnfGC2oNVsiD6UF16CpTOnge9v2ImJ8yPjvX153c?=
 =?us-ascii?Q?EbUgEuokymbJr0H3WsYGPJUoSPHz5AusXHqTDo4eTLwj6zbMEriy8RbKU/9R?=
 =?us-ascii?Q?qM/anH8yBr9E2nspLrFmxGYHwYjjktmcB8s3q9gO1DO/TBRu7an9HGGXR36+?=
 =?us-ascii?Q?spfoxlh5vtb3bwNteHkVh62jKfU3olfkAoR/RJvlllmvwOTlS+UhrINKO/b9?=
 =?us-ascii?Q?CL2H9G5K422Rt4cHTGgrJ0vBARx/0BAITl6ijxHerZXj/66i6X9ifzBn+a9g?=
 =?us-ascii?Q?JcHCZuJstg=3D=3D?=
X-OriginatorOrg: silicom-usa.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 24a8bb92-af3a-4bae-1642-08da26be10ea
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3517.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2022 13:18:19.7795
 (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: 30UKRvPFan6L4yMgog+IEnKlZ3ShL5y+M6hnw6ph4wYSWVbHm9maMk0OqNdp+aVsyeswV9U7tFutBSpsfPyTuQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2856
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 4c26c4b92f07..13482d4e24e2 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -3299,17 +3299,17 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
 	 * the SFP+ cage is full.
 	 */
 	if (ixgbe_need_crosstalk_fix(hw)) {
-		u32 sfp_cage_full;
+		bool sfp_cage_full;
 
 		switch (hw->mac.type) {
 		case ixgbe_mac_82599EB:
-			sfp_cage_full = IXGBE_READ_REG(hw, IXGBE_ESDP) &
-					IXGBE_ESDP_SDP2;
+			sfp_cage_full = !!(IXGBE_READ_REG(hw, IXGBE_ESDP) &
+					   IXGBE_ESDP_SDP2);
 			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