Commit 83c08814 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: Use PCI_HEADER_TYPE_* instead of literals 

Replace literals under drivers/pci/ with PCI_HEADER_TYPE_MASK,
PCI_HEADER_TYPE_NORMAL, and PCI_HEADER_TYPE_MFD.

Also replace !! boolean conversions with FIELD_GET().

Link: https://lore.kernel.org/r/20231003125300.5541-4-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> # for Renesas R-Car
parent bdca03a2

drivers/pci/controller/dwc/pci-layerscape.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static bool ls_pcie_is_bridge(struct ls_pcie *pcie) 
	u32 header_type;



	header_type = ioread8(pci->dbi_base + PCI_HEADER_TYPE);

	header_type &= 0x7f;

	header_type &= PCI_HEADER_TYPE_MASK;



	return header_type == PCI_HEADER_TYPE_BRIDGE;

}

drivers/pci/controller/mobiveil/pcie-mobiveil-host.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static bool mobiveil_pcie_is_bridge(struct mobiveil_pcie *pcie) 
	u32 header_type;



	header_type = mobiveil_csr_readb(pcie, PCI_HEADER_TYPE);

	header_type &= 0x7f;

	header_type &= PCI_HEADER_TYPE_MASK;



	return header_type == PCI_HEADER_TYPE_BRIDGE;

}

drivers/pci/controller/pcie-iproc.c

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static int iproc_pcie_check_link(struct iproc_pcie *pcie) 


	/* make sure we are not in EP mode */

	iproc_pci_raw_config_read32(pcie, 0, PCI_HEADER_TYPE, 1, &hdr_type);

	if ((hdr_type & 0x7f) != PCI_HEADER_TYPE_BRIDGE) {

	if ((hdr_type & PCI_HEADER_TYPE_MASK) != PCI_HEADER_TYPE_BRIDGE) {

		dev_err(dev, "in EP mode, hdr=%#02x\n", hdr_type);

		return -EFAULT;

	}

drivers/pci/controller/pcie-rcar-ep.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void rcar_pcie_ep_hw_init(struct rcar_pcie *pcie) 
	rcar_rmw32(pcie, REXPCAP(0), 0xff, PCI_CAP_ID_EXP);

	rcar_rmw32(pcie, REXPCAP(PCI_EXP_FLAGS),

		   PCI_EXP_FLAGS_TYPE, PCI_EXP_TYPE_ENDPOINT << 4);

	rcar_rmw32(pcie, RCONF(PCI_HEADER_TYPE), 0x7f,

	rcar_rmw32(pcie, RCONF(PCI_HEADER_TYPE), PCI_HEADER_TYPE_MASK,

		   PCI_HEADER_TYPE_NORMAL);



	/* Write out the physical slot number = 0 */

drivers/pci/controller/pcie-rcar-host.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static int rcar_pcie_hw_init(struct rcar_pcie *pcie) 
	rcar_rmw32(pcie, REXPCAP(0), 0xff, PCI_CAP_ID_EXP);

	rcar_rmw32(pcie, REXPCAP(PCI_EXP_FLAGS),

		PCI_EXP_FLAGS_TYPE, PCI_EXP_TYPE_ROOT_PORT << 4);

	rcar_rmw32(pcie, RCONF(PCI_HEADER_TYPE), 0x7f,

	rcar_rmw32(pcie, RCONF(PCI_HEADER_TYPE), PCI_HEADER_TYPE_MASK,

		PCI_HEADER_TYPE_BRIDGE);



	/* Enable data link layer active state reporting */