From patchwork Thu Dec 21 21:40:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Greenwalt X-Patchwork-Id: 1879477 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256 header.s=default header.b=pq5IN3qX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Sx3x763JSz1ydb for ; Fri, 22 Dec 2023 08:49:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8713942495; Thu, 21 Dec 2023 21:49:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8713942495 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1703195367; bh=a79CPSayfRLiBXQiSmQ6d076ZemIrMdQY/Vy+do/x/Y=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=pq5IN3qXxhEZBfgxN4WoKkajMG6e72i7jZ3yh4+yv6coRuRsipuiAUJoCLaHJVAIu 2iP8Dji0CI8tz8lKGihJgRgYYgkEJ58ufDt7VIyypRrKMXVDS51Iqsqgz2rieh+bxj NjeP2UFIxRErHAYopbhDu/MIF9p5tp6sdLYrQt5oZlr7aeb2Rwmdndg4eW0tgLgnXc ZENFk9BWrp2vAL02yeltyIMx8bSGCpvjB4KjrO8Fc+a5zHAuwDSttAEFE5XTNXukT6 lYlsRvE3b66f6tka7TIiW/MoPhkY4JK+MUK4fJWkhyueJ6vH4kX5hI21WWSnBg33f6 PAfXSpEtXIVjA== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5Ao5V9nVGkcj; Thu, 21 Dec 2023 21:49:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 95BBF4255B; Thu, 21 Dec 2023 21:49:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 95BBF4255B X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 074D11BF334 for ; Thu, 21 Dec 2023 21:49:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id CD82483DC0 for ; Thu, 21 Dec 2023 21:49:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CD82483DC0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HdfMw-Nhml53 for ; Thu, 21 Dec 2023 21:49:23 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by smtp1.osuosl.org (Postfix) with ESMTPS id 454AC83DBF for ; Thu, 21 Dec 2023 21:49:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 454AC83DBF X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="14724087" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="14724087" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 13:48:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="1024005690" X-IronPort-AV: E=Sophos;i="6.04,294,1695711600"; d="scan'208";a="1024005690" Received: from unknown (HELO fedora.jf.intel.com) ([10.166.244.154]) by fmsmga006.fm.intel.com with ESMTP; 21 Dec 2023 13:48:52 -0800 From: Paul Greenwalt To: intel-wired-lan@lists.osuosl.org Date: Thu, 21 Dec 2023 16:40:28 -0500 Message-ID: <20231221214028.515105-1-paul.greenwalt@intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703195363; x=1734731363; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JREO8RE9vFCcs1nhDjz+9vcqs24v4V3v5yspsKfHJpo=; b=ia/sOvmSqlvCeC+d9tGozuMlb1b1essh99xMIAYQAQF++KLSf9ktLEdT An4bYmMCbGUQQb4lJdMJtucpMiiQCtRDO3LMVW5t3GyzjaIhIdmOtlHkO ei97ImHHc5fdsbV8Qzb9JDKmRyIBIa74FRHHj8dY+jegC8tLSoYOjWwnC EpxtKuEgHgV0MYylNuK3/S9G/nck31qZholQezOFVrXtSgYdHz+GhW5Wc Scht72X8kdN2RlSaL/IiJ5YonlN6boqNqy6KM9r/eI8TwSQ0lJgEddhQR hfYdxN5W0yGRK5rlhEsYAIp0WhEjTGhuC38iSLp5jUmmWfZ0DbSeoL67y g==; X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=ia/sOvmS Subject: [Intel-wired-lan] [PATCH iwl-net] ice: fix Get link status data length X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Przemek Kitszel , Paul Greenwalt Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Get link status version 2 (opcode 0x0607) is returning an error because FW expects a data length of 56 bytes, and this is causing the driver to fail probe. Update the get link status version 2 data length to 56 bytes by adding 5 byte reserved5 field to the end of struct ice_aqc_get_link_status_data and passing it as parameter to offsetofend() to the fix error. Fixes: 2777d24ec6d1 ("ice: Add ice_get_link_status_datalen") Reviewed-by: Przemek Kitszel Signed-off-by: Paul Greenwalt Tested-by: Pucha Himasekhar Reddy (A Contingent worker at Intel) --- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h index d7fdb7ba7268..fbd5d92182d3 100644 --- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h @@ -1359,8 +1359,9 @@ struct ice_aqc_get_link_status_data { u8 lp_flowcontrol; #define ICE_AQ_LINK_LP_PAUSE_ADV BIT(0) #define ICE_AQ_LINK_LP_ASM_DIR_ADV BIT(1) + u8 reserved5[5]; #define ICE_AQC_LS_DATA_SIZE_V2 \ - offsetofend(struct ice_aqc_get_link_status_data, lp_flowcontrol) + offsetofend(struct ice_aqc_get_link_status_data, reserved5) } __packed; /* Set event mask command (direct 0x0613) */