From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.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 42E343B2D1A for ; Thu, 4 Jun 2026 04:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780547357; cv=none; b=WGvr439bChClUWC2h0P1NpT2Wh7KQCDqvcatBbreZKhNqaddNgIAl2HPJgCKGlDx5mEal1Hr9SXYuYfUUWgHyT47eegWj/1SwufMVislh505YHYCc+2Ll5OTOKKj5WrgTJ6WptLquW7F309aVKFlAcacvPTC8BDmOpWKj+2YvzA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780547357; c=relaxed/simple; bh=LYG1/W2QV/7QuS0++bCdf+Y30xBz2TNNzKxnoNmk9mI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R5MRme1qMN8HY7MSxq7Nt0K4IUqRlJQOGdQ1j/TSRB3BX5tXTDjMckVPzb2/y80nAZBXJoDS0WapoBvG3x3fQ3myry85b9rOkT98k93pLvYw9LeUIfB7XC6l+8nkkZhPv02FGGRTToMIYGYbCEPz0nWrenaVKMHAC3PAT0+X77U= 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=kwyZY17R; arc=none smtp.client-ip=209.85.214.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="kwyZY17R" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2bf77d4a4e2so8204435ad.1 for ; Wed, 03 Jun 2026 21:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780547355; x=1781152155; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rgNcgZf78G65x9VYLWBhf6S/0rRcUVo0Xn1llTuS8dY=; b=kwyZY17RFrQxOmZkg0vRtLHH8w9GrQ27nyZ5KN/a4Du5An8kRO/FkCa7fdpOoKOHyQ wa8dBeNBZ1iinPKeISMZd5vTW/2AxJlCt1/K+j/YmVQiTwa+JsbiOt6d6DzTYd6kMNmq u1abribKkU88cwoFygkGQ1hnuwGGk2ggs44SDz39jz5PPNLrs8lYCnq2X0yDjZOf/7ze fpkJwIpWMpMhmZ8dyJhQ34CwS0+fQxI8Ngs79q6D5WOF6aZVg6VMkgWwrgrBw9IDDg4G I+iYO6shBvJJN5z1ZbtqNOPN9ejzAN6VjHIAmQGJXkjCQMVz4aAMPPfp3ERf4A7rqsRi mwYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780547355; x=1781152155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=rgNcgZf78G65x9VYLWBhf6S/0rRcUVo0Xn1llTuS8dY=; b=EHai+msryfG55MrOdAZqKjMr/ptxgrW15Kqexv8jdGLW4ftBMvqdploEF+PJNy7nLO QfrdQ0FVUJ6n1z53npEqdZ6/XHv92qBsShMaRdX/hKpg1vrs7WsHfH47UUbEEyzwcXji vw6RQorzhKoZJPkGAp1bmXK8e4rSZWi7f+/Xe/2tnvvRD1/iFNWyPlprSoF5Q564dX7i fQyB19RsNUEv2Lwhxqfq0w5af0TdCXjOCib1NDxdMBJizCKez6k3e+XPyseLG/z7Wfah jxw05RYjfsj8eWRhRAehQcJvHFi/fMM497xQSTBA8/qiZJgo6xfeNLaTmnsy1heAVO0e bBhg== X-Gm-Message-State: AOJu0YwGNl2+RWTej8OG9l/NE25VJ3p4urVZPHe2VyFPRK4sQ5tZB3a2 9Cjtn0TAEX36tY4i4lx+ulnBeCMLo+Wc+/r+mLdSWy9+Y2r15pOcBA8PMTqeXrIw X-Gm-Gg: Acq92OEg7Pb/3fEG07lWcsfBHB9iEi8JKqmm2/nmqnvxoraai4oO7FU2cgvAepCmliX j/NJs9rRmKPcfousGDW2Vje43uGMCv8isKLvjPRuW6nvTg0lnX6IzcPDQbqPWRYpxnRcvfr2rZW ZPFApu5j3l9tZ3dAOpilVW0L81jzLlnyIgxKnG2RDLJeP1HjbRDH/b1xXtozzL5TZwKgcrOOeWB V7EgIX65zpUWvHGnZQw1+xqWSQmok72NxN7yyANpeUCYb0TAZyBT3XzJP1+RZYoA168m4tvQov3 dfBShTkdVBWsQ1HC8adCXAgoeSfWw3qbZFNBxhNr+3pGa2xv9cGfGFniTSUgRoL9xBLfyHdLofA cegX8MC6UpyBID8VYCjMCjPAxUBqrg5Q5uKNLrtxSmmtGWo8iwuSE/h0AkX41gdXv/vSOktDepy U4L1suGFlZkNFykUrHYkfOQqmIwMa752HZcz7WrHUd/wrk6ZnUhx/46oUPBUSh8mrUL7tNDpjzt 0IePHA530cxw/7xv5McUhYl0kA775lZsFTdQ2KgrhCvKw== X-Received: by 2002:a17:902:ffcb:b0:2bf:22f6:6acc with SMTP id d9443c01a7336-2c197a1e3a9mr19677505ad.6.1780547355304; Wed, 03 Jun 2026 21:29:15 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c166396fa9sm41006575ad.66.2026.06.03.21.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 21:29:14 -0700 (PDT) From: Rosen Penev To: linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/3] memory: fsl_ifc: Fix optional NAND IRQ handling and migrate to platform IRQ API Date: Wed, 3 Jun 2026 21:28:54 -0700 Message-ID: <20260604042856.90859-2-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260604042856.90859-1-rosenp@gmail.com> References: <20260604042856.90859-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Switch from irq_of_parse_and_map() to platform_get_irq() for the main controller IRQ, and use platform_get_irq_optional() for the NAND IRQ which is optional. Guard free_irq() calls on the NAND IRQ with a nand_irq > 0 check to avoid passing invalid IRQ numbers on platforms without a dedicated NAND interrupt line. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/memory/fsl_ifc.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c index e89e0c6cc4bc..80b82ea952f7 100644 --- a/drivers/memory/fsl_ifc.c +++ b/drivers/memory/fsl_ifc.c @@ -89,12 +89,10 @@ static void fsl_ifc_ctrl_remove(struct platform_device *dev) struct fsl_ifc_ctrl *ctrl = dev_get_drvdata(&dev->dev); of_platform_depopulate(&dev->dev); - free_irq(ctrl->nand_irq, ctrl); + if (ctrl->nand_irq > 0) + free_irq(ctrl->nand_irq, ctrl); free_irq(ctrl->irq, ctrl); - irq_dispose_mapping(ctrl->nand_irq); - irq_dispose_mapping(ctrl->irq); - iounmap(ctrl->gregs); dev_set_drvdata(&dev->dev, NULL); @@ -247,22 +245,18 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) fsl_ifc_ctrl_dev->rregs = addr; /* get the Controller level irq */ - fsl_ifc_ctrl_dev->irq = irq_of_parse_and_map(dev->dev.of_node, 0); - if (fsl_ifc_ctrl_dev->irq == 0) { + fsl_ifc_ctrl_dev->irq = platform_get_irq(dev, 0); + if (fsl_ifc_ctrl_dev->irq < 0) { dev_err(&dev->dev, "failed to get irq resource for IFC\n"); - ret = -ENODEV; + ret = fsl_ifc_ctrl_dev->irq; goto err; } - /* get the nand machine irq */ - fsl_ifc_ctrl_dev->nand_irq = - irq_of_parse_and_map(dev->dev.of_node, 1); - fsl_ifc_ctrl_dev->dev = &dev->dev; ret = fsl_ifc_ctrl_init(fsl_ifc_ctrl_dev); if (ret < 0) - goto err_unmap_nandirq; + goto err; init_waitqueue_head(&fsl_ifc_ctrl_dev->nand_wait); @@ -271,10 +265,16 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) if (ret != 0) { dev_err(&dev->dev, "failed to install irq (%d)\n", fsl_ifc_ctrl_dev->irq); - goto err_unmap_nandirq; + goto err; } - if (fsl_ifc_ctrl_dev->nand_irq) { + /* get the nand machine irq */ + fsl_ifc_ctrl_dev->nand_irq = platform_get_irq_optional(dev, 1); + if (fsl_ifc_ctrl_dev->nand_irq < 0) { + ret = fsl_ifc_ctrl_dev->nand_irq; + goto err_free_irq; + } + if (fsl_ifc_ctrl_dev->nand_irq > 0) { ret = request_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_nand_irq, 0, "fsl-ifc-nand", fsl_ifc_ctrl_dev); if (ret != 0) { @@ -292,12 +292,10 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) return 0; err_free_nandirq: - free_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_ctrl_dev); + if (fsl_ifc_ctrl_dev->nand_irq > 0) + free_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_ctrl_dev); err_free_irq: free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev); -err_unmap_nandirq: - irq_dispose_mapping(fsl_ifc_ctrl_dev->nand_irq); - irq_dispose_mapping(fsl_ifc_ctrl_dev->irq); err: iounmap(fsl_ifc_ctrl_dev->gregs); return ret; -- 2.54.0