-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'nfp-pci-core-hwmon-live-mac-addr-change'
Jakub Kicinski says: ==================== nfp: pci core, hwmon, live mac addr change This series brings updates to core PCI code, SR-IOV, exposes firmware's capability to change MAC address at runtime and HWMON interfaces. The PCI code updates include resiliency improvement in conditions which are quite unusual, but still shouldn't make the driver oops. We also handle very large device memory operation more gracefully. A timeout is added to acquiring mutexes in device memory. Pablo provides a patch to expose to the stack the ability to change MAC addresses under traffic while David adds HWMON interface for reading device temperature and power consumption. Last three patches are minor improvements to the netdev code. v2: - add patch 1 - fix for devlink build; - fix build issue with the hwmon patch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
- Loading branch information
Showing
18 changed files
with
475 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,192 @@ | ||
| /* | ||
| * Copyright (C) 2017 Netronome Systems, Inc. | ||
| * | ||
| * This software is dual licensed under the GNU General License Version 2, | ||
| * June 1991 as shown in the file COPYING in the top-level directory of this | ||
| * source tree or the BSD 2-Clause License provided below. You have the | ||
| * option to license this software under the complete terms of either license. | ||
| * | ||
| * The BSD 2-Clause License: | ||
| * | ||
| * Redistribution and use in source and binary forms, with or | ||
| * without modification, are permitted provided that the following | ||
| * conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above | ||
| * copyright notice, this list of conditions and the following | ||
| * disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following | ||
| * disclaimer in the documentation and/or other materials | ||
| * provided with the distribution. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
| * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
| * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| #include <linux/kernel.h> | ||
| #include <linux/bitops.h> | ||
| #include <linux/hwmon.h> | ||
|
|
||
| #include "nfpcore/nfp_cpp.h" | ||
| #include "nfpcore/nfp_nsp.h" | ||
| #include "nfp_main.h" | ||
|
|
||
| #define NFP_TEMP_MAX (95 * 1000) | ||
| #define NFP_TEMP_CRIT (105 * 1000) | ||
|
|
||
| #define NFP_POWER_MAX (25 * 1000 * 1000) | ||
|
|
||
| static int nfp_hwmon_sensor_id(enum hwmon_sensor_types type, int channel) | ||
| { | ||
| if (type == hwmon_temp) | ||
| return NFP_SENSOR_CHIP_TEMPERATURE; | ||
| if (type == hwmon_power) | ||
| return NFP_SENSOR_ASSEMBLY_POWER + channel; | ||
| return -EINVAL; | ||
| } | ||
|
|
||
| static int | ||
| nfp_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, | ||
| int channel, long *val) | ||
| { | ||
| static const struct { | ||
| enum hwmon_sensor_types type; | ||
| u32 attr; | ||
| long val; | ||
| } const_vals[] = { | ||
| { hwmon_temp, hwmon_temp_max, NFP_TEMP_MAX }, | ||
| { hwmon_temp, hwmon_temp_crit, NFP_TEMP_CRIT }, | ||
| { hwmon_power, hwmon_power_max, NFP_POWER_MAX }, | ||
| }; | ||
| struct nfp_pf *pf = dev_get_drvdata(dev); | ||
| enum nfp_nsp_sensor_id id; | ||
| int err, i; | ||
|
|
||
| for (i = 0; i < ARRAY_SIZE(const_vals); i++) | ||
| if (const_vals[i].type == type && const_vals[i].attr == attr) { | ||
| *val = const_vals[i].val; | ||
| return 0; | ||
| } | ||
|
|
||
| err = nfp_hwmon_sensor_id(type, channel); | ||
| if (err < 0) | ||
| return err; | ||
| id = err; | ||
|
|
||
| if (!(pf->nspi->sensor_mask & BIT(id))) | ||
| return -EOPNOTSUPP; | ||
|
|
||
| if (type == hwmon_temp && attr == hwmon_temp_input) | ||
| return nfp_hwmon_read_sensor(pf->cpp, id, val); | ||
| if (type == hwmon_power && attr == hwmon_power_input) | ||
| return nfp_hwmon_read_sensor(pf->cpp, id, val); | ||
|
|
||
| return -EINVAL; | ||
| } | ||
|
|
||
| static umode_t | ||
| nfp_hwmon_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr, | ||
| int channel) | ||
| { | ||
| if (type == hwmon_temp) { | ||
| switch (attr) { | ||
| case hwmon_temp_input: | ||
| case hwmon_temp_crit: | ||
| case hwmon_temp_max: | ||
| return 0444; | ||
| } | ||
| } else if (type == hwmon_power) { | ||
| switch (attr) { | ||
| case hwmon_power_input: | ||
| case hwmon_power_max: | ||
| return 0444; | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static u32 nfp_chip_config[] = { | ||
| HWMON_C_REGISTER_TZ, | ||
| 0 | ||
| }; | ||
|
|
||
| static const struct hwmon_channel_info nfp_chip = { | ||
| .type = hwmon_chip, | ||
| .config = nfp_chip_config, | ||
| }; | ||
|
|
||
| static u32 nfp_temp_config[] = { | ||
| HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT, | ||
| 0 | ||
| }; | ||
|
|
||
| static const struct hwmon_channel_info nfp_temp = { | ||
| .type = hwmon_temp, | ||
| .config = nfp_temp_config, | ||
| }; | ||
|
|
||
| static u32 nfp_power_config[] = { | ||
| HWMON_P_INPUT | HWMON_P_MAX, | ||
| HWMON_P_INPUT, | ||
| HWMON_P_INPUT, | ||
| 0 | ||
| }; | ||
|
|
||
| static const struct hwmon_channel_info nfp_power = { | ||
| .type = hwmon_power, | ||
| .config = nfp_power_config, | ||
| }; | ||
|
|
||
| static const struct hwmon_channel_info *nfp_hwmon_info[] = { | ||
| &nfp_chip, | ||
| &nfp_temp, | ||
| &nfp_power, | ||
| NULL | ||
| }; | ||
|
|
||
| static const struct hwmon_ops nfp_hwmon_ops = { | ||
| .is_visible = nfp_hwmon_is_visible, | ||
| .read = nfp_hwmon_read, | ||
| }; | ||
|
|
||
| static const struct hwmon_chip_info nfp_chip_info = { | ||
| .ops = &nfp_hwmon_ops, | ||
| .info = nfp_hwmon_info, | ||
| }; | ||
|
|
||
| int nfp_hwmon_register(struct nfp_pf *pf) | ||
| { | ||
| if (!IS_REACHABLE(CONFIG_HWMON)) | ||
| return 0; | ||
|
|
||
| if (!pf->nspi) { | ||
| nfp_warn(pf->cpp, "not registering HWMON (no NSP info)\n"); | ||
| return 0; | ||
| } | ||
| if (!pf->nspi->sensor_mask) { | ||
| nfp_info(pf->cpp, | ||
| "not registering HWMON (NSP doesn't report sensors)\n"); | ||
| return 0; | ||
| } | ||
|
|
||
| pf->hwmon_dev = hwmon_device_register_with_info(&pf->pdev->dev, "nfp", | ||
| pf, &nfp_chip_info, | ||
| NULL); | ||
| return PTR_ERR_OR_ZERO(pf->hwmon_dev); | ||
| } | ||
|
|
||
| void nfp_hwmon_unregister(struct nfp_pf *pf) | ||
| { | ||
| if (!IS_REACHABLE(CONFIG_HWMON) || !pf->hwmon_dev) | ||
| return; | ||
|
|
||
| hwmon_device_unregister(pf->hwmon_dev); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.