From patchwork Thu Oct 3 09:21:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arkadiusz Kubalewski X-Patchwork-Id: 1992269 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=sQpZ/pn4; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4XK5rp0XQVz1xtk for ; Thu, 3 Oct 2024 19:26:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 6189760748; Thu, 3 Oct 2024 09:25:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id EWljMwg5rAMm; Thu, 3 Oct 2024 09:25:56 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 09FB460743 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1727947556; bh=KuYT4Ap1AhFXPW8q2RqEQk/UO6MvelSgssHSN4cjGJo=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=sQpZ/pn4lB0qKi3mT4X5CfcZXoTZq/qvO2KK+lisNxpvQLLsr9YE1wGwQZOALjLEv noxnwakmAbH6D+6Y5VLstuBAnNn8RB9YGqdWoV90DzISXl/NBal/ZgSeCaoneCbZrV JYNZPyonG5EwAQLL5bMf3rkYVgo+mYWjYv4b0K0rQx+tumELJ/33ey2fOzuluoO2Ut Gv9mqepY+lmYwErpIaC3Mr+vrgDtZhtLQdkMBXrvv1+m76Q/SfBprY6Ur8Dt0/8AcV Nz4P8iTBxok05k1s1Kt3SbHU0QrvfWF2FLkPRmmMW0c3d8HSlBzrZTbAMcAR6NRp2l nDnGUs0CRL86w== Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 09FB460743; Thu, 3 Oct 2024 09:25:56 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 130E91BF59A for ; Thu, 3 Oct 2024 09:25:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F3606411CC for ; Thu, 3 Oct 2024 09:25:54 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id who4BGNqXXwG for ; Thu, 3 Oct 2024 09:25:54 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=192.198.163.13; helo=mgamail.intel.com; envelope-from=arkadiusz.kubalewski@intel.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org AE33840C63 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org AE33840C63 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by smtp4.osuosl.org (Postfix) with ESMTPS id AE33840C63 for ; Thu, 3 Oct 2024 09:25:53 +0000 (UTC) X-CSE-ConnectionGUID: cQb9u5UOSK26+LPK6rUbSQ== X-CSE-MsgGUID: WePQuqJNSnOAinyCS+ziXw== X-IronPort-AV: E=McAfee;i="6700,10204,11213"; a="30006732" X-IronPort-AV: E=Sophos;i="6.11,174,1725346800"; d="scan'208";a="30006732" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2024 02:25:52 -0700 X-CSE-ConnectionGUID: S6KeOzn1RhaoUiiErlITEQ== X-CSE-MsgGUID: NP8Iu4rOS/yGKvRonJ+Nag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,174,1725346800"; d="scan'208";a="73879254" Received: from amlin-018-114.igk.intel.com ([10.102.18.114]) by fmviesa006.fm.intel.com with ESMTP; 03 Oct 2024 02:25:52 -0700 From: Arkadiusz Kubalewski To: intel-wired-lan@lists.osuosl.org Date: Thu, 3 Oct 2024 11:21:13 +0200 Message-Id: <20241003092113.912768-1-arkadiusz.kubalewski@intel.com> X-Mailer: git-send-email 2.38.1 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=1727947553; x=1759483553; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=wAYbOpOEviV2r07GQRzQ6JNziGf30Z2ZYBN+L6hJHQk=; b=fp2btiTnTc124VOZN6m4/PhcxtwLmkopRazjlhsCX3iuDXSR7lK86+Es ZjTUVLCijKAyi75EyA090/jfABBfGMCjsKJcink0oyBJPaGHpI57yvPrZ EHmR65N2w2IVtdg/mBHnd3PRPCk9vzTTBn7jN72ehDHiCsOFdnOffxfge pv3DemPJRAh0qcnaYzG7vtZc4L4Mzj5fCbgbEp0jNET3Iw8J6LcvSK/Xy J79xUJV2tAh5jOpY89D8Jdurlbkqp6HgKLqwKpq3peDXkpeHCvX6RTJAz ++7pvotAu+nJX/KImu5DIZVq7HLnvn0iuU8Um2/Rl7/BctyT+2N9a7o1A Q==; X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=intel.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=fp2btiTn Subject: [Intel-wired-lan] [PATCH iwl-net v2] ice: fix crash on probe for DPLL enabled E810 LOM 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: Karol Kolacinski , Arkadiusz Kubalewski Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" The E810 Lan On Motherboard (LOM) design is vendor specific. Intel provides the reference design, but it is up to vendor on the final product design. For some cases, like Linux DPLL support, the static values defined in the driver does not reflect the actual LOM design. Current implementation of output pins is causing the crash on probe of the ice driver for such DPLL enabled E810 LOM designs: WARNING: (...) at drivers/dpll/dpll_core.c:495 dpll_pin_get+0x2c4/0x330 ... Call Trace: ? __warn+0x83/0x130 ? dpll_pin_get+0x2c4/0x330 ? report_bug+0x1b7/0x1d0 ? handle_bug+0x42/0x70 ? exc_invalid_op+0x18/0x70 ? asm_exc_invalid_op+0x1a/0x20 ? dpll_pin_get+0x117/0x330 ? dpll_pin_get+0x2c4/0x330 ? dpll_pin_get+0x117/0x330 ice_dpll_get_pins.isra.0+0x52/0xe0 [ice] ... The number of output pins enabled by LOM vendor is greater than expected and defined in the driver for Intel designed NICs, which causes the crash. Prevent the crash and allow generic output pin initialization within Linux DPLL subsystem for DPLL enabled E810 LOM designs. Newly designed solution for described issue will be based on "per HW design" pin initialization. It requires pin information dynamically acquired from the firmware and is already in progress, planned for next-tree only. Fixes: d7999f5ea64b ("ice: implement dpll interface to control cgu") Reviewed-by: Karol Kolacinski Signed-off-by: Arkadiusz Kubalewski --- v2: - put define on top of the file - fix smatch 'ret' uninitialized - do not init first array dimmension, use sizeof to obtain array size - raname ice_cgu_get_pin_num(..) -> ice_cgu_get_num_pins(..) - fix kdoc typo --- drivers/net/ethernet/intel/ice/ice_dpll.c | 43 +++++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 19 +++++++++ drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 1 + 3 files changed, 63 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.c b/drivers/net/ethernet/intel/ice/ice_dpll.c index 74c0e7319a4c..e9966c6c7c0f 100644 --- a/drivers/net/ethernet/intel/ice/ice_dpll.c +++ b/drivers/net/ethernet/intel/ice/ice_dpll.c @@ -10,6 +10,7 @@ #define ICE_DPLL_PIN_IDX_INVALID 0xff #define ICE_DPLL_RCLK_NUM_PER_PF 1 #define ICE_DPLL_PIN_ESYNC_PULSE_HIGH_PERCENT 25 +#define ICE_DPLL_GEN_OUT_LEN 3 /** * enum ice_dpll_pin_type - enumerate ice pin types: @@ -2063,6 +2064,46 @@ static int ice_dpll_init_worker(struct ice_pf *pf) return 0; } +/** + * ice_dpll_init_info_output_pins_generic - initializes generic output pins info + * @pf: board private structure + * + * Init information for generic output pins, cache them in PF's pins structures. + * + * Return: + * * 0 - success + * * negative - init failure reason + */ +static int ice_dpll_init_info_output_pins_generic(struct ice_pf *pf) +{ + static const char labels[][ICE_DPLL_GEN_OUT_LEN] = { + "0", "1", "2", "3", "4", "5", "6", "7", "8", + "9", "10", "11", "12", "13", "14", "15" }; + u32 cap = DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE; + struct ice_dpll_pin *pins = pf->dplls.outputs; + int i, ret = -EINVAL; + + if (pf->dplls.num_outputs > sizeof(labels) / ICE_DPLL_GEN_OUT_LEN) + return ret; + for (i = 0; i < pf->dplls.num_outputs; i++) { + pins[i].idx = i; + pins[i].prop.board_label = labels[i]; + pins[i].prop.type = DPLL_PIN_TYPE_EXT; + pins[i].prop.phase_range.min = + pf->dplls.output_phase_adj_max; + pins[i].prop.phase_range.max = + -pf->dplls.output_phase_adj_max; + pins[i].prop.capabilities = cap; + pins[i].pf = pf; + ret = ice_dpll_pin_state_update(pf, &pins[i], + ICE_DPLL_PIN_TYPE_OUTPUT, NULL); + if (ret) + break; + } + + return ret; +} + /** * ice_dpll_init_info_direct_pins - initializes direct pins info * @pf: board private structure @@ -2097,6 +2138,8 @@ ice_dpll_init_info_direct_pins(struct ice_pf *pf, pins = pf->dplls.outputs; num_pins = pf->dplls.num_outputs; input = false; + if (num_pins != ice_cgu_get_num_pins(hw, input)) + return ice_dpll_init_info_output_pins_generic(pf); break; default: return -EINVAL; diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c index 3a33e6b9b313..5d151daa9728 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c @@ -5964,6 +5964,25 @@ ice_cgu_get_pin_desc(struct ice_hw *hw, bool input, int *size) return t; } +/** + * ice_cgu_get_num_pins - get pin description array size + * @hw: pointer to the hw struct + * @input: if request is done against input or output pins + * + * Return: size of pin description array for given hw. + */ +int ice_cgu_get_num_pins(struct ice_hw *hw, bool input) +{ + const struct ice_cgu_pin_desc *t; + int size; + + t = ice_cgu_get_pin_desc(hw, input, &size); + if (t) + return size; + + return 0; +} + /** * ice_cgu_get_pin_type - get pin's type * @hw: pointer to the hw struct diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h index 0852a34ade91..6cedc1a906af 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h @@ -404,6 +404,7 @@ int ice_read_sma_ctrl_e810t(struct ice_hw *hw, u8 *data); int ice_write_sma_ctrl_e810t(struct ice_hw *hw, u8 data); int ice_read_pca9575_reg_e810t(struct ice_hw *hw, u8 offset, u8 *data); bool ice_is_pca9575_present(struct ice_hw *hw); +int ice_cgu_get_num_pins(struct ice_hw *hw, bool input); enum dpll_pin_type ice_cgu_get_pin_type(struct ice_hw *hw, u8 pin, bool input); struct dpll_pin_frequency * ice_cgu_get_pin_freq_supp(struct ice_hw *hw, u8 pin, bool input, u8 *num);