From nobody Wed Jun 8 17:07:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 751F5831AB5; Wed, 8 Jun 2022 17:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LJDDD6Tq9z4lP4; Wed, 8 Jun 2022 17:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654708029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvVnE1lvHzwS1PjmWB6jJUybfwg/vCqVFF2oA30nhKc=; b=BiT2PBQe1mBSDXYf0naCr5UUiFTK0zh2r2TRuy9dzliGNrD3sYHE+nvRsBwNMMhWz/nj7e 2a7rb10RUDeuvA7GTucX8Y70Wr2QIzo4nbyUFXQalWsHFD36U1KuvL/Tujy+elaJXTxb4e ieYOK1WwsWk44V52Q0Os8RWqpAEnE+Qu8+mSUYx/FbDw9zrP5IKgMvPTyYGHndPh+bF50e 0cUpokSEXHWYbWH03hSYw103Ja+2GMhnXVB02O7WS9MnByH0r4q1xGtDeegL034kEyB10R vMN7GTJ6MG7m2OEoD9r5t3Uid6d+c3C1nHVlft5leDL5fsrW3Md64DDer1Df8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8543713B1C; Wed, 8 Jun 2022 17:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 258H78GW089004; Wed, 8 Jun 2022 17:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258H78WR089003; Wed, 8 Jun 2022 17:07:08 GMT (envelope-from git) Date: Wed, 8 Jun 2022 17:07:08 GMT Message-Id: <202206081707.258H78WR089003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8660752908a2 - stable/13 - iwlwifi: disable more MEI (Management Engine) code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8660752908a25d31f70f363aa89ca34deca36781 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654708029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvVnE1lvHzwS1PjmWB6jJUybfwg/vCqVFF2oA30nhKc=; b=Cd1Ou8L/GY7Wi3SGWjf2/d2hu+YottnyOnMpRit/gpYleZ1VqCD+DsC2tEqruOcSM7VlZa 87catNFTUsnDBQnFoOLvBzzIm2F2+hdCU1nkL26oYb2baGCAl9BAJy/G4uC52FbusvtOpH PO384Bc9IQ26eeTPCimE3Aq1rRL2cA7ZpWFKUTFyjtSOr4EY8V1kiOUNTrVFXsXx/KdyTT C7hG4pzoU1xszVslKUWDRMD/zptH4gyUHRUnpVxOek1zZGr1ygTgyfVf1B6uz9pTyck11y NTks5ZrymWs2YEvBZIWqwwXYhxngI9tog/ii8WnasYJcBMw0KXkD24pkNYWLPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654708029; a=rsa-sha256; cv=none; b=g1FK6WLLd/+WCpfLdNQs4YuGA4uMrIp/wnJ7auXX902yE84gQzSkwEZrg+lJ5SXyP8zM1B IY4fHMWTDJb/8r1cwxkLHBBcBboTgZhQ/ARkLWGBOKvTixaMhovFw9JXbqgtEYegiC9LtW TDQNLAaxTqbmfYiMyiHfnsWFlF+jrofsXmjFHpd+sHRrNQ2dPXGElZJ1qFsJ4caCtWjjIQ lS+1ho7MnUDc5BFELlAIjIeNizlsIjInT+wgzZ4Hy+m5oLtCXxljpzZJlN/GP+rmb5BIyS R5ZbWJTASHWKzG/dJPXBrAiJ5FN+x6Fm2l5kGXpRA/ip6XH3IIpyGcO1iiHbXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8660752908a25d31f70f363aa89ca34deca36781 commit 8660752908a25d31f70f363aa89ca34deca36781 Author: Bjoern A. Zeeb AuthorDate: 2022-06-04 16:18:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-06-08 16:11:18 +0000 iwlwifi: disable more MEI (Management Engine) code It is unclear why this hasn't bothered anyone in months; I can only assume optimization levels but it seems there were unresolved symbols in iwlwifi after d9836fb4b9380e2ed1c38455fb31a3832b452671: link_elf_obj: symbol iwl_mvm_send_roaming_forbidden_event undefined Hide more of the currently unsupported (GPL-only) MEI (Management Engine) code behind #ifdef to avoid this. Reported by: dchagin Tested by: dchagin Sponsored by: The FreeBSD Foundation (cherry picked from commit 75c779fb279c2bea90c08e275af5937213bdca81) --- sys/contrib/dev/iwlwifi/mvm/ops.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/ops.c b/sys/contrib/dev/iwlwifi/mvm/ops.c index 64bc3adbd8fc..0978504b11cd 100644 --- a/sys/contrib/dev/iwlwifi/mvm/ops.c +++ b/sys/contrib/dev/iwlwifi/mvm/ops.c @@ -969,6 +969,7 @@ static const struct iwl_dump_sanitize_ops iwl_mvm_sanitize_ops = { .frob_mem = iwl_mvm_frob_mem, }; +#if IS_ENABLED(CONFIG_IWLMEI) static void iwl_mvm_me_conn_status(void *priv, const struct iwl_mei_conn_info *conn_info) { struct iwl_mvm *mvm = priv; @@ -1014,6 +1015,7 @@ static void iwl_mvm_mei_roaming_forbidden(void *priv, bool forbidden) iwl_mvm_send_roaming_forbidden_event(mvm, mvm->csme_vif, forbidden); } +#endif static void iwl_mvm_sap_connected_wk(struct work_struct *wk) { @@ -1047,6 +1049,7 @@ out_free: ieee80211_free_hw(mvm->hw); } +#if IS_ENABLED(CONFIG_IWLMEI) static void iwl_mvm_mei_sap_connected(void *priv) { struct iwl_mvm *mvm = priv; @@ -1071,6 +1074,7 @@ static const struct iwl_mei_ops mei_ops = { .sap_connected = iwl_mvm_mei_sap_connected, .nic_stolen = iwl_mvm_mei_nic_stolen, }; +#endif static struct iwl_op_mode * iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, @@ -1336,7 +1340,11 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, mvm->debugfs_dir = dbgfs_dir; +#if IS_ENABLED(CONFIG_IWLMEI) mvm->mei_registered = !iwl_mei_register(mvm, &mei_ops); +#else + mvm->mei_registered = false; +#endif if (iwl_mvm_start_get_nvm(mvm)) { /*