Commit aa5513f5 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Jakub Kicinski
Browse files

net: stmmac: replace the ext_snapshot_en field with a flag 



Drop the boolean field of the plat_stmmacenet_data structure in favor of a
simple bitfield flag.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20230710090001.303225-10-brgl@bgdev.pl


Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 956c3f09

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static int intel_crosststamp(ktime_t *device, 
	/* Both internal crosstimestamping and external triggered event

	 * timestamping cannot be run concurrently.

	 */

	if (priv->plat->ext_snapshot_en)

	if (priv->plat->flags & STMMAC_FLAG_EXT_SNAPSHOT_EN)

		return -EBUSY;



	priv->plat->int_snapshot_en = 1;

drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void timestamp_interrupt(struct stmmac_priv *priv) 
	 */

	ts_status = readl(priv->ioaddr + GMAC_TIMESTAMP_STATUS);



	if (!priv->plat->ext_snapshot_en)

	if (priv->plat->flags & STMMAC_FLAG_EXT_SNAPSHOT_EN)

		return;



	num_snapshot = (ts_status & GMAC_TIMESTAMP_ATSNS_MASK) >>

drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c

+4 −1
Original line number Diff line number Diff line
@@ -192,7 +192,10 @@ static int stmmac_enable(struct ptp_clock_info *ptp, 
		write_unlock_irqrestore(&priv->ptp_lock, flags);

		break;

	case PTP_CLK_REQ_EXTTS:

		priv->plat->ext_snapshot_en = on;

		if (on)

			priv->plat->flags |= STMMAC_FLAG_EXT_SNAPSHOT_EN;

		else

			priv->plat->flags &= ~STMMAC_FLAG_EXT_SNAPSHOT_EN;

		mutex_lock(&priv->aux_ts_lock);

		acr_value = readl(ptpaddr + PTP_ACR);

		acr_value &= ~PTP_ACR_MASK;

include/linux/stmmac.h

+1 −1
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ struct dwmac4_addrs { 
#define STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP	BIT(5)

#define STMMAC_FLAG_VLAN_FAIL_Q_EN		BIT(6)

#define STMMAC_FLAG_MULTI_MSI_EN		BIT(7)

#define STMMAC_FLAG_EXT_SNAPSHOT_EN		BIT(8)



struct plat_stmmacenet_data {

	int bus_id;
@@ -286,7 +287,6 @@ struct plat_stmmacenet_data { 
	int int_snapshot_num;

	int ext_snapshot_num;

	bool int_snapshot_en;

	bool ext_snapshot_en;

	int msi_mac_vec;

	int msi_wol_vec;

	int msi_lpi_vec;