From nobody Tue Jun 21 15:23:14 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 7D14786A2B9; Tue, 21 Jun 2022 15:23:16 +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 4LS9JM68Pdz4gJc; Tue, 21 Jun 2022 15:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655824996; 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=tA8rLSfZvdh1eayNka18n/W/nuD8PbgYIeZqwbgfZPg=; b=uYez6FfwjB/VbX0xJZ3+C7R7r8nAiIdB91Djh1k0ZOPSa7f8ahf+VpafS37hkJdLp6gA9B JQPOxlG6wYqcab2nLkOj5Tge1bs9Azoahb+NWxYLnDwcIILpgiRqHlHIbbfnd1LS4o+8nU fiPJ+f8omiGBnbPLrjeR8O8gFeKRwZZGTFUg0ZzHjxUOdeoIiI1l5550UnFzWjtF4nbNLO LHRuwqifOQFqLKSHgfZkwGCJ8hxkSKDgfFVBEGMxUvJAreD8co5Skl81ma7gw0WCym1JgT udySiYaxJq0rYHtx/5Ji70OUGGkiDOcylZ4SBmNgDB/UbEHz4aLaM4X5ahVkJw== 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 0D87014645; Tue, 21 Jun 2022 15:23:15 +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 25LFNEid062957; Tue, 21 Jun 2022 15:23:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25LFNEHs062956; Tue, 21 Jun 2022 15:23:14 GMT (envelope-from git) Date: Tue, 21 Jun 2022 15:23:14 GMT Message-Id: <202206211523.25LFNEHs062956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: ae3ffc006006 - stable/13 - linuxkpi: Acquire giant when adding/removing i2c adapters 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ae3ffc006006dedb3cd7ddc329b663d02b354e3b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655824996; 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=tA8rLSfZvdh1eayNka18n/W/nuD8PbgYIeZqwbgfZPg=; b=Xl48GLClJp+o9l8XqoGQsfE0VilrhhvLu8Tr1fOoNpRkKbC2f3A3Tm3vbzRgrHNmt1tWeX TlAAQpBmne/o+g2NYi69FR790BvBlbdRTaNCI39JkoErawas28FDipAa0qACb+CFh7ewtl YZYarUi/8uBMIo0urUp6+zqYqgrHjdnLd63sm+f3L8HaIGttEYE1wFGRQD2ZC+o0RzO772 4eywz00KFbqj4h0eXJC+Ixt4QYQ5ktCYEaZMH1SS4jI3JzmHEgDXG3cBldGet4dzACal3K 4wQl/rv/WBySy8Z+THs7qMfYWtoiGxba7CiDIUPNBYqs/DyiB75/05qnVV4JbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655824996; a=rsa-sha256; cv=none; b=dNjzPWvLSMD0but9OFx0G7x9Q8bCxrUG4SRElByp5IQMtRhUtppVqiv/YsmO2TWuVFSS0M 0sCJNyMGqY6qm+TkNODkLiRpw5fD3kyvGKe9uDGyNdW0DWhUksPvMYLIt+IoPQz7LxmjSD WYdE2KcQXLhFS9uqS9TakhwonSc8K23mUtB0kR1HO/sq2z7MgLVeMlh70dhSZNNLZtAPQi +bPXTseAK10o6C9/EGo70WcPhEYWWh9jQ24xNRvZCikbAa7oFEFFfETdc/DUqaOQ/J3sxt JVgXyVuqgf+T+pJgSiivdvz+pSdSOHrIBjV71H9352Ox1V9fBVaUmZZslTAGzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3ffc006006dedb3cd7ddc329b663d02b354e3b commit ae3ffc006006dedb3cd7ddc329b663d02b354e3b Author: Emmanuel Vadot AuthorDate: 2022-06-14 11:23:26 +0000 Commit: Emmanuel Vadot CommitDate: 2022-06-21 15:13:57 +0000 linuxkpi: Acquire giant when adding/removing i2c adapters We need Giant as we run in a taskqueue_thread via linux_work. This fix detaching amdgpu and i915kms. Reviewed by: bz, hselasky, imp Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D35478 (cherry picked from commit d87fad36330b6faf657e7ee8faaa52feeaaff68a) --- sys/compat/linuxkpi/common/src/linux_i2c.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_i2c.c b/sys/compat/linuxkpi/common/src/linux_i2c.c index eedd877f0e0f..80b47a74c2e5 100644 --- a/sys/compat/linuxkpi/common/src/linux_i2c.c +++ b/sys/compat/linuxkpi/common/src/linux_i2c.c @@ -223,7 +223,9 @@ lkpi_i2c_add_adapter(struct i2c_adapter *adapter) return (ENXIO); } + bus_topo_lock(); error = bus_generic_attach(adapter->dev.parent->bsddev); + bus_topo_unlock(); if (error) { device_printf(adapter->dev.parent->bsddev, "failed to attach child: error %d\n", error); @@ -251,7 +253,9 @@ lkpi_i2c_del_adapter(struct i2c_adapter *adapter) while ((child = device_find_child(adapter->dev.parent->bsddev, "lkpi_iic", unit++)) != NULL) { if (adapter == LKPI_IIC_GET_ADAPTER(child)) { + bus_topo_lock(); device_delete_child(adapter->dev.parent->bsddev, child); + bus_topo_unlock(); rv = 0; goto out; } @@ -261,7 +265,9 @@ lkpi_i2c_del_adapter(struct i2c_adapter *adapter) while ((child = device_find_child(adapter->dev.parent->bsddev, "lkpi_iicbb", unit++)) != NULL) { if (adapter == LKPI_IIC_GET_ADAPTER(child)) { + bus_topo_lock(); device_delete_child(adapter->dev.parent->bsddev, child); + bus_topo_unlock(); rv = 0; goto out; }