342604a4bb
* [Mellanox] Don't populate arm64 Kconfig when integrating hw-mgmt
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
* Intgerate HW-MGMT 7.0030.2008 Changes
## Patch List
* 0285-UBUNTU-SAUCE-mlxbf-gige-Fix-intermittent-no-ip-issue.patch :
* 0286-pinctrl-Introduce-struct-pinfunction-and-PINCTRL_PIN.patch :
* 0287-pinctrl-mlxbf3-Add-pinctrl-driver-support.patch :
* 0288-UBUNTU-SAUCE-gpio-mmio-handle-ngpios-properly-in-bgp.patch :
* 0289-UBUNTU-SAUCE-gpio-mlxbf3-Add-gpio-driver-support.patch :
* 0291-mlxsw-core_hwmon-Align-modules-label-name-assignment.patch :
* 0292-mlxsw-i2c-Limit-single-transaction-buffer-size.patch :
* 0293-mlxsw-reg-Limit-MTBR-register-records-buffer-by-one-.patch :
* 0296-UBUNTU-SAUCE-mmc-sdhci-of-dwcmshc-Add-runtime-PM-ope.patch :
* 0298-UBUNTU-SAUCE-mlxbf-ptm-use-0444-instead-of-S_IRUGO.patch :
* 0299-UBUNTU-SAUCE-mlxbf-ptm-add-atx-debugfs-nodes.patch :
* 0300-UBUNTU-SAUCE-mlxbf-ptm-update-module-version.patch :
* 0301-UBUNTU-SAUCE-mlxbf-gige-Fix-kernel-panic-at-shutdown.patch :
* 0302-UBUNTU-SAUCE-mlxbf-bootctl-support-SMC-call-for-sett.patch :
* 0303-UBUNTU-SAUCE-Add-BF3-related-ACPI-config-and-Ring-de.patch :
* 0306-dt-bindings-trivial-devices-Add-infineon-xdpe1a2g7.patch :
* 0307-leds-mlxreg-Add-support-for-new-flavour-of-capabilit.patch :
* 0308-leds-mlxreg-Remove-code-for-amber-LED-colour.patch :
* 0308-platform_data-mlxreg-Add-capability-bit-and-mask-fie.patch :
* 0309-hwmon-mlxreg-fan-Add-support-for-new-flavour-of-capa.patch :
* 0310-hwmon-mlxreg-fan-Extend-number-of-supporetd-fans.patch :
* 0317-platform-mellanox-Introduce-support-for-switches-equ.patch :
* 0318-mellanox-Relocate-mlx-platform-driver.patch :
* 0319-UBUNTU-SAUCE-mlxbf-tmfifo-fix-potential-race.patch :
* 0320-UBUNTU-SAUCE-mlxbf-tmfifo-Drop-the-Rx-packet-if-no-m.patch :
* 0321-UBUNTU-SAUCE-mlxbf-tmfifo-Drop-jumbo-frames.patch :
* 0322-UBUNTU-SAUCE-mlxbf-tmfifo.c-Amend-previous-tmfifo-pa.patch :
* 0323-mlxbf_gige-add-set_link_ksettings-ethtool-callback.patch :
* 0324-mlxbf_gige-fix-white-space-in-mlxbf_gige_eth_ioctl.patch :
* 0325-UBUNTU-SAUCE-mlxbf-bootctl-Fix-kernel-panic-due-to-b.patch :
* 0326-platform-mellanox-mlxreg-hotplug-Add-support-for-new.patch :
* 0327-platform-mellanox-mlx-platform-Change-register-name.patch :
* 0328-platform-mellanox-mlx-platform-Add-support-for-new-X.patch :
* [Mellanox] Remove thermal zone related code and replace with new one
* Revert "Revert "[Mellanox] Align PSU temperature sysfs node name with hw-management change (#16820)" (#16956)"
This reverts commit c2edc6f9d5.
---------
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Co-authored-by: Junchao-Mellanox <junchao@nvidia.com>
Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
From b9d89fb53b5361df87974a223cb4b423a647bc2f Mon Sep 17 00:00:00 2001
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
|
Date: Thu, 24 Aug 2023 11:47:54 +0000
|
|
Subject: [PATCH] platform/mellanox: mlxreg-hotplug: Add support for new flavor
|
|
of capability registers
|
|
X-NVConfidentiality: public
|
|
|
|
Hotplug platform data is common across the various systems, while
|
|
hotplug driver should be able to configure only the instances relevant
|
|
to specific system.
|
|
|
|
For example, platform hoptplug data might contain descriptions for fan1,
|
|
fan2, ..., fan{n}, while some systems equipped with all 'n' fans,
|
|
others with less.
|
|
Same for power units, power controllers, ASICs and so on.
|
|
|
|
For detection of the real number of equipped devices capability
|
|
registers are used.
|
|
These registers used to indicate presence of hotplug devices through
|
|
the bitmap.
|
|
|
|
For some new big modular systems, these registers will provide presence
|
|
by counters.
|
|
|
|
Use slot parameter to determine whether capability register contains
|
|
bitmask or counter.
|
|
|
|
Some 'capability' registers can be shared between different resources.
|
|
Use fields 'capability_bit' and 'capability_mask' for getting only
|
|
relevant capability bits.
|
|
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
|
Reviewed-by: Felix Radensky <fradensky@nvidia.com>
|
|
---
|
|
drivers/platform/mellanox/mlxreg-hotplug.c | 23 +++++++++++++++++++++--
|
|
1 file changed, 21 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/platform/mellanox/mlxreg-hotplug.c b/drivers/platform/mellanox/mlxreg-hotplug.c
|
|
index c5abedd35..3737af0d3 100644
|
|
--- a/drivers/platform/mellanox/mlxreg-hotplug.c
|
|
+++ b/drivers/platform/mellanox/mlxreg-hotplug.c
|
|
@@ -275,6 +275,13 @@ static int mlxreg_hotplug_attr_init(struct mlxreg_hotplug_priv_data *priv)
|
|
if (ret)
|
|
return ret;
|
|
|
|
+ if (!regval)
|
|
+ continue;
|
|
+
|
|
+ /* Remove non-relevant bits. */
|
|
+ if (item->capability_mask)
|
|
+ regval = rol32(regval & item->capability_mask,
|
|
+ item->capability_bit);
|
|
item->mask = GENMASK((regval & item->mask) - 1, 0);
|
|
}
|
|
|
|
@@ -295,7 +302,19 @@ static int mlxreg_hotplug_attr_init(struct mlxreg_hotplug_priv_data *priv)
|
|
if (ret)
|
|
return ret;
|
|
|
|
- if (!(regval & data->bit)) {
|
|
+ /*
|
|
+ * In case slot field is provided, capability
|
|
+ * register contains counter, otherwise bitmask.
|
|
+ * Skip non-relevant entries if slot set and
|
|
+ * exceeds counter. Othewise validate entry by
|
|
+ * matching bitmask.
|
|
+ */
|
|
+ if (data->capability_mask)
|
|
+ regval = rol32(regval & data->capability_mask,
|
|
+ data->capability_bit);
|
|
+ if (data->slot > regval) {
|
|
+ break;
|
|
+ } else if (!(regval & data->bit) && !data->slot) {
|
|
data++;
|
|
continue;
|
|
}
|
|
@@ -626,7 +645,7 @@ static int mlxreg_hotplug_set_irq(struct mlxreg_hotplug_priv_data *priv)
|
|
if (ret)
|
|
goto out;
|
|
|
|
- if (!(regval & data->bit))
|
|
+ if (!(regval & data->bit) && !data->slot)
|
|
item->mask &= ~BIT(j);
|
|
}
|
|
}
|
|
--
|
|
2.14.1
|
|
|