Commit 9c0d0fa8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-dsa-mv88e6xxx-remove-redundant-ptp-timestamping-code' 

Russell King says:

====================
net: dsa: mv88e6xxx: remove redundant ptp/timestamping code

mv88e6xxx as accumulated some unused data structures and code over the
years. This series removes it and simplifies the code. See the patches
for each change.
====================

Link: https://patch.msgid.link/aMKoYyN18FHFCa1q@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 010fe36a fbd12de4

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -5088,7 +5088,7 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { 
	.vtu_getnext = mv88e6185_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,

	.avb_ops = &mv88e6352_avb_ops,

	.ptp_ops = &mv88e6250_ptp_ops,

	.ptp_ops = &mv88e6352_ptp_ops,

	.phylink_get_caps = mv88e6250_phylink_get_caps,

	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,

};

drivers/net/dsa/mv88e6xxx/chip.h

+0 −2
Original line number Diff line number Diff line
@@ -424,8 +424,6 @@ struct mv88e6xxx_chip { 
	struct ptp_clock_info	ptp_clock_info;

	struct delayed_work	tai_event_work;

	struct ptp_pin_desc	pin_config[MV88E6XXX_MAX_GPIO];

	u16 trig_config;

	u16 evcap_config;

	u16 enable_count;



	/* Current ingress and egress monitor ports */

drivers/net/dsa/mv88e6xxx/ptp.c

+8 −47
Original line number Diff line number Diff line
@@ -167,42 +167,26 @@ static u64 mv88e6165_ptp_clock_read(struct cyclecounter *cc) 
}



/* mv88e6352_config_eventcap - configure TAI event capture

 * @event: PTP_CLOCK_PPS (internal) or PTP_CLOCK_EXTTS (external)

 * @rising: zero for falling-edge trigger, else rising-edge trigger

 *

 * This will also reset the capture sequence counter.

 */

static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int event,

				     int rising)

static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int rising)

{

	u16 global_config;

	u16 cap_config;

	u16 evcap_config;

	int err;



	chip->evcap_config = MV88E6XXX_TAI_CFG_CAP_OVERWRITE |

	evcap_config = MV88E6XXX_TAI_CFG_CAP_OVERWRITE |

		       MV88E6XXX_TAI_CFG_CAP_CTR_START;

	if (!rising)

		chip->evcap_config |= MV88E6XXX_TAI_CFG_EVREQ_FALLING;

		evcap_config |= MV88E6XXX_TAI_CFG_EVREQ_FALLING;



	global_config = (chip->evcap_config | chip->trig_config);

	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_CFG, global_config);

	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_CFG, evcap_config);

	if (err)

		return err;



	if (event == PTP_CLOCK_PPS) {

		cap_config = MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG;

	} else if (event == PTP_CLOCK_EXTTS) {

		/* if STATUS_CAP_TRIG is unset we capture PTP_EVREQ events */

		cap_config = 0;

	} else {

		return -EINVAL;

	}



	/* Write the capture config; this also clears the capture counter */

	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS,

				  cap_config);



	return err;

	return mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS, 0);

}



static void mv88e6352_tai_event_work(struct work_struct *ugly)
@@ -355,7 +339,7 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip, 
		schedule_delayed_work(&chip->tai_event_work,

				      TAI_EVENT_WORK_INTERVAL);



		err = mv88e6352_config_eventcap(chip, PTP_CLOCK_EXTTS, rising);

		err = mv88e6352_config_eventcap(chip, rising);

	} else {

		func = MV88E6352_G2_SCRATCH_GPIO_PCTL_GPIO;
@@ -413,29 +397,6 @@ const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = { 
		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {

	.clock_read = mv88e6352_ptp_clock_read,

	.ptp_enable = mv88e6352_ptp_enable,

	.ptp_verify = mv88e6352_ptp_verify,

	.event_work = mv88e6352_tai_event_work,

	.port_enable = mv88e6352_hwtstamp_port_enable,

	.port_disable = mv88e6352_hwtstamp_port_disable,

	.n_ext_ts = 1,

	.arr0_sts_reg = MV88E6XXX_PORT_PTP_ARR0_STS,

	.arr1_sts_reg = MV88E6XXX_PORT_PTP_ARR1_STS,

	.dep_sts_reg = MV88E6XXX_PORT_PTP_DEP_STS,

	.rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |

		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) |

		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) |

		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),

};



const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {

	.clock_read = mv88e6352_ptp_clock_read,

	.ptp_enable = mv88e6352_ptp_enable,

drivers/net/dsa/mv88e6xxx/ptp.h

+0 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 


/* Offset 0x09: Event Status */

#define MV88E6XXX_TAI_EVENT_STATUS		0x09

#define MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG	0x4000

#define MV88E6XXX_TAI_EVENT_STATUS_ERROR	0x0200

#define MV88E6XXX_TAI_EVENT_STATUS_VALID	0x0100

#define MV88E6XXX_TAI_EVENT_STATUS_CTR_MASK	0x00ff
@@ -149,7 +148,6 @@ void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip); 
				      ptp_clock_info)



extern const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops;

extern const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops;
@@ -170,7 +168,6 @@ static inline void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip) 
}



static const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6250_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {};

static const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {};