From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 27734401498; Wed, 25 Mar 2026 16:30:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456207; cv=none; b=tH0ceFubhmA5CDNVKNBns8sEyzIxQ3RYVJq2SRlIx5FsxpD7UXX+JkpNYPDamWHRf3dJxFxtM/ZJibUjPOQ8cJPk/+vnjDWPwZWaan8DlY2tp/qDgftfMG1VdJuG7OgXozHQm3EMPQTDOZ+/NKYLAMwXaxUrNrcVDVTfX5Lyxao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774456207; c=relaxed/simple; bh=SI/nbinYmlv3ClOdOqznxnr/ym+iNX3LvdqOnIkrfeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZQ+cV+MdG16FikcNABzYWaY6v7gabOn+MJ2Q4F0pojRSiax3nKF7O2gPLfumPbLpHL3VEz1M9wn7bE2vjth8iGnPFmSHacbEXkbfcqFhl9zn2m6K085Eaj9gZf9gJD/Hx/LTU2kLLm8RWpPs/ushWSQamsouTGagcLHPvGJdsME= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eHn/zBJs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eHn/zBJs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A28CC19423; Wed, 25 Mar 2026 16:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774456206; bh=SI/nbinYmlv3ClOdOqznxnr/ym+iNX3LvdqOnIkrfeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eHn/zBJs7vzQAN7B5DQNCZUjQ4lyOWZnuSCYnWAbKPdHuFIcLJ3vbjwIf/7fSyLk1 V+OSH3jweZ9DR1PetGAKSKtiUFdKcopIlN0UP7A+XUyA1nvLlWCNSete1rhs7BAN31 +ouqSX4OPTHEJZAub6aRwWV2RvBJ4wIcmotlNgB5QA97+HIW75iLW+c0eehdcWzD4t q8+f09QY798P4VwHNcMZK6iXVlhijXLuDb16W56LNQkWN8oN6fd+/FCFJL98Sm0gTF Xc8Gq3eAmpoa2X9tYyzU6iNkGiWyMgPtQQFJ5ZuyLxn2s6q0gGo7ycA5vFKL/7eEj7 Qsdiq/ROGL55g== From: Conor Dooley To: netdev@vger.kernel.org Cc: conor@kernel.org, Conor Dooley , Valentina.FernandezAlanis@microchip.com, Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Daire McNamara , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Nicolas Ferre , Claudiu Beznea , Richard Cochran , Samuel Holland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Dave Stevenson , Sean Anderson , Vineeth Karumanchi , Abin Joseph , =?UTF-8?q?Th=C3=A9o=20Lebrun?= , Ryan.Wanner@microchip.com, Kevin Hao Subject: [PATCH net-next v5 13/14] net: macb: set MACB_CAPS_USRIO_DISABLED if no usrio config is provided Date: Wed, 25 Mar 2026 16:28:17 +0000 Message-ID: <20260325-husband-cape-ec4945b9184c@spud> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325-unsterile-flail-4c7729750dc4@spud> References: <20260325-unsterile-flail-4c7729750dc4@spud> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1255; i=conor.dooley@microchip.com; h=from:subject:message-id; bh=wWQAgoUtn0mz+g0O0PGK24RiTXGyZCFOTNhrOE5r3kY=; b=owGbwMvMwCVWscWwfUFT0iXG02pJDJlHeM2/7rnyJl5+UuW/7c0d5bNDy2pbTimn/v8lffRxq ElFzrrEjlIWBjEuBlkxRZbE230tUuv/uOxw7nkLM4eVCWQIAxenAEzk5TSGfyaCsw4yK9xgO7lF 8vnMh31Ll88waJEIsd/948iLm+v2ffBjZFg+SbI8dZrw0XP6pR8bfjKy3ZSU1d/R4VG6JN6aYd0 3U0YA X-Developer-Key: i=conor.dooley@microchip.com; a=openpgp; fpr=F9ECA03CF54F12CD01F1655722E2C55B37CF380C Content-Transfer-Encoding: 8bit From: Théo Lebrun bp->usrio is copied directly from dt_conf->usrio in macb_probe(). If dt_conf->usrio is NULL, we do not want to land in USRIO write codepaths which dereference bp->usrio. Inherit automatically MACB_CAPS_USRIO_DISABLED to avoid those. This means a macb_config that wants to disable usrio can simply drop its .usrio field, rather than add the disabled capability explicitly. Nit: drop the dt_conf NULL check because the pointer is always valid. Signed-off-by: Théo Lebrun Signed-off-by: Conor Dooley --- drivers/net/ethernet/cadence/macb_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index b9791bbbec8bf..9befb268ed79e 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4577,8 +4577,10 @@ static void macb_configure_caps(struct macb *bp, { u32 dcfg; - if (dt_conf) - bp->caps = dt_conf->caps; + bp->caps = dt_conf->caps; + + if (!dt_conf->usrio) + bp->caps |= MACB_CAPS_USRIO_DISABLED; if (hw_is_gem(bp->regs, bp->native_io)) { bp->caps |= MACB_CAPS_MACB_IS_GEM; -- 2.53.0