Commit 281f8203 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-devlink-return-the-driver-name-in-devlink_nl_info_fill' 

Vincent Mailhol says:

====================
net: devlink: return the driver name in devlink_nl_info_fill

The driver name is available in device_driver::name. Right now,
drivers still have to report this piece of information themselves in
their devlink_ops::info_get callback function.

The goal of this series is to have the devlink core to report this
information instead of the drivers.

The first patch fulfills the actual goal of this series: modify
devlink core to report the driver name and clean-up all drivers. Both
have to be done in an atomic change to avoid attribute
duplication. This same patch also removes the
devlink_info_driver_name_put() function to prevent future drivers from
reporting the driver name themselves.

The second patch allows the core to call devlink_nl_info_fill() even
if the devlink_ops::info_get() callback is NULL. This leads to the
third and final patch which cleans up the drivers which have an empty
info_get().
====================

Link: https://lore.kernel.org/r/20221129095140.3913303-1-mailhol.vincent@wanadoo.fr


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a933e7f0 cf4590b9

drivers/crypto/marvell/octeontx2/otx2_cpt_devlink.c

+0 −4
Original line number Diff line number Diff line
@@ -76,10 +76,6 @@ static int otx2_cpt_devlink_info_get(struct devlink *dl, 
	struct otx2_cptpf_dev *cptpf = cpt_dl->cptpf;

	int err;



	err = devlink_info_driver_name_put(req, "rvu_cptpf");

	if (err)

		return err;



	err = otx2_cpt_dl_info_firmware_version_put(req, cptpf->eng_grps.grp,

						    "fw.ae", OTX2_CPT_AE_TYPES);

	if (err)

drivers/net/dsa/hirschmann/hellcreek.c

+0 −5
Original line number Diff line number Diff line
@@ -1176,11 +1176,6 @@ static int hellcreek_devlink_info_get(struct dsa_switch *ds, 
				      struct netlink_ext_ack *extack)

{

	struct hellcreek *hellcreek = ds->priv;

	int ret;



	ret = devlink_info_driver_name_put(req, "hellcreek");

	if (ret)

		return ret;



	return devlink_info_version_fixed_put(req,

					      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,

drivers/net/dsa/mv88e6xxx/devlink.c

+0 −5
Original line number Diff line number Diff line
@@ -821,11 +821,6 @@ int mv88e6xxx_devlink_info_get(struct dsa_switch *ds, 
			       struct netlink_ext_ack *extack)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	int err;



	err = devlink_info_driver_name_put(req, "mv88e6xxx");

	if (err)

		return err;



	return devlink_info_version_fixed_put(req,

					      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,

drivers/net/dsa/sja1105/sja1105_devlink.c

+3 −9
Original line number Diff line number Diff line
@@ -120,16 +120,10 @@ int sja1105_devlink_info_get(struct dsa_switch *ds, 
			     struct netlink_ext_ack *extack)

{

	struct sja1105_private *priv = ds->priv;

	int rc;



	rc = devlink_info_driver_name_put(req, "sja1105");

	if (rc)

		return rc;



	rc = devlink_info_version_fixed_put(req,

	return devlink_info_version_fixed_put(req,

					      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,

					      priv->info->name);

	return rc;

}



int sja1105_devlink_setup(struct dsa_switch *ds)

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+0 −4
Original line number Diff line number Diff line
@@ -892,10 +892,6 @@ static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
	u32 ver = 0;

	int rc;



	rc = devlink_info_driver_name_put(req, DRV_MODULE_NAME);

	if (rc)

		return rc;



	if (BNXT_PF(bp) && (bp->flags & BNXT_FLAG_DSN_VALID)) {

		sprintf(buf, "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X",

			bp->dsn[7], bp->dsn[6], bp->dsn[5], bp->dsn[4],