diff options
Diffstat (limited to 'drivers/pci/controller/dwc/pcie-designware-host.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-designware-host.c | 145 | 
1 files changed, 125 insertions, 20 deletions
| diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index d15a5c2d5b48..a0822d5371bc 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -398,6 +398,32 @@ static int dw_pcie_msi_host_init(struct dw_pcie_rp *pp)  	return 0;  } +static void dw_pcie_host_request_msg_tlp_res(struct dw_pcie_rp *pp) +{ +	struct dw_pcie *pci = to_dw_pcie_from_pp(pp); +	struct resource_entry *win; +	struct resource *res; + +	win = resource_list_first_type(&pp->bridge->windows, IORESOURCE_MEM); +	if (win) { +		res = devm_kzalloc(pci->dev, sizeof(*res), GFP_KERNEL); +		if (!res) +			return; + +		/* +		 * Allocate MSG TLP region of size 'region_align' at the end of +		 * the host bridge window. +		 */ +		res->start = win->res->end - pci->region_align + 1; +		res->end = win->res->end; +		res->name = "msg"; +		res->flags = win->res->flags | IORESOURCE_BUSY; + +		if (!devm_request_resource(pci->dev, win->res, res)) +			pp->msg_res = res; +	} +} +  int dw_pcie_host_init(struct dw_pcie_rp *pp)  {  	struct dw_pcie *pci = to_dw_pcie_from_pp(pp); @@ -484,6 +510,18 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp)  	dw_pcie_iatu_detect(pci); +	/* +	 * Allocate the resource for MSG TLP before programming the iATU +	 * outbound window in dw_pcie_setup_rc(). Since the allocation depends +	 * on the value of 'region_align', this has to be done after +	 * dw_pcie_iatu_detect(). +	 * +	 * Glue drivers need to set 'use_atu_msg' before dw_pcie_host_init() to +	 * make use of the generic MSG TLP implementation. +	 */ +	if (pp->use_atu_msg) +		dw_pcie_host_request_msg_tlp_res(pp); +  	ret = dw_pcie_edma_detect(pci);  	if (ret)  		goto err_free_msi; @@ -554,6 +592,7 @@ static void __iomem *dw_pcie_other_conf_map_bus(struct pci_bus *bus,  {  	struct dw_pcie_rp *pp = bus->sysdata;  	struct dw_pcie *pci = to_dw_pcie_from_pp(pp); +	struct dw_pcie_ob_atu_cfg atu = { 0 };  	int type, ret;  	u32 busdev; @@ -576,8 +615,12 @@ static void __iomem *dw_pcie_other_conf_map_bus(struct pci_bus *bus,  	else  		type = PCIE_ATU_TYPE_CFG1; -	ret = dw_pcie_prog_outbound_atu(pci, 0, type, pp->cfg0_base, busdev, -					pp->cfg0_size); +	atu.type = type; +	atu.cpu_addr = pp->cfg0_base; +	atu.pci_addr = busdev; +	atu.size = pp->cfg0_size; + +	ret = dw_pcie_prog_outbound_atu(pci, &atu);  	if (ret)  		return NULL; @@ -589,6 +632,7 @@ static int dw_pcie_rd_other_conf(struct pci_bus *bus, unsigned int devfn,  {  	struct dw_pcie_rp *pp = bus->sysdata;  	struct dw_pcie *pci = to_dw_pcie_from_pp(pp); +	struct dw_pcie_ob_atu_cfg atu = { 0 };  	int ret;  	ret = pci_generic_config_read(bus, devfn, where, size, val); @@ -596,9 +640,12 @@ static int dw_pcie_rd_other_conf(struct pci_bus *bus, unsigned int devfn,  		return ret;  	if (pp->cfg0_io_shared) { -		ret = dw_pcie_prog_outbound_atu(pci, 0, PCIE_ATU_TYPE_IO, -						pp->io_base, pp->io_bus_addr, -						pp->io_size); +		atu.type = PCIE_ATU_TYPE_IO; +		atu.cpu_addr = pp->io_base; +		atu.pci_addr = pp->io_bus_addr; +		atu.size = pp->io_size; + +		ret = dw_pcie_prog_outbound_atu(pci, &atu);  		if (ret)  			return PCIBIOS_SET_FAILED;  	} @@ -611,6 +658,7 @@ static int dw_pcie_wr_other_conf(struct pci_bus *bus, unsigned int devfn,  {  	struct dw_pcie_rp *pp = bus->sysdata;  	struct dw_pcie *pci = to_dw_pcie_from_pp(pp); +	struct dw_pcie_ob_atu_cfg atu = { 0 };  	int ret;  	ret = pci_generic_config_write(bus, devfn, where, size, val); @@ -618,9 +666,12 @@ static int dw_pcie_wr_other_conf(struct pci_bus *bus, unsigned int devfn,  		return ret;  	if (pp->cfg0_io_shared) { -		ret = dw_pcie_prog_outbound_atu(pci, 0, PCIE_ATU_TYPE_IO, -						pp->io_base, pp->io_bus_addr, -						pp->io_size); +		atu.type = PCIE_ATU_TYPE_IO; +		atu.cpu_addr = pp->io_base; +		atu.pci_addr = pp->io_bus_addr; +		atu.size = pp->io_size; + +		ret = dw_pcie_prog_outbound_atu(pci, &atu);  		if (ret)  			return PCIBIOS_SET_FAILED;  	} @@ -655,6 +706,7 @@ static struct pci_ops dw_pcie_ops = {  static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp)  {  	struct dw_pcie *pci = to_dw_pcie_from_pp(pp); +	struct dw_pcie_ob_atu_cfg atu = { 0 };  	struct resource_entry *entry;  	int i, ret; @@ -682,10 +734,19 @@ static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp)  		if (pci->num_ob_windows <= ++i)  			break; -		ret = dw_pcie_prog_outbound_atu(pci, i, PCIE_ATU_TYPE_MEM, -						entry->res->start, -						entry->res->start - entry->offset, -						resource_size(entry->res)); +		atu.index = i; +		atu.type = PCIE_ATU_TYPE_MEM; +		atu.cpu_addr = entry->res->start; +		atu.pci_addr = entry->res->start - entry->offset; + +		/* Adjust iATU size if MSG TLP region was allocated before */ +		if (pp->msg_res && pp->msg_res->parent == entry->res) +			atu.size = resource_size(entry->res) - +					resource_size(pp->msg_res); +		else +			atu.size = resource_size(entry->res); + +		ret = dw_pcie_prog_outbound_atu(pci, &atu);  		if (ret) {  			dev_err(pci->dev, "Failed to set MEM range %pr\n",  				entry->res); @@ -695,10 +756,13 @@ static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp)  	if (pp->io_size) {  		if (pci->num_ob_windows > ++i) { -			ret = dw_pcie_prog_outbound_atu(pci, i, PCIE_ATU_TYPE_IO, -							pp->io_base, -							pp->io_bus_addr, -							pp->io_size); +			atu.index = i; +			atu.type = PCIE_ATU_TYPE_IO; +			atu.cpu_addr = pp->io_base; +			atu.pci_addr = pp->io_bus_addr; +			atu.size = pp->io_size; + +			ret = dw_pcie_prog_outbound_atu(pci, &atu);  			if (ret) {  				dev_err(pci->dev, "Failed to set IO range %pr\n",  					entry->res); @@ -713,6 +777,8 @@ static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp)  		dev_warn(pci->dev, "Ranges exceed outbound iATU size (%d)\n",  			 pci->num_ob_windows); +	pp->msg_atu_index = i; +  	i = 0;  	resource_list_for_each_entry(entry, &pp->bridge->dma_ranges) {  		if (resource_type(entry->res) != IORESOURCE_MEM) @@ -818,11 +884,47 @@ int dw_pcie_setup_rc(struct dw_pcie_rp *pp)  }  EXPORT_SYMBOL_GPL(dw_pcie_setup_rc); +static int dw_pcie_pme_turn_off(struct dw_pcie *pci) +{ +	struct dw_pcie_ob_atu_cfg atu = { 0 }; +	void __iomem *mem; +	int ret; + +	if (pci->num_ob_windows <= pci->pp.msg_atu_index) +		return -ENOSPC; + +	if (!pci->pp.msg_res) +		return -ENOSPC; + +	atu.code = PCIE_MSG_CODE_PME_TURN_OFF; +	atu.routing = PCIE_MSG_TYPE_R_BC; +	atu.type = PCIE_ATU_TYPE_MSG; +	atu.size = resource_size(pci->pp.msg_res); +	atu.index = pci->pp.msg_atu_index; + +	atu.cpu_addr = pci->pp.msg_res->start; + +	ret = dw_pcie_prog_outbound_atu(pci, &atu); +	if (ret) +		return ret; + +	mem = ioremap(atu.cpu_addr, pci->region_align); +	if (!mem) +		return -ENOMEM; + +	/* A dummy write is converted to a Msg TLP */ +	writel(0, mem); + +	iounmap(mem); + +	return 0; +} +  int dw_pcie_suspend_noirq(struct dw_pcie *pci)  {  	u8 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);  	u32 val; -	int ret; +	int ret = 0;  	/*  	 * If L1SS is supported, then do not put the link into L2 as some @@ -834,10 +936,13 @@ int dw_pcie_suspend_noirq(struct dw_pcie *pci)  	if (dw_pcie_get_ltssm(pci) <= DW_PCIE_LTSSM_DETECT_ACT)  		return 0; -	if (!pci->pp.ops->pme_turn_off) -		return 0; +	if (pci->pp.ops->pme_turn_off) +		pci->pp.ops->pme_turn_off(&pci->pp); +	else +		ret = dw_pcie_pme_turn_off(pci); -	pci->pp.ops->pme_turn_off(&pci->pp); +	if (ret) +		return ret;  	ret = read_poll_timeout(dw_pcie_get_ltssm, val, val == DW_PCIE_LTSSM_L2_IDLE,  				PCIE_PME_TO_L2_TIMEOUT_US/10, |