From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.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 872AF3B4407 for ; Thu, 11 Jun 2026 07:09:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781161785; cv=none; b=Pafzw6IkW6RTlYZ2PxkNa76yi37EyQulLB2j6r1k6yoqVt3lkgIWHxAArMW/rBox67z1cbLGeFYa2nxicyycu3UnauO7M6h5bS0t8DOio3yFsvXmctZ4L9/r/2xykCDdZjCx+uxFznvvwf7bf58PnZbN0qfQzeWzQmaY0DrWT+4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781161785; c=relaxed/simple; bh=LKZkxge+/v6SAk9zEBTdm7nNlWehxrJKWFBOkQa42X4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rkwXHQkJ/Fu3bPg+1/pWTwlonHg5rZAArp9Me9p4pUJQEPv5sUZQXclM+nBveyE6W4g0E3L+CqQyW2Egb1m1aPnEU8nEpFsYJXaQpHElRMtoSUzFKrgtY3912J4VQKr2d/J4p4h1BCd3zLSDwulL4esDAJBT6FWyQ5lOfbLSNtY= 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=c9nzDk74; arc=none smtp.client-ip=209.85.214.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="c9nzDk74" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2bf2e8ccca1so54216775ad.0 for ; Thu, 11 Jun 2026 00:09:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781161784; x=1781766584; 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=qc5McNJZWXcInPiqjiZYGkHhDZEjUFo5MulDJfEtkWc=; b=c9nzDk74r6kyHQcBdiR2VCkxckg8JHUr6ZN2hNPJV4AooR6byM8eEGrpWo10SDjAJ6 y78v6g9VyjVjlUEDXlw4rDenobTTbCXPm6UITmhR8Qj8lzoltG/Tfk7huyQ1EyMu7mSY pVBCz0ROjHiFPOSkblr2XEhKwU/qCF7NFXqSAiswLFgAUg2eAMuu72dqcP3LgRi8PFmK bz/eYt/rbNMrOuXAE8QP7F21haGK/UrBJbSDXT9gmcNuKNU9ulAK6LjWMtuqVRjZasek QNTo3VKd+Q6tvRqxI2iTIQgx8FBEtgGVWahpU/Quo6/zPf0fTHwDojea2SvvD8ekEYl1 MhIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781161784; x=1781766584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qc5McNJZWXcInPiqjiZYGkHhDZEjUFo5MulDJfEtkWc=; b=WEIoYPX1R36DGA/9Oz0Smk5zYYa8+o9ulsUnvgfA3uQqVAeoB7eB+3SsKKi/cv2voq 6kSqyhP8S320LUQxaidGeJaPQNalPx+I6/Gvzo0TfulDe0x8zGMO3pd8Y0wggKs7KugX K6uiBA14uj9NBJJG3AUTilDKqydvDOj5kltNe70c9EfTtD1pph5mMgswHIv7Kyx/FCJb H7WkDv4eUnAmV9B7e5ZNplfrMYGflZTEYq6lCf22CFjA8LPVM+wu1XhOXJu6IrMRUgj4 qCXNlVrECyn8gIeMHXIfudXxqgaSDrWlTJDOvNrq56zn3J8wbFjaCV0eU7LtK5Va1C5f M1jQ== X-Forwarded-Encrypted: i=1; AFNElJ+9XAlV+2/rgJpsuRg3YsS6fLyVXcmuTXreMPxZeKrHCyZquZoMW4oQPjSxpdAvmKP9F6TKZLZsQI7Gj/w=@vger.kernel.org X-Gm-Message-State: AOJu0Yxk8LeqbR0umBKzauXhmiBWdWFn6SWfOUeTAMdw1+Gxog3ZGIfX 06Loyr+BVBhBUBHbValrIWsrlVY9fqRa2phRsfyQlh92AalhZdDqoTKd X-Gm-Gg: Acq92OG9lNmR88Oc8sMNYUcHxiHDcWtFi+tVi8msaTcs5Nyqgec72W1NKwLq+tyW4mA mrhzI3vYygMxbLkpy/xkzbUhmTiz8gyH4+EDdiqH9XJpIs4QxQBOMs6B5Tl2xGgdQkJuoBNsVJT k+ssPoOiUkEgNvG07b2jnqR5rBq0ruPktFTu8bMFKNicI5e3eMW7LZrvoihBS3xbREFI1RPc8rL v9gPno4+cYqR/yeF6fEF5jdEQzjPKixJv2B7IYVrMGjSuYfr5P0ZfNW59v2d5iey5USRrscKz7P 5geGa9NmORgLIoyRJV3P1u+LDW0NQ9ithm4HZhKPN1qN5Im68rXASlPXUYTUAXGYRwj9DpTu9kH GZ4xHUL8HJrHHBx4yK2T0hzukqXRPNrLNhxQaxgYh28lust5Rd4T64bXTIP479a1B70h6zCerFL ol9RAO8ElW0U3MHwSfjP9mpNcqOZ+kRzRwjYUzCCTyFJXIR4HpMT4fCvJghxM6 X-Received: by 2002:a17:902:ecc4:b0:2b0:608d:d8a8 with SMTP id d9443c01a7336-2c2f0731886mr19433555ad.1.1781161783951; Thu, 11 Jun 2026 00:09:43 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:661d:3046::4cf:39]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c2d9bb2199sm18818975ad.77.2026.06.11.00.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 00:09:43 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Florian Fainelli , Jonas Gorski , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Kurt Kanzenbach , Jiri Pirko , Simon Horman , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 4/5] net: dsa: mv88e6xxx: Avoid devlink resource IDs collision with PARENT_TOP Date: Thu, 11 Jun 2026 15:08:50 +0800 Message-ID: <20260611070856.889700-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260611070856.889700-1-mmyangfl@gmail.com> References: <20260611070856.889700-1-mmyangfl@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: 8bit The devlink resource ID for ATU collides with the sentinel DEVLINK_RESOURCE_ID_PARENT_TOP (0). As a result, ATU_bin_* are registered as in fact registered as top-level siblings, not as children of ATU. Whether intentional or unintentional, clarify it by keeping the real resource IDs starting at 1. Unfortunately ATU_bin_* are already registered at top-level, so keep their parent to PARENT_TOP. Signed-off-by: David Yang --- drivers/net/dsa/mv88e6xxx/devlink.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/devlink.c b/drivers/net/dsa/mv88e6xxx/devlink.c index 0f84bffc8ef1..6f034841883c 100644 --- a/drivers/net/dsa/mv88e6xxx/devlink.c +++ b/drivers/net/dsa/mv88e6xxx/devlink.c @@ -91,6 +91,7 @@ void mv88e6xxx_teardown_devlink_params(struct dsa_switch *ds) } enum mv88e6xxx_devlink_resource_id { + MV88E6XXX_RESOURCE_ID_NONE, /* DEVLINK_RESOURCE_ID_PARENT_TOP */ MV88E6XXX_RESOURCE_ID_ATU, MV88E6XXX_RESOURCE_ID_ATU_BIN_0, MV88E6XXX_RESOURCE_ID_ATU_BIN_1, @@ -200,7 +201,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds) err = dsa_devlink_resource_register(ds, "ATU_bin_0", mv88e6xxx_num_macs(chip) / 4, MV88E6XXX_RESOURCE_ID_ATU_BIN_0, - MV88E6XXX_RESOURCE_ID_ATU, + DEVLINK_RESOURCE_ID_PARENT_TOP, &size_params); if (err) goto out; @@ -208,7 +209,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds) err = dsa_devlink_resource_register(ds, "ATU_bin_1", mv88e6xxx_num_macs(chip) / 4, MV88E6XXX_RESOURCE_ID_ATU_BIN_1, - MV88E6XXX_RESOURCE_ID_ATU, + DEVLINK_RESOURCE_ID_PARENT_TOP, &size_params); if (err) goto out; @@ -216,7 +217,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds) err = dsa_devlink_resource_register(ds, "ATU_bin_2", mv88e6xxx_num_macs(chip) / 4, MV88E6XXX_RESOURCE_ID_ATU_BIN_2, - MV88E6XXX_RESOURCE_ID_ATU, + DEVLINK_RESOURCE_ID_PARENT_TOP, &size_params); if (err) goto out; @@ -224,7 +225,7 @@ int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds) err = dsa_devlink_resource_register(ds, "ATU_bin_3", mv88e6xxx_num_macs(chip) / 4, MV88E6XXX_RESOURCE_ID_ATU_BIN_3, - MV88E6XXX_RESOURCE_ID_ATU, + DEVLINK_RESOURCE_ID_PARENT_TOP, &size_params); if (err) goto out; -- 2.53.0