diff mbox series

accel/habanalabs: Remove redundant pci_clear_master

Message ID 20230323083553.16864-1-cai.huoqing@linux.dev
State New
Headers
Series accel/habanalabs: Remove redundant pci_clear_master |

Commit Message

Cai Huoqing March 23, 2023, 8:35 a.m. UTC 
  Remove pci_clear_master to simplify the code,
the bus-mastering is also cleared in do_pci_disable_device,
like this:
./drivers/pci/pci.c:2197
static void do_pci_disable_device(struct pci_dev *dev)
{
	u16 pci_command;

	pci_read_config_word(dev, PCI_COMMAND, &pci_command);
	if (pci_command & PCI_COMMAND_MASTER) {
		pci_command &= ~PCI_COMMAND_MASTER;
		pci_write_config_word(dev, PCI_COMMAND, pci_command);
	}

	pcibios_disable_device(dev);
}.
And dev->is_busmaster is set to 0 in pci_disable_device.

Signed-off-by: Cai Huoqing <cai.huoqing@linux.dev>
---
 drivers/accel/habanalabs/common/device.c  | 1 -
 drivers/accel/habanalabs/common/pci/pci.c | 2 --
 2 files changed, 3 deletions(-)

Comments

Stanislaw Gruszka March 23, 2023, 10:29 a.m. UTC | #1 
On Thu, Mar 23, 2023 at 04:35:49PM +0800, Cai Huoqing wrote:
> Remove pci_clear_master to simplify the code,
> the bus-mastering is also cleared in do_pci_disable_device,
> like this:
> ./drivers/pci/pci.c:2197
> static void do_pci_disable_device(struct pci_dev *dev)
> {
> 	u16 pci_command;
> 
> 	pci_read_config_word(dev, PCI_COMMAND, &pci_command);
> 	if (pci_command & PCI_COMMAND_MASTER) {
> 		pci_command &= ~PCI_COMMAND_MASTER;
> 		pci_write_config_word(dev, PCI_COMMAND, pci_command);
> 	}
> 
> 	pcibios_disable_device(dev);
> }.
> And dev->is_busmaster is set to 0 in pci_disable_device.
> 
> Signed-off-by: Cai Huoqing <cai.huoqing@linux.dev>
LGTM

Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Oded Gabbay March 23, 2023, 10:33 a.m. UTC | #2 
On Thu, Mar 23, 2023 at 12:29 PM Stanislaw Gruszka
<stanislaw.gruszka@linux.intel.com> wrote:
>
> On Thu, Mar 23, 2023 at 04:35:49PM +0800, Cai Huoqing wrote:
> > Remove pci_clear_master to simplify the code,
> > the bus-mastering is also cleared in do_pci_disable_device,
> > like this:
> > ./drivers/pci/pci.c:2197
> > static void do_pci_disable_device(struct pci_dev *dev)
> > {
> >       u16 pci_command;
> >
> >       pci_read_config_word(dev, PCI_COMMAND, &pci_command);
> >       if (pci_command & PCI_COMMAND_MASTER) {
> >               pci_command &= ~PCI_COMMAND_MASTER;
> >               pci_write_config_word(dev, PCI_COMMAND, pci_command);
> >       }
> >
> >       pcibios_disable_device(dev);
> > }.
> > And dev->is_busmaster is set to 0 in pci_disable_device.
> >
> > Signed-off-by: Cai Huoqing <cai.huoqing@linux.dev>
> LGTM
>
> Reviewed-by: Stanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
>
Applied to -next
Thanks,
Oded
diff mbox series

Patch

diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c
index 713005998cbc..2fb1e2ec3a83 100644
--- a/drivers/accel/habanalabs/common/device.c
+++ b/drivers/accel/habanalabs/common/device.c
@@ -1271,7 +1271,6 @@  int hl_device_resume(struct hl_device *hdev)
 	return 0;
 
 disable_device:
-	pci_clear_master(hdev->pdev);
 	pci_disable_device(hdev->pdev);
 
 	return rc;
diff --git a/drivers/accel/habanalabs/common/pci/pci.c b/drivers/accel/habanalabs/common/pci/pci.c
index d1f4c695baf2..191e0e3cf3a5 100644
--- a/drivers/accel/habanalabs/common/pci/pci.c
+++ b/drivers/accel/habanalabs/common/pci/pci.c
@@ -420,7 +420,6 @@  int hl_pci_init(struct hl_device *hdev)
 unmap_pci_bars:
 	hl_pci_bars_unmap(hdev);
 disable_device:
-	pci_clear_master(pdev);
 	pci_disable_device(pdev);
 
 	return rc;
@@ -436,6 +435,5 @@  void hl_pci_fini(struct hl_device *hdev)
 {
 	hl_pci_bars_unmap(hdev);
 
-	pci_clear_master(hdev->pdev);
 	pci_disable_device(hdev->pdev);
 }