Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f49412e5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Add new MHI PM states for SSR"

parents 35331024 f962db5d

drivers/net/wireless/cnss2/pci.c

+16 −4
Original line number Diff line number Diff line
@@ -1033,8 +1033,10 @@ static char *mhi_dev_state_to_str(enum mhi_dev_ctrl state) 
		return "SUSPEND";

	case MHI_DEV_CTRL_RESUME:

		return "RESUME";

	case MHI_DEV_CTRL_RAM_DUMP:

		return "RAM_DUMP";

	case MHI_DEV_CTRL_RDDM:

		return "RDDM";

	case MHI_DEV_CTRL_RDDM_KERNEL_PANIC:

		return "RDDM_KERNEL_PANIC";

	case MHI_DEV_CTRL_NOTIFY_LINK_ERROR:

		return "NOTIFY_LINK_ERROR";

	default:
@@ -1102,8 +1104,10 @@ static enum mhi_dev_ctrl cnss_to_mhi_dev_state(enum cnss_mhi_state state) 
		return MHI_DEV_CTRL_SUSPEND;

	case CNSS_MHI_RESUME:

		return MHI_DEV_CTRL_RESUME;

	case CNSS_MHI_RAM_DUMP:

		return MHI_DEV_CTRL_RAM_DUMP;

	case CNSS_MHI_RDDM:

		return MHI_DEV_CTRL_RDDM;

	case CNSS_MHI_RDDM_KERNEL_PANIC:

		return MHI_DEV_CTRL_RDDM_KERNEL_PANIC;

	case CNSS_MHI_NOTIFY_LINK_ERROR:

		return MHI_DEV_CTRL_NOTIFY_LINK_ERROR;

	default:
@@ -1136,6 +1140,10 @@ static int cnss_pci_check_mhi_state_bit(struct cnss_pci_data *pci_priv, 
		if (test_bit(MHI_DEV_CTRL_SUSPEND, &pci_priv->mhi_state))

			return 0;

		break;

	case MHI_DEV_CTRL_RDDM:

	case MHI_DEV_CTRL_RDDM_KERNEL_PANIC:

	case MHI_DEV_CTRL_NOTIFY_LINK_ERROR:

		return 0;

	default:

		cnss_pr_err("Unhandled MHI DEV state: %s(%d)\n",

			    mhi_dev_state_to_str(mhi_dev_state), mhi_dev_state);
@@ -1170,6 +1178,10 @@ static void cnss_pci_set_mhi_state_bit(struct cnss_pci_data *pci_priv, 
	case MHI_DEV_CTRL_RESUME:

		clear_bit(MHI_DEV_CTRL_SUSPEND, &pci_priv->mhi_state);

		break;

	case MHI_DEV_CTRL_RDDM:

	case MHI_DEV_CTRL_RDDM_KERNEL_PANIC:

	case MHI_DEV_CTRL_NOTIFY_LINK_ERROR:

		break;

	default:

		cnss_pr_err("Unhandled MHI DEV state (%d)\n", mhi_dev_state);

	}

drivers/net/wireless/cnss2/pci.h

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ enum cnss_mhi_state { 
	CNSS_MHI_RESUME,

	CNSS_MHI_POWER_OFF,

	CNSS_MHI_POWER_ON,

	CNSS_MHI_RAM_DUMP,

	CNSS_MHI_RDDM,

	CNSS_MHI_RDDM_KERNEL_PANIC,

	CNSS_MHI_NOTIFY_LINK_ERROR,

};