Gitlab 现已全面支持 git over ssh 与 git over https。通过 HTTPS 访问请配置带有 read_repository / write_repository 权限的 Personal access token。通过 SSH 端口访问请使用 22 端口或 13389 端口。如果使用CAS注册了账户但不知道密码，可以自行至设置中更改；如有其他问题，请发邮件至 service@cra.moe 寻求协助。

Commit cf1a56a4 authored Jan 20, 2017 by Andrew Lunn Committed by David S. Miller Jan 20, 2017

net: dsa: Remove hwmon support



Only the Marvell mv88e6xxx DSA driver made use of the HWMON support in
DSA. The temperature sensor registers are actually in the embedded
PHYs, and the PHY driver now supports it. So remove all HWMON support
from DSA and drivers.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0b04680f

drivers/net/dsa/mv88e6xxx/chip.c

+0 −154

Original line number	Diff line number	Diff line
		@@ -2964,154 +2964,6 @@ static void mv88e6xxx_mdio_unregister(struct mv88e6xxx_chip *chip)
		of_node_put(chip->mdio_np);
		}

		#ifdef CONFIG_NET_DSA_HWMON

		static int mv88e61xx_get_temp(struct dsa_switch ds, int temp)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		u16 val;
		int ret;

		*temp = 0;

		mutex_lock(&chip->reg_lock);

		ret = mv88e6xxx_phy_write(chip, 0x0, 0x16, 0x6);
		if (ret < 0)
		goto error;

		/* Enable temperature sensor */
		ret = mv88e6xxx_phy_read(chip, 0x0, 0x1a, &val);
		if (ret < 0)
		goto error;

		ret = mv88e6xxx_phy_write(chip, 0x0, 0x1a, val \| (1 << 5));
		if (ret < 0)
		goto error;

		/* Wait for temperature to stabilize */
		usleep_range(10000, 12000);

		ret = mv88e6xxx_phy_read(chip, 0x0, 0x1a, &val);
		if (ret < 0)
		goto error;

		/* Disable temperature sensor */
		ret = mv88e6xxx_phy_write(chip, 0x0, 0x1a, val & ~(1 << 5));
		if (ret < 0)
		goto error;

		temp = ((val & 0x1f) - 5) 5;

		error:
		mv88e6xxx_phy_write(chip, 0x0, 0x16, 0x0);
		mutex_unlock(&chip->reg_lock);
		return ret;
		}

		static int mv88e63xx_get_temp(struct dsa_switch ds, int temp)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int phy = mv88e6xxx_6320_family(chip) ? 3 : 0;
		u16 val;
		int ret;

		*temp = 0;

		mutex_lock(&chip->reg_lock);
		ret = mv88e6xxx_phy_page_read(chip, phy, 6, 27, &val);
		mutex_unlock(&chip->reg_lock);
		if (ret < 0)
		return ret;

		*temp = (val & 0xff) - 25;

		return 0;
		}

		static int mv88e6xxx_get_temp(struct dsa_switch ds, int temp)
		{
		struct mv88e6xxx_chip *chip = ds->priv;

		if (!mv88e6xxx_has(chip, MV88E6XXX_FLAG_TEMP))
		return -EOPNOTSUPP;

		if (mv88e6xxx_6320_family(chip) \|\| mv88e6xxx_6352_family(chip))
		return mv88e63xx_get_temp(ds, temp);

		return mv88e61xx_get_temp(ds, temp);
		}

		static int mv88e6xxx_get_temp_limit(struct dsa_switch ds, int temp)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int phy = mv88e6xxx_6320_family(chip) ? 3 : 0;
		u16 val;
		int ret;

		if (!mv88e6xxx_has(chip, MV88E6XXX_FLAG_TEMP_LIMIT))
		return -EOPNOTSUPP;

		*temp = 0;

		mutex_lock(&chip->reg_lock);
		ret = mv88e6xxx_phy_page_read(chip, phy, 6, 26, &val);
		mutex_unlock(&chip->reg_lock);
		if (ret < 0)
		return ret;

		temp = (((val >> 8) & 0x1f) 5) - 25;

		return 0;
		}

		static int mv88e6xxx_set_temp_limit(struct dsa_switch *ds, int temp)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int phy = mv88e6xxx_6320_family(chip) ? 3 : 0;
		u16 val;
		int err;

		if (!mv88e6xxx_has(chip, MV88E6XXX_FLAG_TEMP_LIMIT))
		return -EOPNOTSUPP;

		mutex_lock(&chip->reg_lock);
		err = mv88e6xxx_phy_page_read(chip, phy, 6, 26, &val);
		if (err)
		goto unlock;
		temp = clamp_val(DIV_ROUND_CLOSEST(temp, 5) + 5, 0, 0x1f);
		err = mv88e6xxx_phy_page_write(chip, phy, 6, 26,
		(val & 0xe0ff) \| (temp << 8));
		unlock:
		mutex_unlock(&chip->reg_lock);

		return err;
		}

		static int mv88e6xxx_get_temp_alarm(struct dsa_switch ds, bool alarm)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		int phy = mv88e6xxx_6320_family(chip) ? 3 : 0;
		u16 val;
		int ret;

		if (!mv88e6xxx_has(chip, MV88E6XXX_FLAG_TEMP_LIMIT))
		return -EOPNOTSUPP;

		*alarm = false;

		mutex_lock(&chip->reg_lock);
		ret = mv88e6xxx_phy_page_read(chip, phy, 6, 26, &val);
		mutex_unlock(&chip->reg_lock);
		if (ret < 0)
		return ret;

		*alarm = !!(val & 0x40);

		return 0;
		}
		#endif /* CONFIG_NET_DSA_HWMON */

		static int mv88e6xxx_get_eeprom_len(struct dsa_switch *ds)
		{
		struct mv88e6xxx_chip *chip = ds->priv;
		@@ -4386,12 +4238,6 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
		.get_sset_count = mv88e6xxx_get_sset_count,
		.set_eee = mv88e6xxx_set_eee,
		.get_eee = mv88e6xxx_get_eee,
		#ifdef CONFIG_NET_DSA_HWMON
		.get_temp = mv88e6xxx_get_temp,
		.get_temp_limit = mv88e6xxx_get_temp_limit,
		.set_temp_limit = mv88e6xxx_set_temp_limit,
		.get_temp_alarm = mv88e6xxx_get_temp_alarm,
		#endif
		.get_eeprom_len = mv88e6xxx_get_eeprom_len,
		.get_eeprom = mv88e6xxx_get_eeprom,
		.set_eeprom = mv88e6xxx_set_eeprom,

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -497,12 +497,6 @@ enum mv88e6xxx_cap {
		*/
		MV88E6XXX_CAP_STU,

		/* Internal temperature sensor.
		* Available from any enabled port's PHY register 26, page 6.
		*/
		MV88E6XXX_CAP_TEMP,
		MV88E6XXX_CAP_TEMP_LIMIT,

		/* VLAN Table Unit.
		* The VTU is used to program 802.1Q VLANs. See GLOBAL_VTU_OP.
		*/
		@@ -533,8 +527,6 @@ enum mv88e6xxx_cap {
		#define MV88E6XXX_FLAG_G2_POT BIT_ULL(MV88E6XXX_CAP_G2_POT)

		#define MV88E6XXX_FLAG_STU BIT_ULL(MV88E6XXX_CAP_STU)
		#define MV88E6XXX_FLAG_TEMP BIT_ULL(MV88E6XXX_CAP_TEMP)
		#define MV88E6XXX_FLAG_TEMP_LIMIT BIT_ULL(MV88E6XXX_CAP_TEMP_LIMIT)
		#define MV88E6XXX_FLAG_VTU BIT_ULL(MV88E6XXX_CAP_VTU)

		/* Ingress Rate Limit unit */
		@@ -586,7 +578,6 @@ enum mv88e6xxx_cap {
		MV88E6XXX_FLAG_G2_MGMT_EN_0X \| \
		MV88E6XXX_FLAG_G2_POT \| \
		MV88E6XXX_FLAG_STU \| \
		MV88E6XXX_FLAG_TEMP \| \
		MV88E6XXX_FLAG_VTU \| \
		MV88E6XXX_FLAGS_IRL \| \
		MV88E6XXX_FLAGS_MULTI_CHIP \| \
		@@ -605,8 +596,6 @@ enum mv88e6xxx_cap {
		MV88E6XXX_FLAG_G2_MGMT_EN_2X \| \
		MV88E6XXX_FLAG_G2_MGMT_EN_0X \| \
		MV88E6XXX_FLAG_G2_POT \| \
		MV88E6XXX_FLAG_TEMP \| \
		MV88E6XXX_FLAG_TEMP_LIMIT \| \
		MV88E6XXX_FLAG_VTU \| \
		MV88E6XXX_FLAGS_IRL \| \
		MV88E6XXX_FLAGS_MULTI_CHIP \| \
		@@ -621,7 +610,6 @@ enum mv88e6xxx_cap {
		MV88E6XXX_FLAG_G2_MGMT_EN_0X \| \
		MV88E6XXX_FLAG_G2_POT \| \
		MV88E6XXX_FLAG_STU \| \
		MV88E6XXX_FLAG_TEMP \| \
		MV88E6XXX_FLAG_VTU \| \
		MV88E6XXX_FLAGS_IRL \| \
		MV88E6XXX_FLAGS_MULTI_CHIP \| \
		@@ -637,8 +625,6 @@ enum mv88e6xxx_cap {
		MV88E6XXX_FLAG_G2_MGMT_EN_0X \| \
		MV88E6XXX_FLAG_G2_POT \| \
		MV88E6XXX_FLAG_STU \| \
		MV88E6XXX_FLAG_TEMP \| \
		MV88E6XXX_FLAG_TEMP_LIMIT \| \
		MV88E6XXX_FLAG_VTU \| \
		MV88E6XXX_FLAGS_IRL \| \
		MV88E6XXX_FLAGS_MULTI_CHIP \| \
		@@ -651,8 +637,6 @@ struct mv88e6xxx_ops;
		(MV88E6XXX_FLAG_EEE \| \
		MV88E6XXX_FLAG_GLOBAL2 \| \
		MV88E6XXX_FLAG_STU \| \
		MV88E6XXX_FLAG_TEMP \| \
		MV88E6XXX_FLAG_TEMP_LIMIT \| \
		MV88E6XXX_FLAG_VTU \| \
		MV88E6XXX_FLAGS_IRL \| \
		MV88E6XXX_FLAGS_MULTI_CHIP \| \

include/net/dsa.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -307,14 +307,6 @@ struct dsa_switch_ops {
		int (get_eee)(struct dsa_switch ds, int port,
		struct ethtool_eee *e);

		#ifdef CONFIG_NET_DSA_HWMON
		/* Hardware monitoring */
		int (get_temp)(struct dsa_switch ds, int *temp);
		int (get_temp_limit)(struct dsa_switch ds, int *temp);
		int (set_temp_limit)(struct dsa_switch ds, int temp);
		int (get_temp_alarm)(struct dsa_switch ds, bool *alarm);
		#endif

		/* EEPROM access */
		int (get_eeprom_len)(struct dsa_switch ds);
		int (get_eeprom)(struct dsa_switch ds,

net/dsa/Kconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -15,17 +15,6 @@ config NET_DSA

		if NET_DSA

		config NET_DSA_HWMON
		bool "Distributed Switch Architecture HWMON support"
		default y
		depends on HWMON && !(NET_DSA=y && HWMON=m)
		---help---
		Say Y if you want to expose thermal sensor data on switches supported
		by the Distributed Switch Architecture.

		Some of those switches contain thermal sensors. This data is available
		via the hwmon sysfs interface and exposes the onboard sensors.

		# tagging formats
		config NET_DSA_TAG_BRCM
		bool

net/dsa/Makefile

+0 −1

Original line number	Diff line number	Diff line
		# the core
		obj-$(CONFIG_NET_DSA) += dsa_core.o
		dsa_core-y += dsa.o slave.o dsa2.o
		dsa_core-$(CONFIG_NET_DSA_HWMON) += hwmon.o

		# tagging formats
		dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE