From nobody Sun Feb 8 02:41:47 2026 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FE30312839 for ; Mon, 20 Oct 2025 13:49:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760968169; cv=none; b=tZPXzCN5RaQHb3VxUVlgXgQi7GCUGne496Zag4nt4eyaSpGLdOdzJJF3Ha0wxz8XkRkCIZfrEdhcbkAoP5JkK2ZG/+XUTfUTIkTPcEdQoLgS57MQm9+Ly4my/MbRoShcminTSCdYHdZgkMKCASa9V9sPUzQ9+Ormt+GuopcBIN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760968169; c=relaxed/simple; bh=p17ZizgoQVksKXqVHWJyQifEDEkpvqNU3oIZSQcrjCI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eH/LmOBiyjUo5Ud7eS5HL1HH5NAgST01cSwKnWJ7xsxq9tUohmJAXxhYeg+gpL+rsvwIpqZ4mVx2fX2QsQQ8falUsWBA8upI12rXkf9jJ6ZzF1n7a1ZsEoSoSzIuOVWwJ9l+98PtVnmJ37T5CSqF/+AsYQ4bxiDZW3yuP3akEBc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CUHh+lpg; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CUHh+lpg" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-339c9bf3492so5378808a91.2 for ; Mon, 20 Oct 2025 06:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760968167; x=1761572967; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V6bZDBMwFOcBCtJWO0TclacmqT6GC+h7O4/sHJWRg3w=; b=CUHh+lpgDjCOqKp2LVY1HQTFVpa3xkDfs5Wrcb7GpRCV78WhPyIlhqybqtrFucPwaE Y3AQrxxAnI4KI6E/OZJogCe97I6zDKmPg2jIxl1n+255GU56+UUuU/VfqXUV/Qv6V4IA ad60gc64LsNpe1LwIRqrKP+j+7FrzHgBkn6FwvEae7N2Hnk9CQDsOyFevV7PGJPSzLbA mRqEo1Z7bMZjQkmfqWs87XjzrJ3xwwnbXUKUHBElC6O/V92J32EySAF8VY7OeX+TbCo9 ZE/ql8BOGRMm+Ca9guKN5ZUvKWorRIlOOdHOTHBXSAwUWGxrmLQUDHcA5FjWjsKsbCGE 6a1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760968167; x=1761572967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V6bZDBMwFOcBCtJWO0TclacmqT6GC+h7O4/sHJWRg3w=; b=hw5ur13pfK7xTvwc9U0OCTnOPDjmLNU9u+jxNbMEWLt5/eVGQ+dpaYZowsTvPnmKLi dRaG6HL1vysWYDWr7OPtP2azWk62OM3SHu03aYyLFQiGZZtlmMs7G+IeJqAs0eEG+Gwk G8ecl3mFWJkNQahKQ5cdwmwv9D9AGI8SselNb5y1wfqPPJxf7Kgp66NDWq9x9hpY4/OG m0nx0xLxMeQ9Eim/FzoDi+pV8cZ40bmx87G0VtEKutgNRifZMdZ+8nzgmeEuEQ60ista eDPvXhI/Aa2PxSEW8ZYRDGyF8fbRryc5gl1qb8LFx5uAw22+3AUaOuUcwRT1qYBaOtoC aMmA== X-Forwarded-Encrypted: i=1; AJvYcCVWTY1YykLFGtjUPC5Y0ENsspoeTilFrY/KPO+l7Q3yzQ0KlRVxtygnqps3EveZGZRyFXEB2vuIp9aHVfc=@vger.kernel.org X-Gm-Message-State: AOJu0YyGqFpvaw6qa4NnDmDNid4r/j51pKeE0WYIyLJCteSbIKnUd6SX 559ySENgdnky3oVa17I05d1RIG7B2Dlx6NN4SyjEjSXfqOqawu1GMfqk X-Gm-Gg: ASbGncvu6+khJEBFTy5mhwq0z63/eg6UatLq81DiE7e/wIjlTc7f+NUXwIPYoHUfRVe J8lf+vTtXV2Wp6fXZY+KXwLU/z8tPlhcEF2JO78fuIEnTyIh51BO/p4wW7Bt98k8NbVf08pD2Ez p9rOVveyDT3X4CnLEqbTpC/4YyTXjYSqCtMpXHGZe5zzGb4jisB5vKpzX9rrJ681RIp8Wpv4SXu JqWprK51aURAxSAcC5DndU8BJAoDdqDV4FXJ74G5xwOhd6RNh2mfFiI8dyvNXTbg4xDyYuvh6yT mVWJFWYyvKoc8PxyjO1mOd6DBT9mGIOwW8YR2EgBv2VYTproPagggLi5xzwhUY3bvDRiuSOErJe oL3iXUVen9cCa8Ij3vsQisiLVBUfiT/czr//ApUvZSj1nRgrB+l2PEU8E00SLHBOF5IACsnTdq6 OCaZRwJxysMMUHMOUcsA1xILVc2pMqaZWwJxR7raIauD9tAYYcVTKCS/T267vlGVVxUE5Cq+WN2 g== X-Google-Smtp-Source: AGHT+IELKtv6EJjONr0SWqhG/TrSK017y4BhyQmolq816W8WZ6Bqz/9ErZ3xNKisln/cCasioXjGEg== X-Received: by 2002:a17:90b:28c4:b0:32e:d649:f98c with SMTP id 98e67ed59e1d1-33bcf85d5a8mr16303056a91.1.1760968166624; Mon, 20 Oct 2025 06:49:26 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:1cc9:d444:c07a:121f:22da:3f7b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33bdd02793dsm4507349a91.3.2025.10.20.06.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Oct 2025 06:49:26 -0700 (PDT) From: I Viswanath To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, sdf@fomichev.me, kuniyu@google.com, ahmed.zaki@intel.com, aleksander.lobakin@intel.com, andrew+netdev@lunn.ch Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, david.hunter.linux@gmail.com, khalid@kernel.org, I Viswanath Subject: [RFC net-next PATCH 1/2] net: Add ndo_write_rx_config and helper structs and functions. Date: Mon, 20 Oct 2025 19:18:56 +0530 Message-ID: <20251020134857.5820-2-viswanathiyyappan@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251020134857.5820-1-viswanathiyyappan@gmail.com> References: <20251020134857.5820-1-viswanathiyyappan@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add ndo_write_rx_config callback and following helper structs/functions: rx_config_work - To schedule the callback and handle synchronization read_snapshot/update_snapshot - Helper functions to read/update the rx_config snapshot set_and_schedule_rx_config - Helper function to call ndo_set_rx_mode and schedule ndo_write_rx_config execute_write_rx_config - Helper function that will be scheduled by rx_work->config_write Signed-off-by: I Viswanath --- I expect that shallow copy should be good enough as rx_config should consis= t exclusively=20 of integer types (primitives and arrays) Would flushing the work queue be necessary for functions like *_init_hw()? include/linux/netdevice.h | 38 ++++++++++++++++++++++++++++++- net/core/dev.c | 48 +++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d1a687444b27..37a48e41a004 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1100,7 +1100,12 @@ struct netdev_net_notifier { * void (*ndo_set_rx_mode)(struct net_device *dev); * This function is called device changes address list filtering. * If driver handles unicast address filtering, it should set - * IFF_UNICAST_FLT in its priv_flags. + * IFF_UNICAST_FLT in its priv_flags. This sets up the snapshot of + * rx_config that will be written to the device. + * + * void (*ndo_write_rx_config)(struct net_device *dev); + * This function is scheduled immediately after ndo_set_rx_mode to + * write rx_config to the device. * * int (*ndo_set_mac_address)(struct net_device *dev, void *addr); * This function is called when the Media Access Control address @@ -1421,6 +1426,7 @@ struct net_device_ops { void (*ndo_change_rx_flags)(struct net_device *dev, int flags); void (*ndo_set_rx_mode)(struct net_device *dev); + void (*ndo_write_rx_config)(struct net_device *dev); int (*ndo_set_mac_address)(struct net_device *dev, void *addr); int (*ndo_validate_addr)(struct net_device *dev); @@ -1767,6 +1773,12 @@ enum netdev_reg_state { NETREG_DUMMY, /* dummy device for NAPI poll */ }; =20 +struct rx_config_work { + struct work_struct config_write; + struct net_device *dev; + spinlock_t config_lock; +}; + /** * struct net_device - The DEVICE structure. * @@ -2082,6 +2094,8 @@ enum netdev_reg_state { * dev_list, one per address-family. * @hwprov: Tracks which PTP performs hardware packet time stamping. * + * @rx_work: helper struct to schedule rx config write to the hardware. + * * FIXME: cleanup struct net_device such that network protocol info * moves out. */ @@ -2559,6 +2573,8 @@ struct net_device { =20 struct hwtstamp_provider __rcu *hwprov; =20 + struct rx_config_work *rx_work; + u8 priv[] ____cacheline_aligned __counted_by(priv_len); } ____cacheline_aligned; @@ -2734,6 +2750,26 @@ void dev_net_set(struct net_device *dev, struct net = *net) write_pnet(&dev->nd_net, net); } =20 +#define update_snapshot(config_ptr, type) \ + do { \ + typeof((config_ptr)) rx_config =3D ((type *)(dev->priv))->rx_config; \ + unsigned long flags; \ + spin_lock_irqsave(&((dev)->rx_work->config_lock), flags); \ + *rx_config =3D *(config_ptr); \ + spin_unlock_irqrestore(&((dev)->rx_work->config_lock), flags); \ + } while (0) + +#define read_snapshot(config_ptr, type) \ + do { \ + typeof((config_ptr)) rx_config =3D ((type *)(dev->priv))->rx_config; \ + unsigned long flags; \ + spin_lock_irqsave(&((dev)->rx_work->config_lock), flags); \ + *(config_ptr) =3D *rx_config; \ + spin_unlock_irqrestore(&((dev)->rx_work->config_lock), flags); \ + } while (0) + +void set_and_schedule_rx_config(struct net_device *dev, bool flush); + /** * netdev_priv - access network device private data * @dev: network device diff --git a/net/core/dev.c b/net/core/dev.c index 2acfa44927da..24eeaec5881b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -9524,6 +9524,37 @@ int netif_set_allmulti(struct net_device *dev, int i= nc, bool notify) return 0; } =20 +static void execute_write_rx_config(struct work_struct *param) +{ + struct rx_config_work *rx_work =3D container_of(param, + struct rx_config_work, + config_write); + struct net_device *dev =3D rx_work->dev; + + // This path should not be hit outside the work item + WARN_ON(!dev->netdev_ops->ndo_write_rx_config); + dev->netdev_ops->ndo_write_rx_config(dev); +} + +/* + * Sets up the rx_config snapshot and schedules write_rx_config. If + * it's necessary to wait for completion of write_rx_config, set + * flush to true. + */ +void set_and_schedule_rx_config(struct net_device *dev, bool flush) +{ + const struct net_device_ops *ops =3D dev->netdev_ops; + + if (ops->ndo_set_rx_mode) + ops->ndo_set_rx_mode(dev); + + if (ops->ndo_write_rx_config) { + schedule_work(&dev->rx_work->config_write); + if (flush) + flush_work(&dev->rx_work->config_write); + } +} + /* * Upload unicast and multicast address lists to device and * configure RX filtering. When the device doesn't support unicast @@ -9532,8 +9563,6 @@ int netif_set_allmulti(struct net_device *dev, int in= c, bool notify) */ void __dev_set_rx_mode(struct net_device *dev) { - const struct net_device_ops *ops =3D dev->netdev_ops; - /* dev_open will call this function so the list will stay sane. */ if (!(dev->flags&IFF_UP)) return; @@ -9554,8 +9583,7 @@ void __dev_set_rx_mode(struct net_device *dev) } } =20 - if (ops->ndo_set_rx_mode) - ops->ndo_set_rx_mode(dev); + set_and_schedule_rx_config(dev, false); } =20 void dev_set_rx_mode(struct net_device *dev) @@ -11946,6 +11974,15 @@ struct net_device *alloc_netdev_mqs(int sizeof_pri= v, const char *name, INIT_LIST_HEAD(&dev->ptype_all); INIT_LIST_HEAD(&dev->ptype_specific); INIT_LIST_HEAD(&dev->net_notifier_list); + + dev->rx_work =3D kmalloc(sizeof(*dev->rx_work), GFP_KERNEL); + if (!dev->rx_work) + goto free_all; + + dev->rx_work->dev =3D dev; + spin_lock_init(&dev->rx_work->config_lock); + INIT_WORK(&dev->rx_work->config_write, execute_write_rx_config); + #ifdef CONFIG_NET_SCHED hash_init(dev->qdisc_hash); #endif @@ -12083,6 +12120,9 @@ void free_netdev(struct net_device *dev) return; } =20 + cancel_work_sync(&dev->rx_work->config_write); + kfree(dev->rx_work); + BUG_ON(dev->reg_state !=3D NETREG_UNREGISTERED); WRITE_ONCE(dev->reg_state, NETREG_RELEASED); =20 --=20 2.47.3 From nobody Sun Feb 8 02:41:47 2026 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 077FF31D758 for ; Mon, 20 Oct 2025 13:49:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760968174; cv=none; b=khU5t8uvMomvLYQNSGdoq2aK6WLJnq1pU2Utk46iALBDdq36kZoueUlvQM7abq5czVVGLuGgDIMAh/m0Tle0qkxLLBPiHnRty3BRcFLwUfKlLpeVXvn/EJgceTM7WBrAKfJHR/XbTHTOPzxBkSTaUP/kKdvb6YXxOP/TIiYer3E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760968174; c=relaxed/simple; bh=OdAkGFsVBeypNY8bG/+x2bxmidQpWkTH+22jXc8Cjk0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sr8o4oL+xQ5VXAoDpxAjw1poXATMCte+Zm4Na0z42wr8937tx68SUCz7p9rhJwDqa10WSoIAZ6XZWKYZTieBGgrr9gVKFdhdcQZxpbLNbFYeferkJiBfzBr/GC6GfICLlcufojpt+1c6LrMz+BXJBmJWW/3zev7L9AXsuItcwrs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NyBP06TQ; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NyBP06TQ" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-791c287c10dso3373576b3a.1 for ; Mon, 20 Oct 2025 06:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760968172; x=1761572972; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eODQs0ub6BtCBcbm30jQFNEO4Utk4CtbjZek/rCcark=; b=NyBP06TQ31cD4hxfY1WJg9sVX4t7jMmTENkQ0PXSPbKToz5tTNfU9Cn3lXG+M4ATk/ 3le8jww25kt4lzXp93jBrILDFZDqY02WlTiMmcHDFXCB2uZkElBjdK2NOnQnyDAsTo6/ tQk0deOYL29lndtH5u8Ey4A3p2oy/5jy+x8qG6ZZ5Y/b88IRvaEyO9oW3J3yytxtnm92 4hQbHka/bD63kUtzqYbPndXrMXqNmO1XbvFsBDWQVVaGxdN0MO0z+CVAXngyafXZv/2z ctpX7w8G7fhJF92+41tLTBmE7dwKmyHarUMVyyCIrDVpuufFc1um96+uwFd/BgGtfjph tpiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760968172; x=1761572972; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eODQs0ub6BtCBcbm30jQFNEO4Utk4CtbjZek/rCcark=; b=FgKpuola1SUzi9+IrNc2Pp9EMY/We4lApKo0J/TiD2rZVr3KhsAn6BochnxqzGRTvQ 1tb8TovDs9DKb9n2aVKlYqdwuNDUuWZ7v7jvjOyNoZfDCh8yIp2matnar8awntvZVNtf 68tbLDYeZw2uPIhDhrjz9t7MSFgKaVJtWaZbk3Ljwa7AtEmoPXsiceRnl/Mn+nBnb/Kg ofAiTrakQM5m4vUwt8CU7sf3UQhmZjN9a5luojr5V+xW0It5Y7SPiAT4ZnSHawH065j0 qVoEzrFpMomtuhVSZG2ZFVqg+6q63vJtYxqzd3mAI5qoq0/UcK7r52vVpSwq28vETnbV E3NA== X-Forwarded-Encrypted: i=1; AJvYcCU4ZZnyIHtpEei8RuoihHgxn9X6kHRIWiMDpfwoq62QXY7m0RMcB1aoWDmiUIKs28mng7VIUD7LUFUVi4k=@vger.kernel.org X-Gm-Message-State: AOJu0YwmhgWJAyqFR18gLcR/q0dqUZIWFLqq4KbUwLsARM2ulJP0ELQG aiA9mnrK7LE5zPDM/N27KqADXg1/QAJSpUknI3qgJGWh4+BEhuKFMOs9 X-Gm-Gg: ASbGncv5ic6xwfEaK8T+Hu8qUPZi6AMA7f9qNtek7jG333TxVIox4e1It1gqLDlHGfV d/iRrOndlvtXlqxnRRatclKXVDraSK3smctK+UIjoCWcjYkb5dF39ryoy5n1nSB2EQ2Ig5pYsbq nLClx7fThlSI/mgcIDkZ2qY86MMfNuMDjaYyzMPkaJDLcaIo5dsUQLGMV3wU1fB8rebroZWqfwh ioe9jKu8fIbuT4tUfz7S44bWeum5sqjJZKYEWEZJgwXcnF49DieE4wzyZS6X2SJZZTrNX2qbpw9 U6K8XJRH2asZWUcOmSI92ecZCGJGX8WtO2f0tFyLQTEKvqGMIjULv99l/S4xb+T5BHT4jhcmoSq 4XzBmCz4HHQugyw0y2cPS8f23dbZTbWFjSZsAGj5FQ8cLK2+MGHlOskGBCBnJYSwvL9AFRljQpR Y1bp6MGPMgGiy0g2o+okh8lcmUF5mvvq0RrZ9het3XugicvwL+zmDSvnzdDhmtYIiEzr7Hy++sR w== X-Google-Smtp-Source: AGHT+IFiKRAll9tcnFwi3rMLldMi2VlZJ+m3l4+IxH5yr0qxsRT3jhyqtjhnAiXqR5sBVn7aaUjVHg== X-Received: by 2002:a17:903:2309:b0:262:79a:93fb with SMTP id d9443c01a7336-290ca121803mr178719455ad.32.1760968172002; Mon, 20 Oct 2025 06:49:32 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:1cc9:d444:c07a:121f:22da:3f7b]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33bdd02793dsm4507349a91.3.2025.10.20.06.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Oct 2025 06:49:31 -0700 (PDT) From: I Viswanath To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, sdf@fomichev.me, kuniyu@google.com, ahmed.zaki@intel.com, aleksander.lobakin@intel.com, andrew+netdev@lunn.ch Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linux.dev, david.hunter.linux@gmail.com, khalid@kernel.org, I Viswanath Subject: [RFC net-next PATCH 2/2] net: ethernet: Implement ndo_write_rx_config callback for the 8139cp driver Date: Mon, 20 Oct 2025 19:18:57 +0530 Message-ID: <20251020134857.5820-3-viswanathiyyappan@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251020134857.5820-1-viswanathiyyappan@gmail.com> References: <20251020134857.5820-1-viswanathiyyappan@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement ndo_write_rx_config for the 8139cp driver Signed-off-by: I Viswanath --- I modified and set ndo_set_rx_mode to be __cp_set_rx_mode as using cp_set_rx_mode as ndo_set_rx_mode callback would have led to a deadlock in cp_init_hw()=20 =20 drivers/net/ethernet/realtek/8139cp.c | 67 ++++++++++++++++++--------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/r= ealtek/8139cp.c index 5652da8a178c..ff6195c7f3b6 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -319,6 +319,11 @@ struct cp_extra_stats { unsigned long rx_frags; }; =20 +struct cp_rx_config { + int rx_mode; + u32 mc_filter[2]; /* Multicast hash filter */ +}; + struct cp_private { void __iomem *regs; struct net_device *dev; @@ -328,7 +333,7 @@ struct cp_private { struct napi_struct napi; =20 struct pci_dev *pdev; - u32 rx_config; + struct cp_rx_config *rx_config; u16 cpcmd; =20 struct cp_extra_stats cp_stats; @@ -882,45 +887,53 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, goto out_unlock; } =20 +static void cp_write_rx_config(struct net_device *dev) +{ + struct cp_private *cp =3D netdev_priv(dev); + struct cp_rx_config snapshot; + + read_snapshot((&snapshot), struct cp_private); + + /* We can safely update without stopping the chip. */ + cpw32_f(RxConfig, snapshot.rx_mode); + + cpw32_f(MAR0 + 0, snapshot.mc_filter[0]); + cpw32_f(MAR0 + 4, snapshot.mc_filter[1]); +} + /* Set or clear the multicast filter for this adaptor. This routine is not state sensitive and need not be SMP locked. */ =20 static void __cp_set_rx_mode (struct net_device *dev) { - struct cp_private *cp =3D netdev_priv(dev); - u32 mc_filter[2]; /* Multicast hash filter */ - int rx_mode; + struct cp_rx_config new_config; =20 /* Note: do not reorder, GCC is clever about common statements. */ if (dev->flags & IFF_PROMISC) { /* Unconditionally log net taps. */ - rx_mode =3D + new_config.rx_mode =3D AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptAllPhys; - mc_filter[1] =3D mc_filter[0] =3D 0xffffffff; + new_config.mc_filter[1] =3D new_config.mc_filter[0] =3D 0xffffffff; } else if ((netdev_mc_count(dev) > multicast_filter_limit) || (dev->flags & IFF_ALLMULTI)) { /* Too many to filter perfectly -- accept all multicasts. */ - rx_mode =3D AcceptBroadcast | AcceptMulticast | AcceptMyPhys; - mc_filter[1] =3D mc_filter[0] =3D 0xffffffff; + new_config.rx_mode =3D AcceptBroadcast | AcceptMulticast | AcceptMyPhys; + new_config.mc_filter[1] =3D new_config.mc_filter[0] =3D 0xffffffff; } else { struct netdev_hw_addr *ha; - rx_mode =3D AcceptBroadcast | AcceptMyPhys; - mc_filter[1] =3D mc_filter[0] =3D 0; + new_config.rx_mode =3D AcceptBroadcast | AcceptMyPhys; + new_config.mc_filter[1] =3D new_config.mc_filter[0] =3D 0; netdev_for_each_mc_addr(ha, dev) { int bit_nr =3D ether_crc(ETH_ALEN, ha->addr) >> 26; =20 - mc_filter[bit_nr >> 5] |=3D 1 << (bit_nr & 31); - rx_mode |=3D AcceptMulticast; + new_config.mc_filter[bit_nr >> 5] |=3D 1 << (bit_nr & 31); + new_config.rx_mode |=3D AcceptMulticast; } } =20 - /* We can safely update without stopping the chip. */ - cp->rx_config =3D cp_rx_config | rx_mode; - cpw32_f(RxConfig, cp->rx_config); - - cpw32_f (MAR0 + 0, mc_filter[0]); - cpw32_f (MAR0 + 4, mc_filter[1]); + new_config.rx_mode =3D cp_rx_config | new_config.rx_mode; + update_snapshot(&new_config, struct cp_private); } =20 static void cp_set_rx_mode (struct net_device *dev) @@ -1040,7 +1053,7 @@ static void cp_init_hw (struct cp_private *cp) cp_start_hw(cp); cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */ =20 - __cp_set_rx_mode(dev); + set_and_schedule_rx_config(dev, true); cpw32_f (TxConfig, IFG | (TX_DMA_BURST << TxDMAShift)); =20 cpw8(Config1, cpr8(Config1) | DriverLoaded | PMEnable); @@ -1188,6 +1201,12 @@ static int cp_open (struct net_device *dev) if (rc) return rc; =20 + cp->rx_config =3D kmalloc(sizeof(*cp->rx_config), GFP_KERNEL); + if (!cp->rx_config) { + rc =3D -ENOMEM; + goto err_out_rx_config; + } + napi_enable(&cp->napi); =20 cp_init_hw(cp); @@ -1207,6 +1226,9 @@ static int cp_open (struct net_device *dev) err_out_hw: napi_disable(&cp->napi); cp_stop_hw(cp); + kfree(cp->rx_config); + +err_out_rx_config: cp_free_rings(cp); return rc; } @@ -1227,6 +1249,8 @@ static int cp_close (struct net_device *dev) =20 cp_stop_hw(cp); =20 + kfree(cp->rx_config); + spin_unlock_irqrestore(&cp->lock, flags); =20 free_irq(cp->pdev->irq, dev); @@ -1262,7 +1286,7 @@ static void cp_tx_timeout(struct net_device *dev, uns= igned int txqueue) cp_clean_rings(cp); cp_init_rings(cp); cp_start_hw(cp); - __cp_set_rx_mode(dev); + set_and_schedule_rx_config(dev, false); cpw16_f(IntrMask, cp_norx_intr_mask); =20 netif_wake_queue(dev); @@ -1869,7 +1893,8 @@ static const struct net_device_ops cp_netdev_ops =3D { .ndo_stop =3D cp_close, .ndo_validate_addr =3D eth_validate_addr, .ndo_set_mac_address =3D cp_set_mac_address, - .ndo_set_rx_mode =3D cp_set_rx_mode, + .ndo_set_rx_mode =3D __cp_set_rx_mode, + .ndo_write_rx_config =3D cp_write_rx_config, .ndo_get_stats =3D cp_get_stats, .ndo_eth_ioctl =3D cp_ioctl, .ndo_start_xmit =3D cp_start_xmit, --=20 2.47.3