From nobody Fri Oct 2 14:02:46 2026 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65E102E738A for ; Fri, 31 Jul 2026 01:12:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785460338; cv=none; b=Z/su8UIsc+NgfNsylC+biCP7lM+kcOodduNm/g+sLJX5VQrKSTxmRbLAM7bwQ0vTR3/NrPWsSs4kZkunIXJQYM1V6DxezSyAMjE1RA0f5JG4wyAfselUF7G7vpxalhPiQPilHd1CDYTHCkU5XhkzaK5wOWm6Ued4AceIu5TW5KQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785460338; c=relaxed/simple; bh=XZgZLRBGnrLz7UxFoKVt8SOA3rG2AOHrDekOGrXRxzg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=H2h7UqKIfyp9LSBAWF08OdA35yj7z5Wb6iiTwxpIlrkQtlQSIIZCKOEUg51dVNVJcgqQs2dZHT2Ju5GDVZSFtzYt3EM2EC/YFDveC8i0xntxlEGxhSqPgWPftYEQDwlb8jZFfFHa6CVXOhgEVET2BIg0f0YTjSXPVF8OrPkUvcA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EQ6ET0zL; arc=none smtp.client-ip=209.85.222.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EQ6ET0zL" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-934944f2d22so10416385a.0 for ; Thu, 30 Jul 2026 18:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785460336; x=1786065136; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=wAyiS+iv9GtAFUXbLU9tJyvS5gv3/Uh8uF2gqIgEVxA=; b=EQ6ET0zLq/CqHIfJoMm3N4gQCo/PschLpHd8tRuKBdj/Pi7e97H+r8ebnEcixsDaTx 5/7HieJIKNw+2Z6Ktgp3Uz4OsyERsA8o83J6zSXYy8oCrz7sMT92zeW1/dmTBvSH4ES0 yHjIxBXnzOCyqxFhUWxBcUZQDemjG8BTYnl18F4mo8K+oIsr89TX3YeeuYC7Xu9UYvmy bQrRhXBkvXagLYbcpJHCqOmPnGNFdiuCEB721okmw9aUk9cGDQvvZ9aKYn7SqqUrQQfL ECoVpW6VIsw8FutZgoDemTbSjen8QpR4t4hjsZyXB0A/YbxhYm66ZKF582o+4AYMK0xl 3t+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785460336; x=1786065136; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=wAyiS+iv9GtAFUXbLU9tJyvS5gv3/Uh8uF2gqIgEVxA=; b=jx8bFXb5hVwZRQDcwKg8A/sJJaC0RxbMgWpqtb4gHWSHU/uLB3kg2hrnfJ9i8kV//U 9GMwv+0acItRtVTYOdUXO4QyxO+yJ8sCy8njBbocrrv6eazWtP3RjId4Q3bPcS7IyHf+ 2msjSmy5cn+NnlapNR4bKigRoGeW21RY8r5bctvc805M1YuekSLmT77jEE+1lTOWoHbW GlzK1ABMP1PZYr+0sE5ck2i5RYUEbeo6w8uot+mcWIs+oXXaOpU6zFVb6OzrH/SRNSHZ CYWEPnEd5C5cAqyofeBf7l/5ppsU0Z03AipHtXxXpgpztO1giERUKAGX2P5gTEHerXbC mhUA== X-Forwarded-Encrypted: i=1; AHgh+RpJrkO+ZGwhWlsJZpTc5gTjODucz20nlFnbAj1uegadKrY4vX8xAVtt/gcU7DuBNwh92kGtrFT/6aRIyO4=@vger.kernel.org X-Gm-Message-State: AOJu0YxfQc7H1gzbP57xgP18xE4FkuYZKT6FZI5AmnS+S5KQ80owBCYv nETuFNeEMsXYdFC2YDvfo6fHsza7X/6cqAtIxy3+kDerKhnYhPLsQOgq X-Gm-Gg: AR+sD10VAIIyKZK7wQHUVDHL3IOt2vnw2EAFKbyR+E0yMtWb67vYWj1FDK6FVCOlx1G xSOjbiDHveopxgJBimS9s780k2aF8H30BTr7PeOpGR5u8wHkNWGhXGkE6TfoZcVxDMAXpS4phNM 7HdWyfZYzfVW9MT6EN6BsGaqT0nn6L8cPikP6o8Xmc3bMsm6xZs1draUsX+wDHXI+JEScrJkdvT gp7E+KCS2ayHw8Js/xAhhXwkyXr/32Wq6a42P/4PK26Z5LRPyDXX8mW0U67IKtHUHwdPxZGiOCP fHMEV3dtrsxb19ZE30awmEarHQN87kei+GffEgHacEzf9vEtLFD6U0VJQMdi71rzgkphixToq/x K1L1ZjTTSHxHTouv2fQRyKGJCC4wmpF/WaI4kCvZXrmZKwST+tI2c/rtVnOA+Ejb/CUUfNnor6/ 0oj+Iyjia+D2mbtNYvXg7Y0aoXjG08lb8ce9WAutL5rZxiw3RbL5RDh47It4TILp6qgUhop4j0A gMWZdKxWF8XchdRFGfV08hBJ065tG1yeufZ97mxuc5IrAGSRFOQbwrUQ75NrygxSDwR0pjaKkjb lbsAEMFnibjmm7sXXDxBCKXCzgpo7ybKtheAhw== X-Received: by 2002:a05:620a:198a:b0:92e:d677:45c8 with SMTP id af79cd13be357-934965b83famr19916385a.25.1785460335882; Thu, 30 Jul 2026 18:12:15 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id af79cd13be357-933e735e0cdsm533543485a.42.2026.07.30.18.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 18:12:15 -0700 (PDT) From: Rosen Penev To: linux-edac@vger.kernel.org Cc: Borislav Petkov , Tony Luck , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] EDAC/mpc85xx: don't use devm for request_irq() Date: Thu, 30 Jul 2026 18:12:13 -0700 Message-ID: <20260731011213.1211378-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use modern irq acquisition APIs to avoid having to call irq_dispose_mapping() since there's no real need to copy the mapping. Use non devm version of request_irq() as IRQ need to be freed before edac_device_del_device() to avoid a use after free issue. Signed-off-by: Rosen Penev --- drivers/edac/mpc85xx_edac.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index a78d702674f6..651d14b01e25 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c @@ -253,15 +253,19 @@ static int mpc85xx_pci_err_probe(struct platform_devi= ce *op) } =20 if (edac_op_state =3D=3D EDAC_OPSTATE_INT) { - pdata->irq =3D irq_of_parse_and_map(of_node, 0); - res =3D devm_request_irq(&op->dev, pdata->irq, + pdata->irq =3D of_irq_get(of_node, 0); + if (pdata->irq < 0) { + res =3D pdata->irq; + goto err2; + } + + res =3D request_irq(pdata->irq, mpc85xx_pci_isr, IRQF_SHARED, "[EDAC] PCI err", pci); if (res < 0) { pr_err("%s: Unable to request irq %d for MPC85xx PCI err\n", __func__, pdata->irq); - irq_dispose_mapping(pdata->irq); res =3D -ENODEV; goto err2; } @@ -304,6 +308,9 @@ static void mpc85xx_pci_err_remove(struct platform_devi= ce *op) =20 edac_dbg(0, "\n"); =20 + if (edac_op_state =3D=3D EDAC_OPSTATE_INT) + free_irq(pdata->irq, edac_dev); + out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_ADDR, orig_pci_err_cap_dr); out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EN, orig_pci_err_en); =20 @@ -558,14 +565,18 @@ static int mpc85xx_l2_err_probe(struct platform_devic= e *op) } =20 if (edac_op_state =3D=3D EDAC_OPSTATE_INT) { - pdata->irq =3D irq_of_parse_and_map(op->dev.of_node, 0); - res =3D devm_request_irq(&op->dev, pdata->irq, + pdata->irq =3D platform_get_irq(op, 0); + if (pdata->irq < 0) { + res =3D pdata->irq; + goto err2; + } + + res =3D request_irq(pdata->irq, mpc85xx_l2_isr, IRQF_SHARED, "[EDAC] L2 err", edac_dev); if (res < 0) { pr_err("%s: Unable to request irq %d for MPC85xx L2 err\n", __func__, pdata->irq); - irq_dispose_mapping(pdata->irq); res =3D -ENODEV; goto err2; } @@ -597,7 +608,7 @@ static void mpc85xx_l2_err_remove(struct platform_devic= e *op) =20 if (edac_op_state =3D=3D EDAC_OPSTATE_INT) { out_be32(pdata->l2_vbase + MPC85XX_L2_ERRINTEN, 0); - irq_dispose_mapping(pdata->irq); + free_irq(pdata->irq, edac_dev); } =20 out_be32(pdata->l2_vbase + MPC85XX_L2_ERRDIS, orig_l2_err_disable); --=20 2.55.0