Skip to content

Commit f4e026f

Browse files
committed
PCI: Fix typos
Fix typos and whitespace errors. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 86c2345 commit f4e026f

File tree

19 files changed

+84
-78
lines changed

19 files changed

+84
-78
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@ static int cdns_pcie_ep_set_msix(struct pci_epc *epc, u8 fn, u8 vfn,
301301
val |= interrupts;
302302
cdns_pcie_ep_fn_writew(pcie, fn, reg, val);
303303

304-
/* Set MSIX BAR and offset */
304+
/* Set MSI-X BAR and offset */
305305
reg = cap + PCI_MSIX_TABLE;
306306
val = offset | bir;
307307
cdns_pcie_ep_fn_writel(pcie, fn, reg, val);
308308

309-
/* Set PBA BAR and offset. BAR must match MSIX BAR */
309+
/* Set PBA BAR and offset. BAR must match MSI-X BAR */
310310
reg = cap + PCI_MSIX_PBA;
311311
val = (offset + (interrupts * PCI_MSIX_ENTRY_SIZE)) | bir;
312312
cdns_pcie_ep_fn_writel(pcie, fn, reg, val);
@@ -573,8 +573,8 @@ static int cdns_pcie_ep_start(struct pci_epc *epc)
573573

574574
/*
575575
* Next function field in ARI_CAP_AND_CTR register for last function
576-
* should be 0.
577-
* Clearing Next Function Number field for the last function used.
576+
* should be 0. Clear Next Function Number field for the last
577+
* function used.
578578
*/
579579
last_fn = find_last_bit(&epc->function_num_map, BITS_PER_LONG);
580580
reg = CDNS_PCIE_CORE_PF_I_ARI_CAP_AND_CTRL(last_fn);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#define PARF_DBI_BASE_ADDR_HI 0x354
4949
#define PARF_SLV_ADDR_SPACE_SIZE 0x358
5050
#define PARF_SLV_ADDR_SPACE_SIZE_HI 0x35c
51-
#define PARF_NO_SNOOP_OVERIDE 0x3d4
51+
#define PARF_NO_SNOOP_OVERRIDE 0x3d4
5252
#define PARF_ATU_BASE_ADDR 0x634
5353
#define PARF_ATU_BASE_ADDR_HI 0x638
5454
#define PARF_SRIS_MODE 0x644
@@ -89,9 +89,9 @@
8989
#define PARF_DEBUG_INT_CFG_BUS_MASTER_EN BIT(2)
9090
#define PARF_DEBUG_INT_RADM_PM_TURNOFF BIT(3)
9191

92-
/* PARF_NO_SNOOP_OVERIDE register fields */
93-
#define WR_NO_SNOOP_OVERIDE_EN BIT(1)
94-
#define RD_NO_SNOOP_OVERIDE_EN BIT(3)
92+
/* PARF_NO_SNOOP_OVERRIDE register fields */
93+
#define WR_NO_SNOOP_OVERRIDE_EN BIT(1)
94+
#define RD_NO_SNOOP_OVERRIDE_EN BIT(3)
9595

9696
/* PARF_DEVICE_TYPE register fields */
9797
#define PARF_DEVICE_TYPE_EP 0x0
@@ -529,8 +529,8 @@ static int qcom_pcie_perst_deassert(struct dw_pcie *pci)
529529
writel_relaxed(val, pcie_ep->parf + PARF_LTSSM);
530530

531531
if (pcie_ep->cfg && pcie_ep->cfg->override_no_snoop)
532-
writel_relaxed(WR_NO_SNOOP_OVERIDE_EN | RD_NO_SNOOP_OVERIDE_EN,
533-
pcie_ep->parf + PARF_NO_SNOOP_OVERIDE);
532+
writel_relaxed(WR_NO_SNOOP_OVERRIDE_EN | RD_NO_SNOOP_OVERRIDE_EN,
533+
pcie_ep->parf + PARF_NO_SNOOP_OVERRIDE);
534534

535535
return 0;
536536

drivers/pci/controller/dwc/pcie-qcom.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define PARF_DBI_BASE_ADDR_V2_HI 0x354
6262
#define PARF_SLV_ADDR_SPACE_SIZE_V2 0x358
6363
#define PARF_SLV_ADDR_SPACE_SIZE_V2_HI 0x35c
64-
#define PARF_NO_SNOOP_OVERIDE 0x3d4
64+
#define PARF_NO_SNOOP_OVERRIDE 0x3d4
6565
#define PARF_ATU_BASE_ADDR 0x634
6666
#define PARF_ATU_BASE_ADDR_HI 0x638
6767
#define PARF_DEVICE_TYPE 0x1000
@@ -135,9 +135,9 @@
135135
#define PARF_INT_ALL_LINK_UP BIT(13)
136136
#define PARF_INT_MSI_DEV_0_7 GENMASK(30, 23)
137137

138-
/* PARF_NO_SNOOP_OVERIDE register fields */
139-
#define WR_NO_SNOOP_OVERIDE_EN BIT(1)
140-
#define RD_NO_SNOOP_OVERIDE_EN BIT(3)
138+
/* PARF_NO_SNOOP_OVERRIDE register fields */
139+
#define WR_NO_SNOOP_OVERRIDE_EN BIT(1)
140+
#define RD_NO_SNOOP_OVERRIDE_EN BIT(3)
141141

142142
/* PARF_DEVICE_TYPE register fields */
143143
#define DEVICE_TYPE_RC 0x4
@@ -1007,8 +1007,8 @@ static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie)
10071007
const struct qcom_pcie_cfg *pcie_cfg = pcie->cfg;
10081008

10091009
if (pcie_cfg->override_no_snoop)
1010-
writel(WR_NO_SNOOP_OVERIDE_EN | RD_NO_SNOOP_OVERIDE_EN,
1011-
pcie->parf + PARF_NO_SNOOP_OVERIDE);
1010+
writel(WR_NO_SNOOP_OVERRIDE_EN | RD_NO_SNOOP_OVERRIDE_EN,
1011+
pcie->parf + PARF_NO_SNOOP_OVERRIDE);
10121012

10131013
qcom_pcie_clear_aspm_l0s(pcie->pci);
10141014
qcom_pcie_clear_hpc(pcie->pci);

drivers/pci/controller/pci-mvebu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,7 @@ static void mvebu_pcie_powerdown(struct mvebu_pcie_port *port)
14221422
}
14231423

14241424
/*
1425-
* devm_of_pci_get_host_bridge_resources() only sets up translateable resources,
1425+
* devm_of_pci_get_host_bridge_resources() only sets up translatable resources,
14261426
* so we need extra resource setup parsing our special DT properties encoding
14271427
* the MEM and IO apertures.
14281428
*/

drivers/pci/controller/pci-thunder-ecam.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ static int thunder_ecam_config_read(struct pci_bus *bus, unsigned int devfn,
204204

205205
v = readl(addr);
206206
if (v & 0xff00)
207-
pr_err("Bad MSIX cap header: %08x\n", v);
207+
pr_err("Bad MSI-X cap header: %08x\n", v);
208208
v |= 0xbc00; /* next capability is EA at 0xbc */
209209
set_val(v, where, size, val);
210210
return PCIBIOS_SUCCESSFUL;

drivers/pci/controller/pci-xgene-msi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static void xgene_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
154154
* X-Gene v1 only has 16 MSI GIC IRQs for 2048 MSI vectors. To maintain
155155
* the expected behaviour of .set_affinity for each MSI interrupt, the 16
156156
* MSI GIC IRQs are statically allocated to 8 X-Gene v1 cores (2 GIC IRQs
157-
* for each core). The MSI vector is moved fom 1 MSI GIC IRQ to another
157+
* for each core). The MSI vector is moved from 1 MSI GIC IRQ to another
158158
* MSI GIC IRQ to steer its MSI interrupt to correct X-Gene v1 core. As a
159159
* consequence, the total MSI vectors that X-Gene v1 supports will be
160160
* reduced to 256 (2048/8) vectors.

drivers/pci/controller/pcie-altera.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)
149149
* Altera PCIe port uses BAR0 of RC's configuration space as the translation
150150
* from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
151151
* using these registers, so it can be reached by DMA from EP devices.
152-
* This BAR0 will also access to MSI vector when receiving MSI/MSIX interrupt
152+
* This BAR0 will also access to MSI vector when receiving MSI/MSI-X interrupt
153153
* from EP devices, eventually trigger interrupt to GIC. The BAR0 of bridge
154154
* should be hidden during enumeration to avoid the sizing and resource
155155
* allocation by PCIe core.

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
/* Broadcom STB PCIe Register Offsets */
4141
#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1 0x0188
4242
#define PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK 0xc
43-
#define PCIE_RC_CFG_VENDOR_SPCIFIC_REG1_LITTLE_ENDIAN 0x0
43+
#define PCIE_RC_CFG_VENDOR_SPECIFIC_REG1_LITTLE_ENDIAN 0x0
4444

4545
#define PCIE_RC_CFG_PRIV1_ID_VAL3 0x043c
4646
#define PCIE_RC_CFG_PRIV1_ID_VAL3_CLASS_CODE_MASK 0xffffff
@@ -1180,7 +1180,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
11801180

11811181
/* PCIe->SCB endian mode for inbound window */
11821182
tmp = readl(base + PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1);
1183-
u32p_replace_bits(&tmp, PCIE_RC_CFG_VENDOR_SPCIFIC_REG1_LITTLE_ENDIAN,
1183+
u32p_replace_bits(&tmp, PCIE_RC_CFG_VENDOR_SPECIFIC_REG1_LITTLE_ENDIAN,
11841184
PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK);
11851185
writel(tmp, base + PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1);
11861186

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ static int rcar_pcie_config_access(struct rcar_pcie_host *host,
178178
* space, it's generally only accessible when in endpoint mode.
179179
* When in root complex mode, the controller is unable to target
180180
* itself with either type 0 or type 1 accesses, and indeed, any
181-
* controller initiated target transfer to its own config space
182-
* result in a completer abort.
181+
* controller-initiated target transfer to its own config space
182+
* results in a completer abort.
183183
*
184184
* Each channel effectively only supports a single device, but as
185185
* the same channel <-> device access works for any PCI_SLOT()
@@ -775,7 +775,7 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host)
775775
if (err)
776776
return err;
777777

778-
/* Two irqs are for MSI, but they are also used for non-MSI irqs */
778+
/* Two IRQs are for MSI, but they are also used for non-MSI IRQs */
779779
err = devm_request_irq(dev, msi->irq1, rcar_pcie_msi_irq,
780780
IRQF_SHARED | IRQF_NO_THREAD,
781781
rcar_msi_bottom_chip.name, host);
@@ -792,7 +792,7 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host)
792792
goto err;
793793
}
794794

795-
/* disable all MSIs */
795+
/* Disable all MSIs */
796796
rcar_pci_write_reg(pcie, 0, PCIEMSIIER);
797797

798798
/*
@@ -892,6 +892,7 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
892892
dev_err(pcie->dev, "Failed to map inbound regions!\n");
893893
return -EINVAL;
894894
}
895+
895896
/*
896897
* If the size of the range is larger than the alignment of
897898
* the start address, we have to use multiple entries to
@@ -903,6 +904,7 @@ static int rcar_pcie_inbound_ranges(struct rcar_pcie *pcie,
903904

904905
size = min(size, alignment);
905906
}
907+
906908
/* Hardware supports max 4GiB inbound region */
907909
size = min(size, 1ULL << 32);
908910

drivers/pci/endpoint/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ config PCI_ENDPOINT_CONFIGFS
2626
help
2727
This will enable the configfs entry that can be used to
2828
configure the endpoint function and used to bind the
29-
function with a endpoint controller.
29+
function with an endpoint controller.
3030

3131
source "drivers/pci/endpoint/functions/Kconfig"
3232

0 commit comments

Comments
 (0)