From nobody Thu Nov 28 13:44:18 2024 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (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 667AE1C6F6E; Tue, 1 Oct 2024 13:51:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727790693; cv=none; b=co+cZUVEPkV6Z3GifvrUsicOQIRK53EArA8IfQImRL1orr8SGDshYrrbKD12oAYosZTyFp2lxk+olwmrXFEm6oud3yJdaFrgOjm2H5pCcX/ZH6jiXEckkJTyfWsAqRD3qQuEYQT8UhW9MWdE9JtAOFZFLQKS6NPvj0V8zRJzeCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727790693; c=relaxed/simple; bh=KlomNTpGXr/A3oCv/IJgJ1UvclyuMcU7GI9wd7depZY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=sWbyzoK96YL3BTpD2JeM6GqaayN0iH3QYFeiumLVzgFNCMP/SiPZ693ov9V1EUNaST7ZJVNjPVyl3B9R0bN5sBzEJrNEuDyPtKHuTQv/3tHfAGheqEDIe7p4NZTDKHFL5tJVNMgD05+n2UZU7gtFt34fjOMefIo7OdSY9Mbj7GE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=KpdYzn+s; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="KpdYzn+s" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1727790691; x=1759326691; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=KlomNTpGXr/A3oCv/IJgJ1UvclyuMcU7GI9wd7depZY=; b=KpdYzn+ssiQQOktXV0F5y+yw/yDd9O2Au0qbVPGD8FQn8/J2fUUVLYRf w8d1AXIWK1ZIHEMpTcNKcQGnPIKJmoNo7MDOc7PX/EzpCQ2t8KG283O0N wHxgWyno0F3Vgefc4xq7w8ksLDfLSBJcm7Go7GteCHcYaA0+AJDM8WM1J yxmipx++KAGZ4uYD0Ia3lyBFNucFDfC3VcEmXrZCu7LHBQUKy+Sdiii6N 0zt7gOikzDeVg3gx8MourN3rpl1Idsd3ACJMxqkb/V6C0NttxsArS/uZm 1HAbGurznwlv81rlK4Yu8Pz8tmoF1CVXXhW2hFvSFqC0swV+8bnBDvEev g==; X-CSE-ConnectionGUID: xZlwFxFMQxGj0XznyNUoig== X-CSE-MsgGUID: V4R7+2aLRxmnPPilof6I7w== X-IronPort-AV: E=Sophos;i="6.11,167,1725346800"; d="scan'208";a="33057490" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 01 Oct 2024 06:51:25 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 1 Oct 2024 06:51:16 -0700 Received: from DEN-DL-M70577.microchip.com (10.10.85.11) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Tue, 1 Oct 2024 06:51:13 -0700 From: Daniel Machon Date: Tue, 1 Oct 2024 15:50:35 +0200 Subject: [PATCH net-next 05/15] net: sparx5: add *sparx5 argument to a few functions 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: <20241001-b4-sparx5-lan969x-switch-driver-v1-5-8c6896fdce66@microchip.com> References: <20241001-b4-sparx5-lan969x-switch-driver-v1-0-8c6896fdce66@microchip.com> In-Reply-To: <20241001-b4-sparx5-lan969x-switch-driver-v1-0-8c6896fdce66@microchip.com> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lars Povlsen , "Steen Hegelund" , , , , Richard Cochran , , , , , CC: , , X-Mailer: b4 0.14-dev The *sparx5 context pointer is required in functions that need to use platform specific data using the SPX5_CONST macro (which will be added in a subsequent patch). Prepare for this by updating the prototype and use of such functions. Signed-off-by: Daniel Machon Reviewed-by: Steen Hegelund --- .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 24 +++++++++---------- .../net/ethernet/microchip/sparx5/sparx5_main.h | 2 +- .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 2 +- .../net/ethernet/microchip/sparx5/sparx5_packet.c | 2 +- .../net/ethernet/microchip/sparx5/sparx5_port.c | 28 +++++++++++-------= ---- .../net/ethernet/microchip/sparx5/sparx5_port.h | 6 ++--- .../net/ethernet/microchip/sparx5/sparx5_psfp.c | 24 +++++++++---------- drivers/net/ethernet/microchip/sparx5/sparx5_tc.c | 8 +++---- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c b/drive= rs/net/ethernet/microchip/sparx5/sparx5_ethtool.c index d898a7238b48..ca97d51e6a8d 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c @@ -505,8 +505,8 @@ static void sparx5_get_dev_misc_stats(u64 *portstats, v= oid __iomem *inst, u32 static void sparx5_get_device_stats(struct sparx5 *sparx5, int portno) { u64 *portstats =3D &sparx5->stats[portno * sparx5->num_stats]; - u32 tinst =3D sparx5_port_dev_index(portno); - u32 dev =3D sparx5_to_high_dev(portno); + u32 tinst =3D sparx5_port_dev_index(sparx5, portno); + u32 dev =3D sparx5_to_high_dev(sparx5, portno); void __iomem *inst; =20 inst =3D spx5_inst_get(sparx5, dev, tinst); @@ -819,8 +819,8 @@ static void sparx5_get_eth_phy_stats(struct net_device = *ndev, =20 portstats =3D &sparx5->stats[portno * sparx5->num_stats]; if (sparx5_is_baser(port->conf.portmode)) { - u32 tinst =3D sparx5_port_dev_index(portno); - u32 dev =3D sparx5_to_high_dev(portno); + u32 tinst =3D sparx5_port_dev_index(sparx5, portno); + u32 dev =3D sparx5_to_high_dev(sparx5, portno); =20 inst =3D spx5_inst_get(sparx5, dev, tinst); sparx5_get_dev_phy_stats(portstats, inst, tinst); @@ -844,8 +844,8 @@ static void sparx5_get_eth_mac_stats(struct net_device = *ndev, =20 portstats =3D &sparx5->stats[portno * sparx5->num_stats]; if (sparx5_is_baser(port->conf.portmode)) { - u32 tinst =3D sparx5_port_dev_index(portno); - u32 dev =3D sparx5_to_high_dev(portno); + u32 tinst =3D sparx5_port_dev_index(sparx5, portno); + u32 dev =3D sparx5_to_high_dev(sparx5, portno); =20 inst =3D spx5_inst_get(sparx5, dev, tinst); sparx5_get_dev_mac_stats(portstats, inst, tinst); @@ -912,8 +912,8 @@ static void sparx5_get_eth_mac_ctrl_stats(struct net_de= vice *ndev, =20 portstats =3D &sparx5->stats[portno * sparx5->num_stats]; if (sparx5_is_baser(port->conf.portmode)) { - u32 tinst =3D sparx5_port_dev_index(portno); - u32 dev =3D sparx5_to_high_dev(portno); + u32 tinst =3D sparx5_port_dev_index(sparx5, portno); + u32 dev =3D sparx5_to_high_dev(sparx5, portno); =20 inst =3D spx5_inst_get(sparx5, dev, tinst); sparx5_get_dev_mac_ctrl_stats(portstats, inst, tinst); @@ -944,8 +944,8 @@ static void sparx5_get_eth_rmon_stats(struct net_device= *ndev, =20 portstats =3D &sparx5->stats[portno * sparx5->num_stats]; if (sparx5_is_baser(port->conf.portmode)) { - u32 tinst =3D sparx5_port_dev_index(portno); - u32 dev =3D sparx5_to_high_dev(portno); + u32 tinst =3D sparx5_port_dev_index(sparx5, portno); + u32 dev =3D sparx5_to_high_dev(sparx5, portno); =20 inst =3D spx5_inst_get(sparx5, dev, tinst); sparx5_get_dev_rmon_stats(portstats, inst, tinst); @@ -1027,8 +1027,8 @@ static void sparx5_get_sset_data(struct net_device *n= dev, =20 portstats =3D &sparx5->stats[portno * sparx5->num_stats]; if (sparx5_is_baser(port->conf.portmode)) { - u32 tinst =3D sparx5_port_dev_index(portno); - u32 dev =3D sparx5_to_high_dev(portno); + u32 tinst =3D sparx5_port_dev_index(sparx5, portno); + u32 dev =3D sparx5_to_high_dev(sparx5, portno); =20 inst =3D spx5_inst_get(sparx5, dev, tinst); sparx5_get_dev_misc_stats(portstats, inst, tinst); diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/= net/ethernet/microchip/sparx5/sparx5_main.h index 824849869f61..738b86999fd8 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h @@ -404,7 +404,7 @@ void sparx5_set_port_ifh_timestamp(void *ifh_hdr, u64 t= imestamp); void sparx5_set_port_ifh_rew_op(void *ifh_hdr, u32 rew_op); void sparx5_set_port_ifh_pdu_type(void *ifh_hdr, u32 pdu_type); void sparx5_set_port_ifh_pdu_w16_offset(void *ifh_hdr, u32 pdu_w16_offset); -void sparx5_set_port_ifh(void *ifh_hdr, u16 portno); +void sparx5_set_port_ifh(struct sparx5 *sparx5, void *ifh_hdr, u16 portno); bool sparx5_netdevice_check(const struct net_device *dev); struct net_device *sparx5_create_netdev(struct sparx5 *sparx5, u32 portno); int sparx5_register_netdevs(struct sparx5 *sparx5); diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c b/driver= s/net/ethernet/microchip/sparx5/sparx5_netdev.c index 705a004b324f..3ae6bad3bbb3 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c @@ -55,7 +55,7 @@ static void __ifh_encode_bitfield(void *ifh, u64 value, u= 32 pos, u32 width) ifh_hdr[byte - 5] |=3D (u8)((encode & 0xFF0000000000) >> 40); } =20 -void sparx5_set_port_ifh(void *ifh_hdr, u16 portno) +void sparx5_set_port_ifh(struct sparx5 *sparx5, void *ifh_hdr, u16 portno) { /* VSTAX.RSV =3D 1. MSBit must be 1 */ ifh_encode_bitfield(ifh_hdr, 1, VSTAX + 79, 1); diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c b/driver= s/net/ethernet/microchip/sparx5/sparx5_packet.c index 70427643f777..e637834b56df 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c @@ -235,7 +235,7 @@ netdev_tx_t sparx5_port_xmit_impl(struct sk_buff *skb, = struct net_device *dev) netdev_tx_t ret; =20 memset(ifh, 0, IFH_LEN * 4); - sparx5_set_port_ifh(ifh, port->portno); + sparx5_set_port_ifh(sparx5, ifh, port->portno); =20 if (sparx5->ptp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) { if (sparx5_ptp_txtstamp_request(port, skb) < 0) diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_port.c b/drivers/= net/ethernet/microchip/sparx5/sparx5_port.c index 062e486c002c..ea3454342665 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_port.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_port.c @@ -132,8 +132,8 @@ static int sparx5_get_sfi_status(struct sparx5 *sparx5, return -EINVAL; } =20 - dev =3D sparx5_to_high_dev(portno); - tinst =3D sparx5_port_dev_index(portno); + dev =3D sparx5_to_high_dev(sparx5, portno); + tinst =3D sparx5_port_dev_index(sparx5, portno); inst =3D spx5_inst_get(sparx5, dev, tinst); =20 value =3D spx5_inst_rd(inst, DEV10G_MAC_TX_MONITOR_STICKY(0)); @@ -316,9 +316,9 @@ static int sparx5_port_flush_poll(struct sparx5 *sparx5= , u32 portno) static int sparx5_port_disable(struct sparx5 *sparx5, struct sparx5_port *= port, bool high_spd_dev) { u32 tinst =3D high_spd_dev ? - sparx5_port_dev_index(port->portno) : port->portno; + sparx5_port_dev_index(sparx5, port->portno) : port->portno; u32 dev =3D high_spd_dev ? - sparx5_to_high_dev(port->portno) : TARGET_DEV2G5; + sparx5_to_high_dev(sparx5, port->portno) : TARGET_DEV2G5; void __iomem *devinst =3D spx5_inst_get(sparx5, dev, tinst); u32 spd =3D port->conf.speed; u32 spd_prm; @@ -427,7 +427,7 @@ static int sparx5_port_disable(struct sparx5 *sparx5, s= truct sparx5_port *port, HSCH_FLUSH_CTRL); =20 if (high_spd_dev) { - u32 pcs =3D sparx5_to_pcs_dev(port->portno); + u32 pcs =3D sparx5_to_pcs_dev(sparx5, port->portno); void __iomem *pcsinst =3D spx5_inst_get(sparx5, pcs, tinst); =20 /* 12: Disable 5G/10G/25 BaseR PCS */ @@ -558,8 +558,8 @@ static int sparx5_port_max_tags_set(struct sparx5 *spar= x5, bool dtag =3D max_tags =3D=3D SPX5_PORT_MAX_TAGS_TWO; enum sparx5_vlan_port_type vlan_type =3D port->vlan_type; bool dotag =3D max_tags !=3D SPX5_PORT_MAX_TAGS_NONE; - u32 dev =3D sparx5_to_high_dev(port->portno); - u32 tinst =3D sparx5_port_dev_index(port->portno); + u32 dev =3D sparx5_to_high_dev(sparx5, port->portno); + u32 tinst =3D sparx5_port_dev_index(sparx5, port->portno); void __iomem *inst =3D spx5_inst_get(sparx5, dev, tinst); u32 etype; =20 @@ -789,9 +789,9 @@ static int sparx5_port_pcs_high_set(struct sparx5 *spar= x5, struct sparx5_port_config *conf) { u32 clk_spd =3D conf->portmode =3D=3D PHY_INTERFACE_MODE_5GBASER ? 1 : 0; - u32 pix =3D sparx5_port_dev_index(port->portno); - u32 dev =3D sparx5_to_high_dev(port->portno); - u32 pcs =3D sparx5_to_pcs_dev(port->portno); + u32 pix =3D sparx5_port_dev_index(sparx5, port->portno); + u32 dev =3D sparx5_to_high_dev(sparx5, port->portno); + u32 pcs =3D sparx5_to_pcs_dev(sparx5, port->portno); void __iomem *devinst; void __iomem *pcsinst; int err; @@ -843,7 +843,7 @@ static int sparx5_port_pcs_high_set(struct sparx5 *spar= x5, /* Switch between 1G/2500 and 5G/10G/25G devices */ static void sparx5_dev_switch(struct sparx5 *sparx5, int port, bool hsd) { - int bt_indx =3D BIT(sparx5_port_dev_index(port)); + int bt_indx =3D BIT(sparx5_port_dev_index(sparx5, port)); =20 if (sparx5_port_is_5g(port)) { spx5_rmw(hsd ? 0 : bt_indx, @@ -1016,9 +1016,9 @@ int sparx5_port_init(struct sparx5 *sparx5, { u32 pause_start =3D sparx5_wm_enc(6 * (ETH_MAXLEN / SPX5_BUFFER_CELL_SZ)= ); u32 atop =3D sparx5_wm_enc(20 * (ETH_MAXLEN / SPX5_BUFFER_CELL_SZ)); - u32 devhigh =3D sparx5_to_high_dev(port->portno); - u32 pix =3D sparx5_port_dev_index(port->portno); - u32 pcs =3D sparx5_to_pcs_dev(port->portno); + u32 devhigh =3D sparx5_to_high_dev(sparx5, port->portno); + u32 pix =3D sparx5_port_dev_index(sparx5, port->portno); + u32 pcs =3D sparx5_to_pcs_dev(sparx5, port->portno); bool sd_pol =3D port->signd_active_high; bool sd_sel =3D !port->signd_internal; bool sd_ena =3D port->signd_enable; diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_port.h b/drivers/= net/ethernet/microchip/sparx5/sparx5_port.h index 607c4ff1df6b..468e3d34d6e1 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_port.h +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_port.h @@ -40,7 +40,7 @@ static inline bool sparx5_port_is_25g(int portno) return portno >=3D 56 && portno <=3D 63; } =20 -static inline u32 sparx5_to_high_dev(int port) +static inline u32 sparx5_to_high_dev(struct sparx5 *sparx5, int port) { if (sparx5_port_is_5g(port)) return TARGET_DEV5G; @@ -49,7 +49,7 @@ static inline u32 sparx5_to_high_dev(int port) return TARGET_DEV25G; } =20 -static inline u32 sparx5_to_pcs_dev(int port) +static inline u32 sparx5_to_pcs_dev(struct sparx5 *sparx5, int port) { if (sparx5_port_is_5g(port)) return TARGET_PCS5G_BR; @@ -58,7 +58,7 @@ static inline u32 sparx5_to_pcs_dev(int port) return TARGET_PCS25G_BR; } =20 -static inline int sparx5_port_dev_index(int port) +static inline int sparx5_port_dev_index(struct sparx5 *sparx5, int port) { if (sparx5_port_is_2g5(port)) return port; diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_psfp.c b/drivers/= net/ethernet/microchip/sparx5/sparx5_psfp.c index 8dee1ab1fa75..5d9c7b782352 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_psfp.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_psfp.c @@ -20,34 +20,34 @@ static struct sparx5_pool_entry sparx5_psfp_sg_pool[SPX= 5_PSFP_SG_CNT]; /* Pool of available stream filters */ static struct sparx5_pool_entry sparx5_psfp_sf_pool[SPX5_PSFP_SF_CNT]; =20 -static int sparx5_psfp_sf_get(u32 *id) +static int sparx5_psfp_sf_get(struct sparx5 *sparx5, u32 *id) { return sparx5_pool_get(sparx5_psfp_sf_pool, SPX5_PSFP_SF_CNT, id); } =20 -static int sparx5_psfp_sf_put(u32 id) +static int sparx5_psfp_sf_put(struct sparx5 *sparx5, u32 id) { return sparx5_pool_put(sparx5_psfp_sf_pool, SPX5_PSFP_SF_CNT, id); } =20 -static int sparx5_psfp_sg_get(u32 idx, u32 *id) +static int sparx5_psfp_sg_get(struct sparx5 *sparx5, u32 idx, u32 *id) { return sparx5_pool_get_with_idx(sparx5_psfp_sg_pool, SPX5_PSFP_SG_CNT, idx, id); } =20 -static int sparx5_psfp_sg_put(u32 id) +static int sparx5_psfp_sg_put(struct sparx5 *sparx5, u32 id) { return sparx5_pool_put(sparx5_psfp_sg_pool, SPX5_PSFP_SG_CNT, id); } =20 -static int sparx5_psfp_fm_get(u32 idx, u32 *id) +static int sparx5_psfp_fm_get(struct sparx5 *sparx5, u32 idx, u32 *id) { return sparx5_pool_get_with_idx(sparx5_psfp_fm_pool, SPX5_SDLB_CNT, idx, id); } =20 -static int sparx5_psfp_fm_put(u32 id) +static int sparx5_psfp_fm_put(struct sparx5 *sparx5, u32 id) { return sparx5_pool_put(sparx5_psfp_fm_pool, SPX5_SDLB_CNT, id); } @@ -205,7 +205,7 @@ int sparx5_psfp_sf_add(struct sparx5 *sparx5, const str= uct sparx5_psfp_sf *sf, { int ret; =20 - ret =3D sparx5_psfp_sf_get(id); + ret =3D sparx5_psfp_sf_get(sparx5, id); if (ret < 0) return ret; =20 @@ -220,7 +220,7 @@ int sparx5_psfp_sf_del(struct sparx5 *sparx5, u32 id) =20 sparx5_psfp_sf_set(sparx5, id, &sf); =20 - return sparx5_psfp_sf_put(id); + return sparx5_psfp_sf_put(sparx5, id); } =20 int sparx5_psfp_sg_add(struct sparx5 *sparx5, u32 uidx, @@ -229,7 +229,7 @@ int sparx5_psfp_sg_add(struct sparx5 *sparx5, u32 uidx, ktime_t basetime; int ret; =20 - ret =3D sparx5_psfp_sg_get(uidx, id); + ret =3D sparx5_psfp_sg_get(sparx5, uidx, id); if (ret < 0) return ret; /* Was already in use, no need to reconfigure */ @@ -253,7 +253,7 @@ int sparx5_psfp_sg_del(struct sparx5 *sparx5, u32 id) const struct sparx5_psfp_sg sg =3D { 0 }; int ret; =20 - ret =3D sparx5_psfp_sg_put(id); + ret =3D sparx5_psfp_sg_put(sparx5, id); if (ret < 0) return ret; /* Stream gate still in use ? */ @@ -270,7 +270,7 @@ int sparx5_psfp_fm_add(struct sparx5 *sparx5, u32 uidx, int ret; =20 /* Get flow meter */ - ret =3D sparx5_psfp_fm_get(uidx, &fm->pol.idx); + ret =3D sparx5_psfp_fm_get(sparx5, uidx, &fm->pol.idx); if (ret < 0) return ret; /* Was already in use, no need to reconfigure */ @@ -303,7 +303,7 @@ int sparx5_psfp_fm_del(struct sparx5 *sparx5, u32 id) if (ret < 0) return ret; =20 - ret =3D sparx5_psfp_fm_put(id); + ret =3D sparx5_psfp_fm_put(sparx5, id); if (ret < 0) return ret; /* Do not reset flow-meter if still in use. */ diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_tc.c b/drivers/ne= t/ethernet/microchip/sparx5/sparx5_tc.c index e80f3166db7d..28b2514c8330 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_tc.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_tc.c @@ -60,8 +60,8 @@ static int sparx5_tc_setup_block(struct net_device *ndev, cb, ndev, ndev, false); } =20 -static void sparx5_tc_get_layer_and_idx(u32 parent, u32 portno, u32 *layer, - u32 *idx) +static void sparx5_tc_get_layer_and_idx(struct sparx5 *sparx5, u32 parent, + u32 portno, u32 *layer, u32 *idx) { if (parent =3D=3D TC_H_ROOT) { *layer =3D 2; @@ -90,8 +90,8 @@ static int sparx5_tc_setup_qdisc_tbf(struct net_device *n= dev, struct sparx5_port *port =3D netdev_priv(ndev); u32 layer, se_idx; =20 - sparx5_tc_get_layer_and_idx(qopt->parent, port->portno, &layer, - &se_idx); + sparx5_tc_get_layer_and_idx(port->sparx5, qopt->parent, port->portno, + &layer, &se_idx); =20 switch (qopt->command) { case TC_TBF_REPLACE: --=20 2.34.1