Merge branch 'linus' (ec662445) · Commits · EulixOS / Software / Kernel

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -3679,6 +3679,7 @@ F: Documentation/networking/bonding.rst
		F: drivers/net/bonding/
		F: include/net/bond*
		F: include/uapi/linux/if_bonding.h
		F: tools/testing/selftests/drivers/net/bonding/

		BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER
		M: Dan Robertson <dan@dlrobertson.com>

drivers/firmware/dmi_scan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -630,7 +630,7 @@ static int __init dmi_smbios3_present(const u8 *buf)
		{
		if (memcmp(buf, "_SM3_", 5) == 0 &&
		buf[6] < 32 && dmi_checksum(buf, buf[6])) {
		dmi_ver = get_unaligned_be32(buf + 6) & 0xFFFFFF;
		dmi_ver = get_unaligned_be24(buf + 7);
		dmi_num = 0; /* No longer specified */
		dmi_len = get_unaligned_le32(buf + 12);
		dmi_base = get_unaligned_le64(buf + 16);

drivers/net/bonding/bond_3ad.c

+15 −26

Original line number	Diff line number	Diff line
		@@ -84,7 +84,8 @@ enum ad_link_speed_type {
		static const u8 null_mac_addr[ETH_ALEN + 2] __long_aligned = {
		0, 0, 0, 0, 0, 0
		};
		static u16 ad_ticks_per_sec;

		static const u16 ad_ticks_per_sec = 1000 / AD_TIMER_INTERVAL;
		static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;

		static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned =
		@@ -2001,18 +2002,12 @@ void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)
		/**
		* bond_3ad_initialize - initialize a bond's 802.3ad parameters and structures
		* @bond: bonding struct to work on
		* @tick_resolution: tick duration (millisecond resolution)
		*
		* Can be called only after the mac address of the bond is set.
		*/
		void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
		void bond_3ad_initialize(struct bonding *bond)
		{
		/* check that the bond is not initialized yet */
		if (!MAC_ADDRESS_EQUAL(&(BOND_AD_INFO(bond).system.sys_mac_addr),
		bond->dev->dev_addr)) {

		BOND_AD_INFO(bond).aggregator_identifier = 0;

		BOND_AD_INFO(bond).system.sys_priority =
		bond->params.ad_actor_sys_prio;
		if (is_zero_ether_addr(bond->params.ad_actor_system))
		@@ -2022,16 +2017,10 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)
		BOND_AD_INFO(bond).system.sys_mac_addr =
		((struct mac_addr )bond->params.ad_actor_system);

		/* initialize how many times this module is called in one
		* second (should be about every 100ms)
		*/
		ad_ticks_per_sec = tick_resolution;

		bond_3ad_initiate_agg_selection(bond,
		AD_AGGREGATOR_SELECTION_TIMER *
		ad_ticks_per_sec);
		}
		}

		/**
		* bond_3ad_bind_slave - initialize a slave's port

drivers/net/bonding/bond_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2081,7 +2081,7 @@ int bond_enslave(struct net_device bond_dev, struct net_device slave_dev,
		/* Initialize AD with the number of times that the AD timer is called in 1 second
		* can be called only after the mac address of the bond is set
		*/
		bond_3ad_initialize(bond, 1000/AD_TIMER_INTERVAL);
		bond_3ad_initialize(bond);
		} else {
		SLAVE_AD_INFO(new_slave)->id =
		SLAVE_AD_INFO(prev_slave)->id + 1;

drivers/net/dsa/microchip/ksz_common.c

+51 −2

Original line number	Diff line number	Diff line
		@@ -803,9 +803,15 @@ static void ksz_phylink_get_caps(struct dsa_switch *ds, int port,
		if (dev->info->supports_rgmii[port])
		phy_interface_set_rgmii(config->supported_interfaces);

		if (dev->info->internal_phy[port])
		if (dev->info->internal_phy[port]) {
		__set_bit(PHY_INTERFACE_MODE_INTERNAL,
		config->supported_interfaces);
		/* Compatibility for phylib's default interface type when the
		* phy-mode property is absent
		*/
		__set_bit(PHY_INTERFACE_MODE_GMII,
		config->supported_interfaces);
		}

		if (dev->dev_ops->get_caps)
		dev->dev_ops->get_caps(dev, port, config);
		@@ -962,6 +968,7 @@ static void ksz_update_port_member(struct ksz_device *dev, int port)
		static int ksz_setup(struct dsa_switch *ds)
		{
		struct ksz_device *dev = ds->priv;
		struct ksz_port *p;
		const u16 *regs;
		int ret;

		@@ -1001,6 +1008,14 @@ static int ksz_setup(struct dsa_switch *ds)
		return ret;
		}

		/* Start with learning disabled on standalone user ports, and enabled
		* on the CPU port. In lack of other finer mechanisms, learning on the
		* CPU port will avoid flooding bridge local addresses on the network
		* in some cases.
		*/
		p = &dev->ports[dev->cpu_port];
		p->learning = true;

		/* start switch */
		regmap_update_bits(dev->regmap[0], regs[S_START_CTRL],
		SW_START, SW_START);
		@@ -1277,6 +1292,8 @@ void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
		ksz_pread8(dev, port, regs[P_STP_CTRL], &data);
		data &= ~(PORT_TX_ENABLE \| PORT_RX_ENABLE \| PORT_LEARN_DISABLE);

		p = &dev->ports[port];

		switch (state) {
		case BR_STATE_DISABLED:
		data \|= PORT_LEARN_DISABLE;
		@@ -1286,9 +1303,13 @@ void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
		break;
		case BR_STATE_LEARNING:
		data \|= PORT_RX_ENABLE;
		if (!p->learning)
		data \|= PORT_LEARN_DISABLE;
		break;
		case BR_STATE_FORWARDING:
		data \|= (PORT_TX_ENABLE \| PORT_RX_ENABLE);
		if (!p->learning)
		data \|= PORT_LEARN_DISABLE;
		break;
		case BR_STATE_BLOCKING:
		data \|= PORT_LEARN_DISABLE;
		@@ -1300,12 +1321,38 @@ void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)

		ksz_pwrite8(dev, port, regs[P_STP_CTRL], data);

		p = &dev->ports[port];
		p->stp_state = state;

		ksz_update_port_member(dev, port);
		}

		static int ksz_port_pre_bridge_flags(struct dsa_switch *ds, int port,
		struct switchdev_brport_flags flags,
		struct netlink_ext_ack *extack)
		{
		if (flags.mask & ~BR_LEARNING)
		return -EINVAL;

		return 0;
		}

		static int ksz_port_bridge_flags(struct dsa_switch *ds, int port,
		struct switchdev_brport_flags flags,
		struct netlink_ext_ack *extack)
		{
		struct ksz_device *dev = ds->priv;
		struct ksz_port *p = &dev->ports[port];

		if (flags.mask & BR_LEARNING) {
		p->learning = !!(flags.val & BR_LEARNING);

		/* Make the change take effect immediately */
		ksz_port_stp_state_set(ds, port, p->stp_state);
		}

		return 0;
		}

		static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,
		int port,
		enum dsa_tag_protocol mp)
		@@ -1719,6 +1766,8 @@ static const struct dsa_switch_ops ksz_switch_ops = {
		.port_bridge_join = ksz_port_bridge_join,
		.port_bridge_leave = ksz_port_bridge_leave,
		.port_stp_state_set = ksz_port_stp_state_set,
		.port_pre_bridge_flags = ksz_port_pre_bridge_flags,
		.port_bridge_flags = ksz_port_bridge_flags,
		.port_fast_age = ksz_port_fast_age,
		.port_vlan_filtering = ksz_port_vlan_filtering,
		.port_vlan_add = ksz_port_vlan_add,