Merge branch 'master' of ../net-next/ (39d71016) · Commits · EulixOS / Software / Kernel

drivers/net/dsa/mv88e6xxx/chip.c

+20 −2

Original line number	Diff line number	Diff line
		@@ -3583,6 +3583,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
		.port_set_speed_duplex = mv88e6341_port_set_speed_duplex,
		.port_max_speed_mode = mv88e6341_port_max_speed_mode,
		.port_tag_remap = mv88e6095_port_tag_remap,
		.port_set_policy = mv88e6352_port_set_policy,
		.port_set_frame_mode = mv88e6351_port_set_frame_mode,
		.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,
		.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,
		@@ -3596,7 +3597,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
		.port_set_cmode = mv88e6341_port_set_cmode,
		.port_setup_message_port = mv88e6xxx_setup_message_port,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		.stats_get_sset_count = mv88e6320_stats_get_sset_count,
		.stats_get_strings = mv88e6320_stats_get_strings,
		.stats_get_stats = mv88e6390_stats_get_stats,
		@@ -3606,6 +3607,9 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
		.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,
		.pot_clear = mv88e6xxx_g2_pot_clear,
		.reset = mv88e6352_g1_reset,
		.rmu_disable = mv88e6390_g1_rmu_disable,
		.atu_get_hash = mv88e6165_g1_atu_get_hash,
		.atu_set_hash = mv88e6165_g1_atu_set_hash,
		.vtu_getnext = mv88e6352_g1_vtu_getnext,
		.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
		.serdes_power = mv88e6390_serdes_power,
		@@ -3619,6 +3623,11 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
		.serdes_irq_enable = mv88e6390_serdes_irq_enable,
		.serdes_irq_status = mv88e6390_serdes_irq_status,
		.gpio_ops = &mv88e6352_gpio_ops,
		.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,
		.serdes_get_strings = mv88e6390_serdes_get_strings,
		.serdes_get_stats = mv88e6390_serdes_get_stats,
		.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,
		.serdes_get_regs = mv88e6390_serdes_get_regs,
		.phylink_validate = mv88e6341_phylink_validate,
		};

		@@ -4383,6 +4392,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
		.port_set_speed_duplex = mv88e6341_port_set_speed_duplex,
		.port_max_speed_mode = mv88e6341_port_max_speed_mode,
		.port_tag_remap = mv88e6095_port_tag_remap,
		.port_set_policy = mv88e6352_port_set_policy,
		.port_set_frame_mode = mv88e6351_port_set_frame_mode,
		.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,
		.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,
		@@ -4396,7 +4406,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
		.port_set_cmode = mv88e6341_port_set_cmode,
		.port_setup_message_port = mv88e6xxx_setup_message_port,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		.stats_get_sset_count = mv88e6320_stats_get_sset_count,
		.stats_get_strings = mv88e6320_stats_get_strings,
		.stats_get_stats = mv88e6390_stats_get_stats,
		@@ -4406,6 +4416,9 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
		.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,
		.pot_clear = mv88e6xxx_g2_pot_clear,
		.reset = mv88e6352_g1_reset,
		.rmu_disable = mv88e6390_g1_rmu_disable,
		.atu_get_hash = mv88e6165_g1_atu_get_hash,
		.atu_set_hash = mv88e6165_g1_atu_set_hash,
		.vtu_getnext = mv88e6352_g1_vtu_getnext,
		.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
		.serdes_power = mv88e6390_serdes_power,
		@@ -4421,6 +4434,11 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
		.gpio_ops = &mv88e6352_gpio_ops,
		.avb_ops = &mv88e6390_avb_ops,
		.ptp_ops = &mv88e6352_ptp_ops,
		.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,
		.serdes_get_strings = mv88e6390_serdes_get_strings,
		.serdes_get_stats = mv88e6390_serdes_get_stats,
		.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,
		.serdes_get_regs = mv88e6390_serdes_get_regs,
		.phylink_validate = mv88e6341_phylink_validate,
		};

drivers/net/dsa/mv88e6xxx/serdes.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -722,7 +722,7 @@ static struct mv88e6390_serdes_hw_stat mv88e6390_serdes_hw_stats[] = {

		int mv88e6390_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port)
		{
		if (mv88e6390_serdes_get_lane(chip, port) < 0)
		if (mv88e6xxx_serdes_get_lane(chip, port) < 0)
		return 0;

		return ARRAY_SIZE(mv88e6390_serdes_hw_stats);
		@@ -734,7 +734,7 @@ int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip,
		struct mv88e6390_serdes_hw_stat *stat;
		int i;

		if (mv88e6390_serdes_get_lane(chip, port) < 0)
		if (mv88e6xxx_serdes_get_lane(chip, port) < 0)
		return 0;

		for (i = 0; i < ARRAY_SIZE(mv88e6390_serdes_hw_stats); i++) {
		@@ -770,7 +770,7 @@ int mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,
		int lane;
		int i;

		lane = mv88e6390_serdes_get_lane(chip, port);
		lane = mv88e6xxx_serdes_get_lane(chip, port);
		if (lane < 0)
		return 0;

drivers/net/ethernet/marvell/octeontx2/af/mbox.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,8 @@ M(MSIX_OFFSET, 0x005, msix_offset, msg_req, msix_offset_rsp) \
		M(VF_FLR, 0x006, vf_flr, msg_req, msg_rsp) \
		M(PTP_OP, 0x007, ptp_op, ptp_req, ptp_rsp) \
		M(GET_HW_CAP, 0x008, get_hw_cap, msg_req, get_hw_cap_rsp) \
		M(LMTST_TBL_SETUP, 0x00a, lmtst_tbl_setup, lmtst_tbl_setup_req, \
		msg_rsp) \
		M(SET_VF_PERM, 0x00b, set_vf_perm, set_vf_perm, msg_rsp) \
		/* CGX mbox IDs (range 0x200 - 0x3FF) */ \
		M(CGX_START_RXTX, 0x200, cgx_start_rxtx, msg_req, msg_rsp) \
		@@ -1278,6 +1280,14 @@ struct set_vf_perm {
		u64 flags;
		};

		struct lmtst_tbl_setup_req {
		struct mbox_msghdr hdr;
		u16 base_pcifunc;
		u8 use_local_lmt_region;
		u64 lmt_iova;
		u64 rsvd[4];
		};

		/* CPT mailbox error codes
		* Range 901 - 1000.
		*/

drivers/net/ethernet/marvell/octeontx2/af/rvu.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2333,6 +2333,7 @@ static void __rvu_flr_handler(struct rvu *rvu, u16 pcifunc)
		rvu_blklf_teardown(rvu, pcifunc, BLKADDR_SSOW);
		rvu_blklf_teardown(rvu, pcifunc, BLKADDR_SSO);
		rvu_blklf_teardown(rvu, pcifunc, BLKADDR_NPA);
		rvu_reset_lmt_map_tbl(rvu, pcifunc);
		rvu_detach_rsrcs(rvu, NULL, pcifunc);
		mutex_unlock(&rvu->flr_lock);
		}

drivers/net/ethernet/marvell/octeontx2/af/rvu.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,7 @@ struct rvu_pfvf {
		u8 nix_blkaddr; /* BLKADDR_NIX0/1 assigned to this PF */
		u8 nix_rx_intf; /* NIX0_RX/NIX1_RX interface to NPC */
		u8 nix_tx_intf; /* NIX0_TX/NIX1_TX interface to NPC */
		u64 lmt_base_addr; /* Preseving the pcifunc's lmtst base addr*/
		unsigned long flags;
		};

		@@ -754,6 +755,9 @@ int rvu_cpt_lf_teardown(struct rvu *rvu, u16 pcifunc, int lf, int slot);
		int rvu_set_channels_base(struct rvu *rvu);
		void rvu_program_channels(struct rvu *rvu);

		/* CN10K RVU - LMT*/
		void rvu_reset_lmt_map_tbl(struct rvu *rvu, u16 pcifunc);

		#ifdef CONFIG_DEBUG_FS
		void rvu_dbg_init(struct rvu *rvu);
		void rvu_dbg_exit(struct rvu *rvu);