Commit 00c78a3c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/dwc-ep' 

- Use FIELD_GET() to simplify extracting register values (Hans Zhang)

* pci/controller/dwc-ep:
  PCI: dwc: ep: Fix errno typo
  PCI: dwc: ep: Use FIELD_GET() where applicable
parents 20279628 1d79596e

drivers/pci/controller/dwc/pcie-designware-ep.c

+6 −7
Original line number Diff line number Diff line
@@ -256,11 +256,11 @@ static unsigned int dw_pcie_ep_get_rebar_offset(struct dw_pcie *pci, 
		return offset;



	reg = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);

	nbars = (reg & PCI_REBAR_CTRL_NBAR_MASK) >> PCI_REBAR_CTRL_NBAR_SHIFT;

	nbars = FIELD_GET(PCI_REBAR_CTRL_NBAR_MASK, reg);



	for (i = 0; i < nbars; i++, offset += PCI_REBAR_CTRL) {

		reg = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);

		bar_index = reg & PCI_REBAR_CTRL_BAR_IDX;

		bar_index = FIELD_GET(PCI_REBAR_CTRL_BAR_IDX, reg);

		if (bar_index == bar)

			return offset;

	}
@@ -672,7 +672,7 @@ static const struct pci_epc_ops epc_ops = { 
 * @ep: DWC EP device

 * @func_no: Function number of the endpoint

 *

 * Return: 0 if success, errono otherwise.

 * Return: 0 if success, errno otherwise.

 */

int dw_pcie_ep_raise_intx_irq(struct dw_pcie_ep *ep, u8 func_no)

{
@@ -691,7 +691,7 @@ EXPORT_SYMBOL_GPL(dw_pcie_ep_raise_intx_irq); 
 * @func_no: Function number of the endpoint

 * @interrupt_num: Interrupt number to be raised

 *

 * Return: 0 if success, errono otherwise.

 * Return: 0 if success, errno otherwise.

 */

int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,

			     u8 interrupt_num)
@@ -876,8 +876,7 @@ static void dw_pcie_ep_init_non_sticky_registers(struct dw_pcie *pci) 


	if (offset) {

		reg = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);

		nbars = (reg & PCI_REBAR_CTRL_NBAR_MASK) >>

			PCI_REBAR_CTRL_NBAR_SHIFT;

		nbars = FIELD_GET(PCI_REBAR_CTRL_NBAR_MASK, reg);



		/*

		 * PCIe r6.0, sec 7.8.6.2 require us to support at least one
@@ -898,7 +897,7 @@ static void dw_pcie_ep_init_non_sticky_registers(struct dw_pcie *pci) 
			 * is why RESBAR_CAP_REG is written here.

			 */

			val = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL);

			bar = val & PCI_REBAR_CTRL_BAR_IDX;

			bar = FIELD_GET(PCI_REBAR_CTRL_BAR_IDX, val);

			if (ep->epf_bar[bar])

				pci_epc_bar_size_to_rebar_cap(ep->epf_bar[bar]->size, &val);

			else