public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Hanjun Guo <guohanjun@huawei.com>
To: Marc Zyngier <marc.zyngier@arm.com>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>,
	Wei Yongjun <weiyongjun1@huawei.com>, MaJun <majun258@huawei.com>,
	<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
	Hanjun Guo <hanjun.guo@linaro.org>
Subject: [PATCH v2 1/3] irqchip/mbigen: Fix memory mapping code
Date: Fri, 12 May 2017 11:55:26 +0800	[thread overview]
Message-ID: <1494561328-39514-2-git-send-email-guohanjun@huawei.com> (raw)
In-Reply-To: <1494561328-39514-1-git-send-email-guohanjun@huawei.com>

From: Hanjun Guo <hanjun.guo@linaro.org>

Some mbigens share memory regions, and devm_ioremap_resource
does not allow to share resources which will break the probe
of mbigen, in opposition to devm_ioremap.

This patch restores back usage of devm_ioremap function, but
with proper error handling and logging.

Fixes: 216646e4d82e ("irqchip/mbigen: Fix return value check in mbigen_device_probe()")
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
 drivers/irqchip/irq-mbigen.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c
index d2306c8..0f5e66e 100644
--- a/drivers/irqchip/irq-mbigen.c
+++ b/drivers/irqchip/irq-mbigen.c
@@ -337,9 +337,12 @@ static int mbigen_device_probe(struct platform_device *pdev)
 	mgn_chip->pdev = pdev;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	mgn_chip->base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(mgn_chip->base))
-		return PTR_ERR(mgn_chip->base);
+	mgn_chip->base = devm_ioremap(&pdev->dev, res->start,
+				      resource_size(res));
+	if (!mgn_chip->base) {
+		dev_err(&pdev->dev, "failed to ioremap %pR\n", res);
+		return -ENOMEM;
+	}
 
 	if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node)
 		err = mbigen_of_create_domain(pdev, mgn_chip);
-- 
1.7.12.4

  reply	other threads:[~2017-05-12  4:01 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-12  3:55 [PATCH v2 0/3] irqchip/mbigen: bugfixs Hanjun Guo
2017-05-12  3:55 ` Hanjun Guo [this message]
2017-05-12  8:34   ` [tip:irq/urgent] irqchip/mbigen: Fix memory mapping code tip-bot for Hanjun Guo
2017-05-12  3:55 ` [PATCH v2 2/3] irqchip/mbigen: Fix potential NULL dereferencing Hanjun Guo
2017-05-12  8:35   ` [tip:irq/urgent] " tip-bot for Hanjun Guo
2017-05-12  3:55 ` [PATCH v2 3/3] irqchip/mbigen: Fix the clear register offset Hanjun Guo
2017-05-12  8:35   ` [tip:irq/urgent] irqchip/mbigen: Fix the clear register offset calculation tip-bot for MaJun
2017-05-12  6:55 ` [PATCH v2 0/3] irqchip/mbigen: bugfixs majun (Euler7)
2017-05-12  7:58 ` Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1494561328-39514-2-git-send-email-guohanjun@huawei.com \
    --to=guohanjun@huawei.com \
    --cc=hanjun.guo@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=majun258@huawei.com \
    --cc=marc.zyngier@arm.com \
    --cc=tglx@linutronix.de \
    --cc=wangkefeng.wang@huawei.com \
    --cc=weiyongjun1@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox