Adding upstream version 2.6.upstream/2.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 29 insertions, 8 deletions

diff --git a/completions/_nvme b/completions/_nvme
index 49736f5..5d07bc5 100644
--- a/completions/_nvme
+++ b/completions/_nvme
@@ -217,15 +217,15 @@ _nvme () {
 				_arguments '*:: :->subcmds'
 				_describe -t commands "nvme ocp clear-pcie-correctable-error-counters options" _clear_pcie_correctable_error_counters
 				;;
-			(vs-fw-activate-history)
-				local _vs_fw_activate_history
-				_vs_fw_activate_history=(
+			(fw-activate-history)
+				local _fw_activate_history
+				_fw_activate_history=(
 				/dev/nvme':supply a device to use (required)'
 				--output-format=':Output format: normal|json'
 				-o':alias for --output-format'
 				)
 				_arguments '*:: :->subcmds'
-				_describe -t commands "nvme ocp vs-fw-activate-history options" _vs_fw_activate_history
+				_describe -t commands "nvme ocp fw-activate-history options" _fw_activate_history
 				;;
 			(device-capability-log)
 				local _device_capability_log
@@ -237,6 +237,20 @@ _nvme () {
 				_arguments '*:: :->subcmds'
 				_describe -t commands "nvme ocp device-capability-log options" _device_capability_log
 				;;
+			(set-dssd-power-state-feature)
+				local _set_dssd_power_state_feature
+				_set_dssd_power_state_feature=(
+				/dev/nvme':supply a device to use (required)'
+				--power-state=':DSSD Power State to set in watts'
+				-p':alias for --power-state'
+				--save':Specifies that the controller shall save the attribute'
+				-s':alias for --save'
+				--no-uuid':Skip UUID index search'
+				-n':alias for --no-uuid'
+				)
+				_arguments '*:: :->subcmds'
+				_describe -t commands "nvme ocp set-dssd-power-state-feature options" _set_dssd_power_state_feature
+				;;
 			(*)
 				_files
 				;;
@@ -525,6 +539,8 @@ _nvme () {
 			-a':alias of --anagrp-id'
 			--nvmset-id=':NVM Set Identifier'
 			-i':alias of --nvmset-id'
+			--endg-id=':Endurance Group Identifier'
+			-e':alias of --endg-id'
 			--block-size=':target block size'
 			-b':alias of --block-size'
 			--timeout=':value for timeout'
@@ -1991,6 +2007,7 @@ _nvme () {
 			clear-pcie-correctable-error-counters':Clear PCIe correctable error counters'
 			vs-fw-activate-history':Get firmware activation history log'
 			device-capability-log':Get Device capability log'
+			set-dssd-power-state-feature':Set DSSD Power State'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme ocp options" _ocp
diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
index 8f451ff..fc3b49e 100644
--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
@@ -114,7 +114,7 @@ nvme_list_opts () {
 			--dps= -d --nmic= -m --anagrp-id= -a --nvmset-id= -i \
 			--block-size= -b --timeout= -t --csi= -y --lbstm= -l \
 			--nphndls= -n --nsze-si= -S --ncap-si= -C --azr -z --rar= -r \
-			--ror= -o --rnumzrwa= -u --phndls= -p"
+			--ror= -o --rnumzrwa= -u --phndls= -p --endg-id= -e"
 			;;
 		"delete-ns")
 		opts+=" -namespace-id= -n --timeout= -t"
@@ -1342,12 +1342,15 @@ plugin_ocp_opts () {
 		"clear-pcie-correctable-error-counters")
 		opts+=" --no-uuid -n"
 			;;
-		"vs-fw-activate-history")
+		"fw-activate-history")
 		opts+=" --output-format= -o"
 			;;
 		"device-capability-log")
 		opts+=" --output-format= -o"
 			;;
+		"set-dssd-power-state-feature")
+		opts+=" --power-state= -p --no-uuid -n --save -s"
+			;;
 		"help")
 		opts+=$NO_OPTS
 			;;
@@ -1416,7 +1419,8 @@ _nvme_subcmds () {
 			set-latency-monitor-feature internal-log \
 			clear-fw-activate-history eol-plp-failure-mode \
 			clear-pcie-correctable-error-counters \
-			vs-fw-activate-history device-capability-log"
+			vs-fw-activate-history device-capability-log \
+			set-dssd-power-state-feature"
 	)
 
 	# Associative array mapping plugins to coresponding option completions
@@ -1473,7 +1477,7 @@ _nvme_subcmds () {
 		_cmds+=" $plugin"
 	done
 
-	cmds+=" version help"
+	_cmds+=" version help"
 
 	if [[ ${#words[*]} -lt 3 ]]; then
 		COMPREPLY+=( $(compgen -W "$_cmds" -- $cur ) )