From nobody Sat Jun 04 16:25:19 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 1CBB61BDB2F7; Sat, 4 Jun 2022 16:25:20 +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 4LFlTq6cpdz3hvG; Sat, 4 Jun 2022 16:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654359919; 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=tjblD7PBJtm1yfJxEGpIAVcGfFRWYBblkcZHzQkGzF8=; b=TvNDgUBrC5uFaldutq7yXvyTuRA2Skjnhubs6hubZ2A0+7hXwlESJxjo4vXdUwobnIh2vI AvQEPpZWbSPEC9xKmL0dNxN5S98gglS6tNLtP7c+Cq7JnGpXNggd0KUjLsJhqajeCLgfPx wz/9M3niyE4DnF8PDQZo0wqYExcSBCM5QSHJOa7LFP6X4bt5DlEpDkoe/TG7ApoQB554Zi vQ0SaE8THj2jjtAWyKYlzfi5JxH5x5JkZHTEDmzqA96nFu5SNCsdJkj8xCR8zgYshpycCW AFgTADFU0iGST8/pEAN7rUNlJg1+0KKv/wfb1KBfq8rz7MXyMXgHaZI31J3WgQ== 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 B3BB92122F; Sat, 4 Jun 2022 16:25:19 +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 254GPJe8048805; Sat, 4 Jun 2022 16:25:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254GPJ90048804; Sat, 4 Jun 2022 16:25:19 GMT (envelope-from git) Date: Sat, 4 Jun 2022 16:25:19 GMT Message-Id: <202206041625.254GPJ90048804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 75c779fb279c - main - 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/main X-Git-Reftype: branch X-Git-Commit: 75c779fb279c2bea90c08e275af5937213bdca81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654359919; 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=tjblD7PBJtm1yfJxEGpIAVcGfFRWYBblkcZHzQkGzF8=; b=IS2mUoyVSwDPqwvrKrJBghMQn9rymNe5dhjdxNV0PgesYtr/3RC9A5k58qpWfhZra2npgu 23eI9FA1xsXCb9Z77V2e+epjBGVvYRcKAJmyq91hjnUOZ/m9rlYWml+a6orkfI4+SNqoRa qLy0UGxZ5f6PPoMli75eOtbNfT49IzmW375QJ6kCcUTD/iQnBPXa6DW6vB5H7VOfyOlQPz xJo3e5Wj8Ee31KeU2YLsDTEMNzkHe/hnggBiimTAtu3GxyagD24YCUmtpOh3/nC6D1Pbs4 Kg3PQeiLOZTIbnMHvWDyPu3tTecsmrbwOgR2QqZiS9K7BcNxKWJFDdIbdS9VBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654359919; a=rsa-sha256; cv=none; b=ZWI2C8Wb1CBimq/0TOHf82j3K6vlbQ8ZAt0uQUYl7BD2GR6c6PQ11I0JoYyVK9Ec5tLEQy 2XN2B8gEdYUiBy+Bf9p1PqiP4q5PKYcvDUQF/XndEAUF6H2G33ySx17EoIDthsjX+m/hg+ UcKGO6ypASNk/9r57QJUJ+XoCKkdHGFt/9fObErGuxvDWcreK9YHTqqnPjPLI52GDRmsox W76ezuaGGpTP9VFdsKJha6yOqtpFAEDThFoyn12gil/MVbXlBJEbxwU8l25ulfbHP0XkBU qlJFlcx/3EhkV8n+T/KSGH/H6bJb4rSEtM63u4vaAXdYBH9cSV0wnCvlijVr1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=75c779fb279c2bea90c08e275af5937213bdca81 commit 75c779fb279c2bea90c08e275af5937213bdca81 Author: Bjoern A. Zeeb AuthorDate: 2022-06-04 16:18:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-06-04 16:24:19 +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 MFC after: 3 days --- 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)) { /*