From nobody Wed Oct 04 13:43:47 2023 X-Original-To: dev-commits-src-branches@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 4S0wrh0mPmz4vxZ1; Wed, 4 Oct 2023 13:43:48 +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 4S0wrh08DRz3Z0D; Wed, 4 Oct 2023 13:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696427028; 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=5chuR6igoSf7D4ruDgLB/MJw9DjaukEnMrYUU8iKISU=; b=eQJqkomlrWLZE6GOlCtCxMbLm9+ZNNivy7lBRY18sxheNuA82727SvF8a1HwvtRidZQ0MZ Img+cRyg5UCK+RASfBzmP+Bno2JiEDM7eUMMNTZhdpkly5hNKK2l8KQ/6gw0mBMu8rWjsb TNyrhz5EGR8tY1/mRMtpDyisHfub6r+N/dY8qOW+RUwwRdl10laFRYgjTJHTmUgSqrXlej czjgi1eMZ396DwAqZyUzuYz08BVHERt8cknaSVObThHH1X94WDS+Hv3pkRBMlK2GcysmNY WbOLN8UrwjSwzmyeHoLReu7fwrTtYhelEk2v59nXmnQgoAvMSsCIGXqpjTLOTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696427028; a=rsa-sha256; cv=none; b=P+sHVrkqZVocdrdAZVhdi+K/rsJo4q72iwfZeqqVRqgZxMfjDzAuOQtER7Qw5jcM2K1VEA asO5qZJXpXTFX3VlkT7ZTysNzbhnCu3ECav6aooBUc0XvagY/I3DkOzaevHEDfNsXgNOcy qaAO6QCSNLC1Oq/xObSBvy1Ln/+m4x0NdwzJRMuohnicJtHzBXGn4X7WDAjEwMGUo/QBW3 X/6RktOP27Ms6iyNPdSyv6AwK0XtWsbGLW28m2cszo6SdmZDM2Rw+SlcNe/5h4ebKTBCus FPhxst038KzUIom7cW0zhdmb3yVyW+9TVVjvYH2VU0Nc9nVeWOcwd5gjTlpbeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696427028; 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=5chuR6igoSf7D4ruDgLB/MJw9DjaukEnMrYUU8iKISU=; b=Kmk9HGE44JI6UM7C75WA2oebO2pd9/lm7grKtBPe5jqYxjeTtlo1JGrXoNPstxrU0TtovZ wNJPK3FqlGvTnd1nrWXbxaMHo2lgh7hzTyO4cRnGM3mtZCNxcDkzCuo1IRjiVA1XTZo+g9 HqTbq/EFPlTTkIX11IzdHqUOQyokF6FbcwKbfsxAicC25WdNgxwi0prA4HNNY+0L0czPJy RQ4OsYio4sfmcxZRQTfvy7FYrGiiGzlkagvz9CRiFqcJlgJiPh2wSZ6QTaJzMID/O5yvy/ QBTJdcKLYNqHL+JjKr2wmz8tKWu4TnkCzct7GaJaO9kq9vgnI/NxfNfKqobZhQ== 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 4S0wrg6JllzfxH; Wed, 4 Oct 2023 13:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394DhlwC020049; Wed, 4 Oct 2023 13:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394DhlRM020046; Wed, 4 Oct 2023 13:43:47 GMT (envelope-from git) Date: Wed, 4 Oct 2023 13:43:47 GMT Message-Id: <202310041343.394DhlRM020046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1e8737f4e884 - stable/14 - hdac: Defer interrupt allocation in hdac_attach() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e8737f4e884fdf4b966056662e4e6003d3379d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1e8737f4e884fdf4b966056662e4e6003d3379d9 commit 1e8737f4e884fdf4b966056662e4e6003d3379d9 Author: Mark Johnston AuthorDate: 2023-09-27 12:23:58 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 13:41:52 +0000 hdac: Defer interrupt allocation in hdac_attach() hdac_attach() registers an interrupt handler before allocating various driver resources which are accessed by the interrupt handler. On some platforms we observe what appear to be spurious interrupts upon a cold boot, resulting in panics. Partially work around the problem by deferring irq allocation until after other resources are allocated. I think this is not a complete solution, but is correct and sufficient to work around the problems reported in the PR. PR: 268393 Tested by: Alexander Sherikov Tested by: Oleh Hushchenkov MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41883 (cherry picked from commit 015daf5221f7588b9258fe0242cee09bde39fe21) --- sys/dev/sound/pci/hda/hdac.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 422f7f930ea5..2cf9239499af 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -1270,9 +1270,6 @@ hdac_attach(device_t dev) /* Allocate resources */ result = hdac_mem_alloc(sc); - if (result != 0) - goto hdac_attach_fail; - result = hdac_irq_alloc(sc); if (result != 0) goto hdac_attach_fail; @@ -1347,6 +1344,10 @@ hdac_attach(device_t dev) hdac_corb_init(sc); hdac_rirb_init(sc); + result = hdac_irq_alloc(sc); + if (result != 0) + goto hdac_attach_fail; + /* Defer remaining of initialization until interrupts are enabled */ sc->intrhook.ich_func = hdac_attach2; sc->intrhook.ich_arg = (void *)sc;