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>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 3abc15462d81d65a70734cebbca3f0a4f35a7328 Mon Sep 17 00:00:00 2001
|
|
From: Vadim Pasternak <vadimp@nvidia.com>
|
|
Date: Thu, 24 Aug 2023 13:20:54 +0000
|
|
Subject: [PATCH] platform_data/mlxreg: Add capability bit and mask fields
|
|
X-NVConfidentiality: public
|
|
|
|
Some 'capability' registers can be shared between different resources.
|
|
Add new fields 'capability_bit' and 'capability_mask' to structs
|
|
'mlxreg_core_data' and and 'mlxreg_core_item' for getting only relevant
|
|
capability bits.
|
|
|
|
Signed-off-by: Vadim Pasternak <vadimp@nvidia.com>
|
|
Reviewed-by: Felix Radensky <fradensky@nvidia.com>
|
|
---
|
|
include/linux/platform_data/mlxreg.h | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h
|
|
index 0b9f81a6f..d9f679752 100644
|
|
--- a/include/linux/platform_data/mlxreg.h
|
|
+++ b/include/linux/platform_data/mlxreg.h
|
|
@@ -118,6 +118,8 @@ struct mlxreg_hotplug_device {
|
|
* @mask: attribute access mask;
|
|
* @bit: attribute effective bit;
|
|
* @capability: attribute capability register;
|
|
+ * @capability_bit: started bit in attribute capability register;
|
|
+ * @capability_mask: mask in attribute capability register;
|
|
* @reg_prsnt: attribute presence register;
|
|
* @reg_sync: attribute synch register;
|
|
* @reg_pwr: attribute power register;
|
|
@@ -138,6 +140,8 @@ struct mlxreg_core_data {
|
|
u32 mask;
|
|
u32 bit;
|
|
u32 capability;
|
|
+ u32 capability_bit;
|
|
+ u32 capability_mask;
|
|
u32 reg_prsnt;
|
|
u32 reg_sync;
|
|
u32 reg_pwr;
|
|
@@ -162,6 +166,8 @@ struct mlxreg_core_data {
|
|
* @reg: group interrupt status register;
|
|
* @mask: group interrupt mask;
|
|
* @capability: group capability register;
|
|
+ * @capability_bit: started bit in attribute capability register;
|
|
+ * @capability_mask: mask in attribute capability register;
|
|
* @cache: last status value for elements fro the same group;
|
|
* @count: number of available elements in the group;
|
|
* @ind: element's index inside the group;
|
|
@@ -175,6 +181,8 @@ struct mlxreg_core_item {
|
|
u32 reg;
|
|
u32 mask;
|
|
u32 capability;
|
|
+ u32 capability_bit;
|
|
+ u32 capability_mask;
|
|
u32 cache;
|
|
u8 count;
|
|
u8 ind;
|
|
--
|
|
2.14.1
|
|
|