Skip to contentSkip to conversation

ipack: tpci200: change pci_iounmap to iounmap

PATCH In review Dongliang Mu 2 participants 6 messages Aug 27, 2021 – Aug 30, 2021 Industry pack subsystem (ipack)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipack: tpci200: change pci_iounmap to iounmap

The deallocation api for ioremap should be iounmap, other than pci_iounmap.

---
 drivers/ipack/carriers/tpci200.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/ipack/carriers/tpci200.c +4 -4
index cbfdadecb23b..bf2ae2be5eb5 100644
@@ -88,7 +88,7 @@ static void tpci200_unregister(struct tpci200_board *tpci200)
 {
 	free_irq(tpci200->info->pdev->irq, (void *) tpci200);
 
-	pci_iounmap(tpci200->info->pdev, tpci200->info->interface_regs);
+	iounmap(tpci200->info->interface_regs);
 
 	pci_release_region(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR);
 	pci_release_region(tpci200->info->pdev, TPCI200_IO_ID_INT_SPACES_BAR);
@@ -347,7 +347,7 @@ static int tpci200_register(struct tpci200_board *tpci200)
 	return 0;
 
 err_interface_regs:
-	pci_iounmap(tpci200->info->pdev, tpci200->info->interface_regs);
+	iounmap(tpci200->info->interface_regs);
 err_mem16_space_bar:
 	pci_release_region(tpci200->info->pdev, TPCI200_MEM16_SPACE_BAR);
 err_mem8_space_bar:
@@ -596,7 +596,7 @@ static int tpci200_pci_probe(struct pci_dev *pdev,
 err_tpci200_install:
 	tpci200_uninstall(tpci200);
 err_cfg_regs:
-	pci_iounmap(tpci200->info->pdev, tpci200->info->cfg_regs);
+	iounmap(tpci200->info->cfg_regs);
 err_request_region:
 	pci_release_region(pdev, TPCI200_CFG_MEM_BAR);
 err_tpci200_info:
@@ -612,7 +612,7 @@ static void __tpci200_pci_remove(struct tpci200_board *tpci200)
 	ipack_bus_unregister(tpci200->info->ipack_bus);
 	tpci200_uninstall(tpci200);
 
-	pci_iounmap(tpci200->info->pdev, tpci200->info->cfg_regs);
+	iounmap(tpci200->info->cfg_regs);
 
 	pci_release_region(tpci200->info->pdev, TPCI200_CFG_MEM_BAR);
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 2 lines · Dongliang Mu

The deallocation api for ioremap should be iounmap, other than pci_iounmap.

why?

Isn't this a pci device?

thanks,

greg k-h

#2 lore raw
Quoted 6 lines · Greg Kroah-Hartman
Quoted 2 lines · Dongliang Mu

The deallocation api for ioremap should be iounmap, other than pci_iounmap.

why?

Because the tpci200->info->cfg_regs/interface_regs is allocated by ioremap. From my understanding, ioremap and iounmap are in pairs, other than pci_iounmap.
See the code below.

tpci200->info->interface_regs =
ioremap(pci_resource_start(tpci200->info->pdev,
TPCI200_IP_INTERFACE_BAR),
TPCI200_IFACE_SIZE);

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L297

tpci200->info->cfg_regs = ioremap(
pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),
pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L546

If there is any issue, please let me know

Quoted 6 lines

Isn't this a pci device?

thanks,

greg k-h

#3 lore raw
Quoted 21 lines · Dongliang Mu
Quoted 6 lines · Greg Kroah-Hartman
Quoted 2 lines · Dongliang Mu

The deallocation api for ioremap should be iounmap, other than pci_iounmap.

why?

Because the tpci200->info->cfg_regs/interface_regs is allocated by ioremap. From my understanding, ioremap and iounmap are in pairs, other than pci_iounmap.
See the code below.

tpci200->info->interface_regs =
ioremap(pci_resource_start(tpci200->info->pdev,
TPCI200_IP_INTERFACE_BAR),
TPCI200_IFACE_SIZE);

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L297

Quoted 7 lines

tpci200->info->cfg_regs = ioremap(
pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),
pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L546

If there is any issue, please let me know

The point is that the driver should be calling pci_iomap_bar() instead of ioremap(), and then the call to pci_ioumap() is correct here.

Please make that change instead.

thanks,

greg k-h

#4 lore raw
Quoted 27 lines · Greg Kroah-Hartman
Quoted 25 lines · Dongliang Mu
Quoted 6 lines · Greg Kroah-Hartman
Quoted 2 lines · Dongliang Mu

The deallocation api for ioremap should be iounmap, other than pci_iounmap.

why?

Because the tpci200->info->cfg_regs/interface_regs is allocated by ioremap. From my understanding, ioremap and iounmap are in pairs, other than pci_iounmap.
See the code below.

tpci200->info->interface_regs =
ioremap(pci_resource_start(tpci200->info->pdev,
TPCI200_IP_INTERFACE_BAR),
TPCI200_IFACE_SIZE);

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L297

tpci200->info->cfg_regs = ioremap(
pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),
pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));

Quoted 8 lines
Quoted 3 lines

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L546

If there is any issue, please let me know

The point is that the driver should be calling pci_iomap_bar() instead of ioremap(), and then the call to pci_ioumap() is correct here.

Please make that change instead.

No problem. I will modify the patch and send a v2 patch afterwards.

Quoted 4 lines

thanks,

greg k-h

#5 lore raw
Quoted 30 lines · Dongliang Mu
Quoted 27 lines · Greg Kroah-Hartman
Quoted 25 lines · Dongliang Mu
Quoted 6 lines · Greg Kroah-Hartman
Quoted 2 lines · Dongliang Mu

The deallocation api for ioremap should be iounmap, other than pci_iounmap.

why?

Because the tpci200->info->cfg_regs/interface_regs is allocated by ioremap. From my understanding, ioremap and iounmap are in pairs, other than pci_iounmap.
See the code below.

tpci200->info->interface_regs =
ioremap(pci_resource_start(tpci200->info->pdev,
TPCI200_IP_INTERFACE_BAR),
TPCI200_IFACE_SIZE);

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L297

tpci200->info->cfg_regs = ioremap(
pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),
pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));

Quoted 6 lines
Quoted 6 lines
Quoted 3 lines

https://elixir.bootlin.com/linux/latest/source/drivers/ipack/carriers/tpci200.c#L546

If there is any issue, please let me know

The point is that the driver should be calling pci_iomap_bar() instead of ioremap(), and then the call to pci_ioumap() is correct here.

Hi gregkh,

For cfg_regs [1], it is fine to change from:

tpci200->info->cfg_regs = ioremap(
pci_resource_start(pdev, TPCI200_CFG_MEM_BAR),
pci_resource_len(pdev, TPCI200_CFG_MEM_BAR));

to :

tpci200->info->cfg_regs = pci_ioremap_bar(pdev, TPCI200_CFG_MEM_BAR);

But for interface_regs [2], I am not sure as TPCI200_IFACE_SIZE is a totally separate definition, not calculated by resouce_size or pci_resource_len(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR).

tpci200->info->interface_regs =
ioremap(pci_resource_start(tpci200->info->pdev,
TPCI200_IP_INTERFACE_BAR),
TPCI200_IFACE_SIZE);

#define TPCI200_IFACE_SIZE 0x100

Any comment here?

Note that, it is pci_ioremap_bar, not pci_iomap_bar.

[1] https://elixir.bootlin.com/linux/v5.14/source/drivers/ipack/carriers/tpci200.c#L544
[2] https://elixir.bootlin.com/linux/v5.14/source/drivers/ipack/carriers/tpci200.c#L295

Quoted 9 lines
Quoted 2 lines

Please make that change instead.

No problem. I will modify the patch and send a v2 patch afterwards.

Quoted 4 lines

thanks,

greg k-h