From nobody Sat May 18 11:26:03 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AD385578A; Tue, 23 Apr 2024 09:06:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713863177; cv=none; b=MJazM/idc1ihmNrTrzavgFkimaF4g0g5GtW5tv2jIHbDFyMnodjoLTh23veA/ytOhCLJ+AEYDP/dPunS5+iLiEyWzS2g0yoCgKPCAuL501jtgk7J73nvHdC9nfxKvFMfFTSD9HhODsccIJFVUusOLyYaAeHRokiUmB0hGtn6FgE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713863177; c=relaxed/simple; bh=qFr01XCCsOjJ3XLciOyq1BEwICTx8UuRQM17Ph15bKs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TEsiwFjCytB+PwD8K2rP++CDKu3J3IpxV3MfOYewpFSWDnqUBIEkRvgEPweUQuo2iw3cKvO/QElPa9VGu2WFGF0ba3GIXxkEnl1YLXAV8735c0H6TVVf/u4BYr2EaHFEw5fRXBW81b/SV3TcJzFjjEETAweHd5jglpQVVN1UPhw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=HFcfiBlA; arc=none smtp.client-ip=217.70.183.196 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="HFcfiBlA" Received: by mail.gandi.net (Postfix) with ESMTPSA id 541DFE000E; Tue, 23 Apr 2024 09:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1713863172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f3Vdm2ApnbgD6sAJCOxwcva/xay9jaobfNPK0b3rdjQ=; b=HFcfiBlA76ZdN52JJ0STOoBlPjYNGSdY5cipDUfIp8huo1VoU8xSJDRcB2rYQWf6QzgrbD HxCPzTjLeTAsmCx1Puo8DYxUHTt0FirNVVQEEYzBj28f3bkH5c8xioTvIrm4GvPBnmWFic rqdAwsa8h+5Ria6W6cYfbyxB3v5BxPvlwbniE6Q6+aEuLSKuUZ8lCuKNhhDYQ1bkn1tnZt tj+AbrCwu6Y2NEMPC2+0SdIqPGwpzyCiGxSY3wYfMFMEmWkKQ+gv/NZN8gzuOa+2KUh6kj LKSXlRd67ZgYV7CbDzEOf9g52szIH6XsStKi9bB48ShPZGs4ylpzO01i2z+Fiw== From: Kory Maincent Date: Tue, 23 Apr 2024 11:05:41 +0200 Subject: [PATCH ethtool-next 1/2] update UAPI header copies Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240423-feature_poe-v1-1-9e12136a8674@bootlin.com> References: <20240423-feature_poe-v1-0-9e12136a8674@bootlin.com> In-Reply-To: <20240423-feature_poe-v1-0-9e12136a8674@bootlin.com> To: Oleksij Rempel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Michal Kubecek Cc: Thomas Petazzoni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kyle Swenson , Kory Maincent X-Mailer: b4 0.14-dev X-GND-Sasl: kory.maincent@bootlin.com From: Kory Maincent (Dent Project) Update to kernel commit 6a57f091622a. Signed-off-by: Kory Maincent --- uapi/linux/ethtool.h | 55 ++++++++++++++++++++++++++++++++++++++++= ++++ uapi/linux/ethtool_netlink.h | 3 +++ 2 files changed, 58 insertions(+) diff --git a/uapi/linux/ethtool.h b/uapi/linux/ethtool.h index 4d1738a..3884bc4 100644 --- a/uapi/linux/ethtool.h +++ b/uapi/linux/ethtool.h @@ -750,6 +750,61 @@ enum ethtool_module_power_mode { ETHTOOL_MODULE_POWER_MODE_HIGH, }; =20 +/** + * enum ethtool_pse_types - Types of PSE controller. + * @ETHTOOL_PSE_UNKNOWN: Type of PSE controller is unknown + * @ETHTOOL_PSE_PODL: PSE controller which support PoDL + * @ETHTOOL_PSE_C33: PSE controller which support Clause 33 (PoE) + */ +enum ethtool_pse_types { + ETHTOOL_PSE_UNKNOWN =3D 1 << 0, + ETHTOOL_PSE_PODL =3D 1 << 1, + ETHTOOL_PSE_C33 =3D 1 << 2, +}; + +/** + * enum ethtool_c33_pse_admin_state - operational state of the PoDL PSE + * functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState + * @ETHTOOL_C33_PSE_ADMIN_STATE_UNKNOWN: state of PSE functions is unknown + * @ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED: PSE functions are disabled + * @ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED: PSE functions are enabled + */ +enum ethtool_c33_pse_admin_state { + ETHTOOL_C33_PSE_ADMIN_STATE_UNKNOWN =3D 1, + ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED, + ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED, +}; + +/** + * enum ethtool_c33_pse_pw_d_status - power detection status of the PSE. + * IEEE 802.3-2022 30.9.1.1.3 aPoDLPSEPowerDetectionStatus: + * @ETHTOOL_C33_PSE_PW_D_STATUS_UNKNOWN: PSE status is unknown + * @ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED: The enumeration "disabled" + * indicates that the PSE State diagram is in the state DISABLED. + * @ETHTOOL_C33_PSE_PW_D_STATUS_SEARCHING: The enumeration "searching" + * indicates the PSE State diagram is in a state other than those + * listed. + * @ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING: The enumeration + * "deliveringPower" indicates that the PSE State diagram is in the + * state POWER_ON. + * @ETHTOOL_C33_PSE_PW_D_STATUS_TEST: The enumeration "test" indicates that + * the PSE State diagram is in the state TEST_MODE. + * @ETHTOOL_C33_PSE_PW_D_STATUS_FAULT: The enumeration "fault" indicates t= hat + * the PSE State diagram is in the state TEST_ERROR. + * @ETHTOOL_C33_PSE_PW_D_STATUS_OTHERFAULT: The enumeration "otherFault" + * indicates that the PSE State diagram is in the state IDLE due to + * the variable error_condition =3D true. + */ +enum ethtool_c33_pse_pw_d_status { + ETHTOOL_C33_PSE_PW_D_STATUS_UNKNOWN =3D 1, + ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED, + ETHTOOL_C33_PSE_PW_D_STATUS_SEARCHING, + ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING, + ETHTOOL_C33_PSE_PW_D_STATUS_TEST, + ETHTOOL_C33_PSE_PW_D_STATUS_FAULT, + ETHTOOL_C33_PSE_PW_D_STATUS_OTHERFAULT, +}; + /** * enum ethtool_podl_pse_admin_state - operational state of the PoDL PSE * functions. IEEE 802.3-2018 30.15.1.1.2 aPoDLPSEAdminState diff --git a/uapi/linux/ethtool_netlink.h b/uapi/linux/ethtool_netlink.h index 2503b26..b61c04d 100644 --- a/uapi/linux/ethtool_netlink.h +++ b/uapi/linux/ethtool_netlink.h @@ -913,6 +913,9 @@ enum { ETHTOOL_A_PODL_PSE_ADMIN_STATE, /* u32 */ ETHTOOL_A_PODL_PSE_ADMIN_CONTROL, /* u32 */ ETHTOOL_A_PODL_PSE_PW_D_STATUS, /* u32 */ + ETHTOOL_A_C33_PSE_ADMIN_STATE, /* u32 */ + ETHTOOL_A_C33_PSE_ADMIN_CONTROL, /* u32 */ + ETHTOOL_A_C33_PSE_PW_D_STATUS, /* u32 */ =20 /* add new constants above here */ __ETHTOOL_A_PSE_CNT, --=20 2.34.1 From nobody Sat May 18 11:26:03 2024 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40AE056768; Tue, 23 Apr 2024 09:06:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713863177; cv=none; b=ttgA89+xrVc4MEKvQhSC8Fx5xsI7Tu6s06QrRflujCwXQO7Py0+tt/dEzrrc6X+2Ojqp880/OFNifp2opPMy7SV15obdqdsx8PUIaQ0DDBmzwRjq2oeyw5QCZOOdR4mU/7hPFbmCLSuFdx5S+KlvZb64kVd5LqlXa9Ynpw9o2m8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713863177; c=relaxed/simple; bh=30B4AtuolDboQHql5UUskhU5+dDy3nL0iec2d0X9dt8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iQYQIfeLsqthI2MHRHq2Uno4mplE1GdgjnAENcsS5St3Aw143VBpu8E1Tasc/OZJWie4P3kzPwPkXDuaOXEsukqV+27fGrxzIHD/62rc9cWrn/WWFtHGZ2D73Ug0Zxyvh23GCEdKh7fOvyH/pQSeXKfbye26uoV8z8XFIRH6clA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=lw3ZPOpI; arc=none smtp.client-ip=217.70.183.196 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="lw3ZPOpI" Received: by mail.gandi.net (Postfix) with ESMTPSA id EC8E1E000C; Tue, 23 Apr 2024 09:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1713863173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cv8IAJl5ZT2KI5eGTFuxjLT4/JyU5BmA9vKpIsy+9T4=; b=lw3ZPOpIlG9Fdutzqsus7l0rnv1YaZPTZG6ilDrD10+Y+ehMjx1ZfFsUz9HorVTwjrs1FS ySKZnf/lzXcoZFhBY4PEkQ4ShTs46TZ+i/NpG7XhoSOxfvkHsCrO2HcB5G6IHGOf9SbybB cgLM6Y5pMP2kxphxQp9kwGYBcVqZFwawNgwUuJzBspjnD8uBzW5hhf/RmRSMgsordwMaz8 kEEnqgsf12ep5U+DkiYEU8GFMJmys/Y9fKpYBvRkrKQPxDEd58q5T+ikCwjtOrGZzKmXZd O/K+ykd67xIBRpMZd4TE57pmgey46rW7GJGRQ1oIphD6iHLjSkhNpHIXQuTM4Q== From: Kory Maincent Date: Tue, 23 Apr 2024 11:05:42 +0200 Subject: [PATCH ethtool-next 2/2] ethtool: pse-pd: Add support for Power over Ethernet (clause 33) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240423-feature_poe-v1-2-9e12136a8674@bootlin.com> References: <20240423-feature_poe-v1-0-9e12136a8674@bootlin.com> In-Reply-To: <20240423-feature_poe-v1-0-9e12136a8674@bootlin.com> To: Oleksij Rempel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Michal Kubecek Cc: Thomas Petazzoni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kyle Swenson , Kory Maincent X-Mailer: b4 0.14-dev X-GND-Sasl: kory.maincent@bootlin.com From: Kory Maincent (Dent Project) This update extends PSE support to include Power over Ethernet (clause 33), encompassing standards 802.3af, 802.3at, and 802.3bt infrastructure. Signed-off-by: Kory Maincent --- ethtool.c | 1 + netlink/pse-pd.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 67 insertions(+) diff --git a/ethtool.c b/ethtool.c index e587597..d85a57a 100644 --- a/ethtool.c +++ b/ethtool.c @@ -6216,6 +6216,7 @@ static const struct option args[] =3D { .nlfunc =3D nl_spse, .help =3D "Set Power Sourcing Equipment settings", .xhelp =3D " [ podl-pse-admin-control enable|disable ]\n" + " [ c33-pse-admin-control enable|disable ]\n" }, { .opts =3D "-h|--help", diff --git a/netlink/pse-pd.c b/netlink/pse-pd.c index d6faff8..2c8dd89 100644 --- a/netlink/pse-pd.c +++ b/netlink/pse-pd.c @@ -54,6 +54,41 @@ static const char *podl_pse_pw_d_status_name(u32 val) } } =20 +static const char *c33_pse_admin_state_name(u32 val) +{ + switch (val) { + case ETHTOOL_C33_PSE_ADMIN_STATE_UNKNOWN: + return "unknown"; + case ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED: + return "disabled"; + case ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED: + return "enabled"; + default: + return "unsupported"; + } +} + +static const char *c33_pse_pw_d_status_name(u32 val) +{ + switch (val) { + case ETHTOOL_C33_PSE_PW_D_STATUS_UNKNOWN: + return "unknown"; + case ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED: + return "disabled"; + case ETHTOOL_C33_PSE_PW_D_STATUS_SEARCHING: + return "searching"; + case ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING: + return "delivering power"; + case ETHTOOL_C33_PSE_PW_D_STATUS_TEST: + return "test"; + case ETHTOOL_C33_PSE_PW_D_STATUS_FAULT: + return "fault"; + case ETHTOOL_C33_PSE_PW_D_STATUS_OTHERFAULT: + return "otherfault"; + default: + return "unsupported"; + } +} int pse_reply_cb(const struct nlmsghdr *nlhdr, void *data) { const struct nlattr *tb[ETHTOOL_A_PSE_MAX + 1] =3D {}; @@ -98,6 +133,24 @@ int pse_reply_cb(const struct nlmsghdr *nlhdr, void *da= ta) podl_pse_pw_d_status_name(val)); } =20 + if (tb[ETHTOOL_A_C33_PSE_ADMIN_STATE]) { + u32 val; + + val =3D mnl_attr_get_u32(tb[ETHTOOL_A_C33_PSE_ADMIN_STATE]); + print_string(PRINT_ANY, "c33-pse-admin-state", + "Clause 33 PSE Admin State: %s\n", + c33_pse_admin_state_name(val)); + } + + if (tb[ETHTOOL_A_C33_PSE_PW_D_STATUS]) { + u32 val; + + val =3D mnl_attr_get_u32(tb[ETHTOOL_A_C33_PSE_PW_D_STATUS]); + print_string(PRINT_ANY, "c33-pse-power-detection-status", + "Clause 33 PSE Power Detection Status: %s\n", + c33_pse_pw_d_status_name(val)); + } + close_json_object(); =20 return MNL_CB_OK; @@ -138,6 +191,12 @@ static const struct lookup_entry_u32 podl_pse_admin_co= ntrol_values[] =3D { {} }; =20 +static const struct lookup_entry_u32 c33_pse_admin_control_values[] =3D { + { .arg =3D "enable", .val =3D ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED }, + { .arg =3D "disable", .val =3D ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED }, + {} +}; + static const struct param_parser spse_params[] =3D { { .arg =3D "podl-pse-admin-control", @@ -146,6 +205,13 @@ static const struct param_parser spse_params[] =3D { .handler_data =3D podl_pse_admin_control_values, .min_argc =3D 1, }, + { + .arg =3D "c33-pse-admin-control", + .type =3D ETHTOOL_A_C33_PSE_ADMIN_CONTROL, + .handler =3D nl_parse_lookup_u32, + .handler_data =3D c33_pse_admin_control_values, + .min_argc =3D 1, + }, {} }; =20 --=20 2.34.1