Skip to contentSkip to conversation

drivers: fix dev_request_mem_resource() usage

RFC In review Antony Pavlov 2 participants 2 messages May 5, 2020 – May 7, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

RFC 1/1 drivers: fix dev_request_mem_resource() usage

Here is the code from drivers/reset/reset-socfpga.c

Quoted 4 lines

res = dev_request_mem_resource(dev, 0);
data->membase = IOMEM(res->start);
if (IS_ERR(data->membase))

    return PTR_ERR(data->membase);

dev_request_mem_resource(dev, 0) returns res or ERR_CASE(res) so we can't use IOMEM(res->start) just after
res = dev_request_mem_resource(dev, 0) call.

Code should look like this

Quoted 4 lines

res = dev_request_mem_resource(dev, 0);
if (IS_ERR(res))

    return PTR_ERR(res);

data->membase = IOMEM(res->start);

but if res isn't used in after that we can
use dev_request_mem_region() instead of
dev_request_mem_resource(), e.g.

Quoted 3 lines

data->membase = dev_request_mem_region(dev, 0);
if (IS_ERR(data->membase))

    return PTR_ERR(data->membase);
Cc Steffen Trumtrar <[email protected]>
---
 drivers/reset/reset-socfpga.c |  4 +---
 drivers/spi/spi-fsl-qspi.c    | 13 ++++++-------
 drivers/watchdog/dw_wdt.c     |  4 +---
 3 files changed, 8 insertions(+), 13 deletions(-)
drivers/reset/reset-socfpga.c +1 -3
index 9b499f23c5..3781f12acc 100644
@@ -81,14 +81,12 @@ static const struct reset_control_ops socfpga_reset_ops = {
 static int socfpga_reset_probe(struct device_d *dev)
 {
 	struct socfpga_reset_data *data;
-	struct resource *res;
 	struct device_node *np = dev->device_node;
 	u32 modrst_offset;
 
 	data = xzalloc(sizeof(*data));
 
-	res = dev_request_mem_resource(dev, 0);
-	data->membase = IOMEM(res->start);
+	data->membase = dev_request_mem_region(dev, 0);
 	if (IS_ERR(data->membase))
 		return PTR_ERR(data->membase);
 
drivers/spi/spi-fsl-qspi.c +6 -7
index e22c3099fe..f35f9871dd 100644
@@ -800,20 +800,19 @@ static int fsl_qspi_probe(struct device_d *dev)
 	spi_controller_set_devdata(ctlr, q);
 
 	/* find the resources */
-	res = dev_request_mem_resource(dev, 0);
-	q->iobase = IOMEM(res->start);
+	q->iobase = dev_request_mem_region(dev, 0);
 	if (IS_ERR(q->iobase)) {
 		ret = PTR_ERR(q->iobase);
 		goto err_put_ctrl;
 	}
 
 	res = dev_request_mem_resource(dev, 1);
+	if (IS_ERR(res)) {
+		ret = PTR_ERR(res);
+		goto err_put_ctrl;
+	}
+
 	q->ahb_addr = IOMEM(res->start);
-	if (IS_ERR(q->ahb_addr)) {
-		ret = PTR_ERR(q->ahb_addr);
-		goto err_put_ctrl;
-	}
-
 	q->memmap_phy = res->start;
 
 	/* find the clocks */
drivers/watchdog/dw_wdt.c +1 -3
index cb0d17e361..d7fa074e08 100644
@@ -133,13 +133,11 @@ static int dw_wdt_drv_probe(struct device_d *dev)
 {
 	struct watchdog *wdd;
 	struct dw_wdt *dw_wdt;
-	struct resource *mem;
 	int ret;
 
 	dw_wdt = xzalloc(sizeof(*dw_wdt));
 
-	mem = dev_request_mem_resource(dev, 0);
-	dw_wdt->regs = IOMEM(mem->start);
+	dw_wdt->regs = dev_request_mem_region(dev, 0);
 	if (IS_ERR(dw_wdt->regs))
 		return PTR_ERR(dw_wdt->regs);
 
Signature · 7 lines
2.25.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

Hi Antony,

Quoted 13 lines · Antony Pavlov

Here is the code from drivers/reset/reset-socfpga.c

Quoted 4 lines

res = dev_request_mem_resource(dev, 0);
data->membase = IOMEM(res->start);
if (IS_ERR(data->membase))

    return PTR_ERR(data->membase);

dev_request_mem_resource(dev, 0) returns res or ERR_CASE(res) so we can't use IOMEM(res->start) just after
res = dev_request_mem_resource(dev, 0) call.

Code should look like this

Quoted 12 lines
Quoted 4 lines

res = dev_request_mem_resource(dev, 0);
if (IS_ERR(res))

    return PTR_ERR(res);

data->membase = IOMEM(res->start);

but if res isn't used in after that we can
use dev_request_mem_region() instead of
dev_request_mem_resource(), e.g.

Quoted 3 lines

data->membase = dev_request_mem_region(dev, 0);
if (IS_ERR(data->membase))

    return PTR_ERR(data->membase);

The problem with dev_request_mem_region() is that the returned value leaves no space for error codes. IS_ERR() returns false positives when the returned region is within the last 512 bytes of the address space. This is rare, but has happened. This is why the common pattern is to use dev_request_mem_resource() which can fail and then convert the resource into a pointer, which cannot fail.

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox