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>
95 lines
2.8 KiB
Diff
95 lines
2.8 KiB
Diff
From 76ed90858f09e7be6601053d0654872ab0018379 Mon Sep 17 00:00:00 2001
|
|
From: Asmaa Mnebhi <asmaa@nvidia.com>
|
|
Date: Thu, 30 Mar 2023 14:42:33 -0400
|
|
Subject: [PATCH] UBUNTU: SAUCE: mlxbf-bootctl: support SMC call for setting
|
|
ARM boot state
|
|
X-NVConfidentiality: public
|
|
|
|
BugLink: https://bugs.launchpad.net/bugs/2013383
|
|
|
|
Add a new SMC call which allows setting the ARM boot progress state to "OS is up".
|
|
|
|
Signed-off-by: Asmaa Mnebhi <asmaa@nvidia.com>
|
|
Acked-by: Tim Gardner <tim.gardner@canonical.com>
|
|
Acked-by: Bartlomiej Zolnierkiewicz <bartlomiej.zolnierkiewicz@canonical.com>
|
|
Signed-off-by: Bartlomiej Zolnierkiewicz <bartlomiej.zolnierkiewicz@canonical.com>
|
|
---
|
|
drivers/platform/mellanox/mlxbf-bootctl.c | 23 +++++++++++++++++++++++
|
|
drivers/platform/mellanox/mlxbf-bootctl.h | 5 +++++
|
|
2 files changed, 28 insertions(+)
|
|
|
|
diff --git a/drivers/platform/mellanox/mlxbf-bootctl.c b/drivers/platform/mellanox/mlxbf-bootctl.c
|
|
index e8877a19d..a68bf5b27 100644
|
|
--- a/drivers/platform/mellanox/mlxbf-bootctl.c
|
|
+++ b/drivers/platform/mellanox/mlxbf-bootctl.c
|
|
@@ -105,6 +105,7 @@ enum {
|
|
/* This mutex is used to serialize MFG write and lock operations. */
|
|
static DEFINE_MUTEX(mfg_ops_lock);
|
|
static DEFINE_MUTEX(icm_ops_lock);
|
|
+static DEFINE_MUTEX(os_up_lock);
|
|
|
|
#define MLNX_MFG_OOB_MAC_LEN ETH_ALEN
|
|
#define MLNX_MFG_OPN_VAL_LEN 24
|
|
@@ -747,6 +748,26 @@ static ssize_t mfg_lock_store(struct device_driver *drv, const char *buf,
|
|
return count;
|
|
}
|
|
|
|
+static ssize_t os_up_store(struct device_driver *drv, const char *buf,
|
|
+ size_t count)
|
|
+{
|
|
+ unsigned long val;
|
|
+ int err;
|
|
+
|
|
+ err = kstrtoul(buf, 10, &val);
|
|
+ if (err)
|
|
+ return err;
|
|
+
|
|
+ if (val != 1)
|
|
+ return -EINVAL;
|
|
+
|
|
+ mutex_lock(&os_up_lock);
|
|
+ smc_call0(MLNX_HANDLE_OS_UP);
|
|
+ mutex_unlock(&os_up_lock);
|
|
+
|
|
+ return count;
|
|
+}
|
|
+
|
|
/* Log header format. */
|
|
#define RSH_LOG_TYPE_SHIFT 56
|
|
#define RSH_LOG_LEN_SHIFT 48
|
|
@@ -1209,6 +1230,7 @@ static DRIVER_ATTR_RW(rev);
|
|
static DRIVER_ATTR_WO(mfg_lock);
|
|
static DRIVER_ATTR_RW(rsh_log);
|
|
static DRIVER_ATTR_RW(large_icm);
|
|
+static DRIVER_ATTR_WO(os_up);
|
|
|
|
static struct attribute *mbc_dev_attrs[] = {
|
|
&driver_attr_post_reset_wdog.attr,
|
|
@@ -1227,6 +1249,7 @@ static struct attribute *mbc_dev_attrs[] = {
|
|
&driver_attr_mfg_lock.attr,
|
|
&driver_attr_rsh_log.attr,
|
|
&driver_attr_large_icm.attr,
|
|
+ &driver_attr_os_up.attr,
|
|
NULL
|
|
};
|
|
|
|
diff --git a/drivers/platform/mellanox/mlxbf-bootctl.h b/drivers/platform/mellanox/mlxbf-bootctl.h
|
|
index c70204770..dc73f7e88 100644
|
|
--- a/drivers/platform/mellanox/mlxbf-bootctl.h
|
|
+++ b/drivers/platform/mellanox/mlxbf-bootctl.h
|
|
@@ -102,6 +102,11 @@
|
|
#define MLNX_HANDLE_SET_ICM_INFO 0x82000012
|
|
#define MLNX_HANDLE_GET_ICM_INFO 0x82000013
|
|
|
|
+/*
|
|
+ * SMC function ID to set the ARM boot state to up
|
|
+ */
|
|
+#define MLNX_HANDLE_OS_UP 0x82000014
|
|
+
|
|
#define MAX_ICM_BUFFER_SIZE 10
|
|
|
|
/* SMC function IDs for SiP Service queries */
|
|
--
|
|
2.14.1
|
|
|