diff mbox series

[6/8] pci: pci_mvebu: Do not automatically enable bus mastering on PCI Bridge

Message ID 20211022142215.26484-7-pali@kernel.org
State Accepted
Commit 42ab3b30046007f000adfd67427a72593f5b3d81
Delegated to: Stefan Roese
Headers show
Series pci: pci_mvebu: Fix access to config space and PCIe Root Port | expand

Commit Message

Pali Rohár Oct. 22, 2021, 2:22 p.m. UTC
Now that PCI Bridge is working, U-Boot's CONFIG_PCI_PNP code automatically
enables memory access and bus mastering when it is needed. So do not
prematurely enable memory access and bus mastering.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
---
 drivers/pci/pci_mvebu.c | 8 --------
 1 file changed, 8 deletions(-)

Comments

Stefan Roese Nov. 2, 2021, 10:50 a.m. UTC | #1
On 22.10.21 16:22, Pali Rohár wrote:
> Now that PCI Bridge is working, U-Boot's CONFIG_PCI_PNP code automatically
> enables memory access and bus mastering when it is needed. So do not
> prematurely enable memory access and bus mastering.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Reviewed-by: Marek Behún <marek.behun@nic.cz>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   drivers/pci/pci_mvebu.c | 8 --------
>   1 file changed, 8 deletions(-)
> 
> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
> index 40b8a57bbe1e..e43fa12d3819 100644
> --- a/drivers/pci/pci_mvebu.c
> +++ b/drivers/pci/pci_mvebu.c
> @@ -451,14 +451,6 @@ static int mvebu_pcie_probe(struct udevice *dev)
>   	/* Setup windows and configure host bridge */
>   	mvebu_pcie_setup_wins(pcie);
>   
> -	/* Master + slave enable. */
> -	reg = readl(pcie->base + PCIE_CMD_OFF);
> -	reg |= PCI_COMMAND_MEMORY;
> -	reg |= PCI_COMMAND_IO;
> -	reg |= PCI_COMMAND_MASTER;
> -	reg |= BIT(10);		/* disable interrupts */
> -	writel(reg, pcie->base + PCIE_CMD_OFF);
> -
>   	/* PCI memory space */
>   	pci_set_region(hose->regions + 0, pcie->mem.start,
>   		       pcie->mem.start, PCIE_MEM_SIZE, PCI_REGION_MEM);
> 


Viele Grüße,
Stefan
diff mbox series

Patch

diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 40b8a57bbe1e..e43fa12d3819 100644
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -451,14 +451,6 @@  static int mvebu_pcie_probe(struct udevice *dev)
 	/* Setup windows and configure host bridge */
 	mvebu_pcie_setup_wins(pcie);
 
-	/* Master + slave enable. */
-	reg = readl(pcie->base + PCIE_CMD_OFF);
-	reg |= PCI_COMMAND_MEMORY;
-	reg |= PCI_COMMAND_IO;
-	reg |= PCI_COMMAND_MASTER;
-	reg |= BIT(10);		/* disable interrupts */
-	writel(reg, pcie->base + PCIE_CMD_OFF);
-
 	/* PCI memory space */
 	pci_set_region(hose->regions + 0, pcie->mem.start,
 		       pcie->mem.start, PCIE_MEM_SIZE, PCI_REGION_MEM);