Commit 2bdd5238 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Bjorn Helgaas
Browse files

PCI: mt7621: Add MediaTek MT7621 PCIe host controller driver 

Add driver for the PCIe controller of the MT7621 SoC.

[bhelgaas: rename from pci-mt7621.c to pcie-mt7621.c; also rename Kconfig
symbol from PCI_MT7621 to PCIE_MT7621]
Link: https://lore.kernel.org/r/20210922050035.18162-3-sergio.paracuellos@gmail.com


Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27cee7d7

arch/mips/ralink/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ choice 
		select SYS_SUPPORTS_HIGHMEM

		select MIPS_GIC

		select CLKSRC_MIPS_GIC

		select HAVE_PCI if PCI_MT7621

		select HAVE_PCI

		select PCI_DRIVERS_GENERIC

		select SOC_BUS

endchoice

drivers/pci/controller/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -312,6 +312,14 @@ config PCIE_HISI_ERR 
	  Say Y here if you want error handling support

	  for the PCIe controller's errors on HiSilicon HIP SoCs



config PCIE_MT7621

	tristate "MediaTek MT7621 PCIe Controller"

	depends on (RALINK && SOC_MT7621) || (MIPS && COMPILE_TEST)

	select PHY_MT7621_PCI

	default SOC_MT7621

	help

	  This selects a driver for the MediaTek MT7621 PCIe Controller.



source "drivers/pci/controller/dwc/Kconfig"

source "drivers/pci/controller/mobiveil/Kconfig"

source "drivers/pci/controller/cadence/Kconfig"

drivers/pci/controller/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ obj-$(CONFIG_VMD) += vmd.o 
obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o

obj-$(CONFIG_PCI_LOONGSON) += pci-loongson.o

obj-$(CONFIG_PCIE_HISI_ERR) += pcie-hisi-error.o

obj-$(CONFIG_PCIE_MT7621) += pcie-mt7621.o



# pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW

obj-y				+= dwc/

obj-y				+= mobiveil/

drivers/staging/mt7621-pci/pci-mt7621.c→drivers/pci/controller/pcie-mt7621.c

+12 −12
Original line number Diff line number Diff line
@@ -30,18 +30,18 @@ 
#include <linux/reset.h>

#include <linux/sys_soc.h>



/* MediaTek specific configuration registers */

/* MediaTek-specific configuration registers */

#define PCIE_FTS_NUM			0x70c

#define PCIE_FTS_NUM_MASK		GENMASK(15, 8)

#define PCIE_FTS_NUM_L0(x)		(((x) & 0xff) << 8)



/* Host-PCI bridge registers */

#define RALINK_PCI_PCICFG_ADDR		0x0000

#define RALINK_PCI_PCIMSK_ADDR		0x000C

#define RALINK_PCI_PCIMSK_ADDR		0x000c

#define RALINK_PCI_CONFIG_ADDR		0x0020

#define RALINK_PCI_CONFIG_DATA		0x0024

#define RALINK_PCI_MEMBASE		0x0028

#define RALINK_PCI_IOBASE		0x002C

#define RALINK_PCI_IOBASE		0x002c



/* PCIe RC control registers */

#define RALINK_PCI_ID			0x0030
@@ -132,7 +132,7 @@ static inline void pcie_port_write(struct mt7621_pcie_port *port, 
static inline u32 mt7621_pci_get_cfgaddr(unsigned int bus, unsigned int slot,

					 unsigned int func, unsigned int where)

{

	return (((where & 0xF00) >> 8) << 24) | (bus << 16) | (slot << 11) |

	return (((where & 0xf00) >> 8) << 24) | (bus << 16) | (slot << 11) |

		(func << 8) | (where & 0xfc) | 0x80000000;

}
@@ -217,7 +217,7 @@ static int setup_cm_memory_region(struct pci_host_bridge *host) 


	entry = resource_list_first_type(&host->windows, IORESOURCE_MEM);

	if (!entry) {

		dev_err(dev, "Cannot get memory resource\n");

		dev_err(dev, "cannot get memory resource\n");

		return -EINVAL;

	}
@@ -280,7 +280,7 @@ static int mt7621_pcie_parse_port(struct mt7621_pcie *pcie, 
	port->gpio_rst = devm_gpiod_get_index_optional(dev, "reset", slot,

						       GPIOD_OUT_LOW);

	if (IS_ERR(port->gpio_rst)) {

		dev_err(dev, "Failed to get GPIO for PCIe%d\n", slot);

		dev_err(dev, "failed to get GPIO for PCIe%d\n", slot);

		err = PTR_ERR(port->gpio_rst);

		goto remove_reset;

	}
@@ -409,7 +409,7 @@ static int mt7621_pcie_init_ports(struct mt7621_pcie *pcie) 


		err = mt7621_pcie_init_port(port);

		if (err) {

			dev_err(dev, "Initiating port %d failed\n", slot);

			dev_err(dev, "initializing port %d failed\n", slot);

			list_del(&port->list);

		}

	}
@@ -476,7 +476,7 @@ static int mt7621_pcie_enable_ports(struct pci_host_bridge *host) 


	entry = resource_list_first_type(&host->windows, IORESOURCE_IO);

	if (!entry) {

		dev_err(dev, "Cannot get io resource\n");

		dev_err(dev, "cannot get io resource\n");

		return -EINVAL;

	}
@@ -541,25 +541,25 @@ static int mt7621_pci_probe(struct platform_device *pdev) 


	err = mt7621_pcie_parse_dt(pcie);

	if (err) {

		dev_err(dev, "Parsing DT failed\n");

		dev_err(dev, "parsing DT failed\n");

		return err;

	}



	err = mt7621_pcie_init_ports(pcie);

	if (err) {

		dev_err(dev, "Nothing connected in virtual bridges\n");

		dev_err(dev, "nothing connected in virtual bridges\n");

		return 0;

	}



	err = mt7621_pcie_enable_ports(bridge);

	if (err) {

		dev_err(dev, "Error enabling pcie ports\n");

		dev_err(dev, "error enabling pcie ports\n");

		goto remove_resets;

	}



	err = setup_cm_memory_region(bridge);

	if (err) {

		dev_err(dev, "Error setting up iocu mem regions\n");

		dev_err(dev, "error setting up iocu mem regions\n");

		goto remove_resets;

	}

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ source "drivers/staging/vc04_services/Kconfig" 


source "drivers/staging/pi433/Kconfig"



source "drivers/staging/mt7621-pci/Kconfig"



source "drivers/staging/mt7621-dma/Kconfig"



source "drivers/staging/ralink-gdma/Kconfig"