···301301 val |= interrupts;302302 cdns_pcie_ep_fn_writew(pcie, fn, reg, val);303303304304- /* Set MSIX BAR and offset */304304+ /* 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);308308309309- /* Set PBA BAR and offset. BAR must match MSIX BAR */309309+ /* 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);···573573574574 /*575575 * Next function field in ARI_CAP_AND_CTR register for last function576576- * should be 0.577577- * Clearing Next Function Number field for the last function used.576576+ * should be 0. Clear Next Function Number field for the last577577+ * 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);
···14221422}1423142314241424/*14251425- * devm_of_pci_get_host_bridge_resources() only sets up translateable resources,14251425+ * devm_of_pci_get_host_bridge_resources() only sets up translatable resources,14261426 * so we need extra resource setup parsing our special DT properties encoding14271427 * the MEM and IO apertures.14281428 */
+1-1
drivers/pci/controller/pci-thunder-ecam.c
···204204205205 v = readl(addr);206206 if (v & 0xff00)207207- pr_err("Bad MSIX cap header: %08x\n", v);207207+ 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;
+1-1
drivers/pci/controller/pci-xgene-msi.c
···154154 * X-Gene v1 only has 16 MSI GIC IRQs for 2048 MSI vectors. To maintain155155 * the expected behaviour of .set_affinity for each MSI interrupt, the 16156156 * MSI GIC IRQs are statically allocated to 8 X-Gene v1 cores (2 GIC IRQs157157- * for each core). The MSI vector is moved fom 1 MSI GIC IRQ to another157157+ * for each core). The MSI vector is moved from 1 MSI GIC IRQ to another158158 * MSI GIC IRQ to steer its MSI interrupt to correct X-Gene v1 core. As a159159 * consequence, the total MSI vectors that X-Gene v1 supports will be160160 * reduced to 256 (2048/8) vectors.
+1-1
drivers/pci/controller/pcie-altera.c
···149149 * Altera PCIe port uses BAR0 of RC's configuration space as the translation150150 * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space151151 * using these registers, so it can be reached by DMA from EP devices.152152- * This BAR0 will also access to MSI vector when receiving MSI/MSIX interrupt152152+ * This BAR0 will also access to MSI vector when receiving MSI/MSI-X interrupt153153 * from EP devices, eventually trigger interrupt to GIC. The BAR0 of bridge154154 * should be hidden during enumeration to avoid the sizing and resource155155 * allocation by PCIe core.
···178178 * space, it's generally only accessible when in endpoint mode.179179 * When in root complex mode, the controller is unable to target180180 * itself with either type 0 or type 1 accesses, and indeed, any181181- * controller initiated target transfer to its own config space182182- * result in a completer abort.181181+ * controller-initiated target transfer to its own config space182182+ * results in a completer abort.183183 *184184 * Each channel effectively only supports a single device, but as185185 * the same channel <-> device access works for any PCI_SLOT()···775775 if (err)776776 return err;777777778778- /* Two irqs are for MSI, but they are also used for non-MSI irqs */778778+ /* 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);···792792 goto err;793793 }794794795795- /* disable all MSIs */795795+ /* Disable all MSIs */796796 rcar_pci_write_reg(pcie, 0, PCIEMSIIER);797797798798 /*···892892 dev_err(pcie->dev, "Failed to map inbound regions!\n");893893 return -EINVAL;894894 }895895+895896 /*896897 * If the size of the range is larger than the alignment of897898 * the start address, we have to use multiple entries to···904903905904 size = min(size, alignment);906905 }906906+907907 /* Hardware supports max 4GiB inbound region */908908 size = min(size, 1ULL << 32);909909
+1-1
drivers/pci/endpoint/Kconfig
···2626 help2727 This will enable the configfs entry that can be used to2828 configure the endpoint function and used to bind the2929- function with a endpoint controller.2929+ function with an endpoint controller.30303131source "drivers/pci/endpoint/functions/Kconfig"3232
+1-1
drivers/pci/endpoint/functions/pci-epf-test.c
···632632 case IRQ_TYPE_MSIX:633633 count = pci_epc_get_msix(epc, epf->func_no, epf->vfunc_no);634634 if (reg->irq_number > count || count <= 0) {635635- dev_err(dev, "Invalid MSIX IRQ number %d / %d\n",635635+ dev_err(dev, "Invalid MSI-X IRQ number %d / %d\n",636636 reg->irq_number, count);637637 return;638638 }
+1-1
drivers/pci/hotplug/Kconfig
···9797 tristate "Ziatech ZT5550 CompactPCI Hotplug driver"9898 depends on HOTPLUG_PCI_CPCI && X869999 help100100- Say Y here if you have an Performance Technologies (formerly Intel,100100+ Say Y here if you have a Performance Technologies (formerly Intel,101101 formerly just Ziatech) Ziatech ZT5550 CompactPCI system card.102102103103 To compile this driver as a module, choose M here: the
+1-1
drivers/pci/hotplug/pciehp_hpc.c
···430430 * removed immediately after the check so the caller may need to take431431 * this into account.432432 *433433- * It the hotplug controller itself is not available anymore returns433433+ * If the hotplug controller itself is not available anymore returns434434 * %-ENODEV.435435 */436436int pciehp_card_present(struct controller *ctrl)
+1-1
drivers/pci/msi/api.c
···162162EXPORT_SYMBOL_GPL(pci_msix_alloc_irq_at);163163164164/**165165- * pci_msix_free_irq - Free an interrupt on a PCI/MSIX interrupt domain165165+ * pci_msix_free_irq - Free an interrupt on a PCI/MSI-X interrupt domain166166 *167167 * @dev: The PCI device to operate on168168 * @map: A struct msi_map describing the interrupt to free
+6-3
drivers/pci/of.c
···455455 * @out_irq: structure of_phandle_args filled by this function456456 *457457 * This function resolves the PCI interrupt for a given PCI device. If a458458- * device-node exists for a given pci_dev, it will use normal OF tree458458+ * device node exists for a given pci_dev, it will use normal OF tree459459 * walking. If not, it will implement standard swizzling and walk up the460460- * PCI tree until an device-node is found, at which point it will finish460460+ * PCI tree until a device node is found, at which point it will finish461461 * resolving using the OF tree walking.462462 */463463static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)···517517 }518518519519 /*520520- * Ok, we have found a parent with a device-node, hand over to520520+ * Ok, we have found a parent with a device node, hand over to521521 * the OF parsing code.522522+ *522523 * We build a unit address from the linux device to be used for523524 * resolution. Note that we use the linux bus number which may524525 * not match your firmware bus numbering.526526+ *525527 * Fortunately, in most cases, interrupt-map-mask doesn't526528 * include the bus number as part of the matching.529529+ *527530 * You should still be careful about that though if you intend528531 * to rely on this function (you ship a firmware that doesn't529532 * create device nodes for all PCI devices).
+1-1
drivers/pci/pci.c
···4766476647674767 /*47684768 * PCIe r4.0 sec 6.6.1, a component must enter LTSSM Detect within 20ms,47694769- * after which we should expect an link active if the reset was47694769+ * after which we should expect the link to be active if the reset was47704770 * successful. If so, software must wait a minimum 100ms before sending47714771 * configuration requests to devices downstream this port.47724772 *
+34-34
drivers/pci/pcie/aer.c
···22/*33 * Implement the AER root port service driver. The driver registers an IRQ44 * handler. When a root port triggers an AER interrupt, the IRQ handler55- * collects root port status and schedules work.55+ * collects Root Port status and schedules work.66 *77 * Copyright (C) 2006 Intel Corp.88 * Tom Long Nguyen (tom.l.nguyen@intel.com)···5656 /*5757 * Fields for all AER capable devices. They indicate the errors5858 * "as seen by this device". Note that this may mean that if an5959- * end point is causing problems, the AER counters may increment6060- * at its link partner (e.g. root port) because the errors will be6161- * "seen" by the link partner and not the problematic end point5959+ * Endpoint is causing problems, the AER counters may increment6060+ * at its link partner (e.g. Root Port) because the errors will be6161+ * "seen" by the link partner and not the problematic Endpoint6262 * itself (which may report all counters as 0 as it never saw any6363 * problems).6464 */···7676 u64 dev_total_nonfatal_errs;77777878 /*7979- * Fields for Root ports & root complex event collectors only, these7979+ * Fields for Root Ports & Root Complex Event Collectors only; these8080 * indicate the total number of ERR_COR, ERR_FATAL, and ERR_NONFATAL8181- * messages received by the root port / event collector, INCLUDING the8282- * ones that are generated internally (by the rootport itself)8181+ * messages received by the Root Port / Event Collector, INCLUDING the8282+ * ones that are generated internally (by the Root Port itself)8383 */8484 u64 rootport_total_cor_errs;8585 u64 rootport_total_fatal_errs;···138138 * enable_ecrc_checking - enable PCIe ECRC checking for a device139139 * @dev: the PCI device140140 *141141- * Returns 0 on success, or negative on failure.141141+ * Return: 0 on success, or negative on failure.142142 */143143static int enable_ecrc_checking(struct pci_dev *dev)144144{···159159}160160161161/**162162- * disable_ecrc_checking - disables PCIe ECRC checking for a device162162+ * disable_ecrc_checking - disable PCIe ECRC checking for a device163163 * @dev: the PCI device164164 *165165- * Returns 0 on success, or negative on failure.165165+ * Return: 0 on success, or negative on failure.166166 */167167static int disable_ecrc_checking(struct pci_dev *dev)168168{···283283 * pci_aer_raw_clear_status - Clear AER error registers.284284 * @dev: the PCI device285285 *286286- * Clearing AER error status registers unconditionally, regardless of286286+ * Clear AER error status registers unconditionally, regardless of287287 * whether they're owned by firmware or the OS.288288 *289289- * Returns 0 on success, or negative on failure.289289+ * Return: 0 on success, or negative on failure.290290 */291291int pci_aer_raw_clear_status(struct pci_dev *dev)292292{···378378 /*379379 * We save/restore PCI_ERR_UNCOR_MASK, PCI_ERR_UNCOR_SEVER,380380 * PCI_ERR_COR_MASK, and PCI_ERR_CAP. Root and Root Complex Event381381- * Collectors also implement PCI_ERR_ROOT_COMMAND (PCIe r5.0, sec382382- * 7.8.4).381381+ * Collectors also implement PCI_ERR_ROOT_COMMAND (PCIe r6.0, sec382382+ * 7.8.4.9).383383 */384384 n = pcie_cap_has_rtctl(dev) ? 5 : 4;385385 pci_add_ext_cap_save_buffer(dev, PCI_EXT_CAP_ID_ERR, sizeof(u32) * n);···825825 u16 reg16;826826827827 /*828828- * When bus id is equal to 0, it might be a bad id829829- * reported by root port.828828+ * When bus ID is equal to 0, it might be a bad ID829829+ * reported by Root Port.830830 */831831 if ((PCI_BUS_NUM(e_info->id) != 0) &&832832 !(dev->bus->bus_flags & PCI_BUS_FLAGS_NO_AERSID)) {···834834 if (e_info->id == pci_dev_id(dev))835835 return true;836836837837- /* Continue id comparing if there is no multiple error */837837+ /* Continue ID comparing if there is no multiple error */838838 if (!e_info->multi_error_valid)839839 return false;840840 }841841842842 /*843843 * When either844844- * 1) bus id is equal to 0. Some ports might lose the bus845845- * id of error source id;844844+ * 1) bus ID is equal to 0. Some ports might lose the bus845845+ * ID of error source id;846846 * 2) bus flag PCI_BUS_FLAGS_NO_AERSID is set847847 * 3) There are multiple errors and prior ID comparing fails;848848 * We check AER status registers to find possible reporter.···894894/**895895 * find_source_device - search through device hierarchy for source device896896 * @parent: pointer to Root Port pci_dev data structure897897- * @e_info: including detailed error information such like id897897+ * @e_info: including detailed error information such as ID898898 *899899- * Return true if found.899899+ * Return: true if found.900900 *901901 * Invoked by DPC when error is detected at the Root Port.902902 * Caller of this function must set id, severity, and multi_error_valid of···938938939939/**940940 * pci_aer_unmask_internal_errors - unmask internal errors941941- * @dev: pointer to the pcie_dev data structure941941+ * @dev: pointer to the pci_dev data structure942942 *943943- * Unmasks internal errors in the Uncorrectable and Correctable Error943943+ * Unmask internal errors in the Uncorrectable and Correctable Error944944 * Mask registers.945945 *946946 * Note: AER must be enabled and supported by the device which must be···10031003 if (!is_cxl_mem_dev(dev) || !cxl_error_is_native(dev))10041004 return 0;1005100510061006- /* protect dev->driver */10061006+ /* Protect dev->driver */10071007 device_lock(&dev->dev);1008100810091009 err_handler = dev->driver ? dev->driver->err_handler : NULL;···1195119511961196/**11971197 * aer_get_device_error_info - read error status from dev and store it to info11981198- * @dev: pointer to the device expected to have a error record11981198+ * @dev: pointer to the device expected to have an error record11991199 * @info: pointer to structure to store the error record12001200 *12011201- * Return 1 on success, 0 on error.12011201+ * Return: 1 on success, 0 on error.12021202 *12031203 * Note that @info is reused among all error devices. Clear fields properly.12041204 */···12561256{12571257 int i;1258125812591259- /* Report all before handle them, not to lost records by reset etc. */12591259+ /* Report all before handling them, to not lose records by reset etc. */12601260 for (i = 0; i < e_info->error_dev_num && e_info->dev[i]; i++) {12611261 if (aer_get_device_error_info(e_info->dev[i], e_info))12621262 aer_print_error(e_info->dev[i], e_info);···12681268}1269126912701270/**12711271- * aer_isr_one_error - consume an error detected by root port12721272- * @rpc: pointer to the root port which holds an error12711271+ * aer_isr_one_error - consume an error detected by Root Port12721272+ * @rpc: pointer to the Root Port which holds an error12731273 * @e_src: pointer to an error source12741274 */12751275static void aer_isr_one_error(struct aer_rpc *rpc,···13191319}1320132013211321/**13221322- * aer_isr - consume errors detected by root port13221322+ * aer_isr - consume errors detected by Root Port13231323 * @irq: IRQ assigned to Root Port13241324 * @context: pointer to Root Port data structure13251325 *13261326- * Invoked, as DPC, when root port records new detected error13261326+ * Invoked, as DPC, when Root Port records new detected error13271327 */13281328static irqreturn_t aer_isr(int irq, void *context)13291329{···13831383 int aer = pdev->aer_cap;13841384 u32 reg32;1385138513861386- /* Disable Root's interrupt in response to error messages */13861386+ /* Disable Root Port's interrupt in response to error messages */13871387 pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, ®32);13881388 reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;13891389 pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);···15831583};1584158415851585/**15861586- * pcie_aer_init - register AER root service driver15861586+ * pcie_aer_init - register AER service driver15871587 *15881588- * Invoked when AER root service driver is loaded.15881588+ * Invoked when AER service driver is loaded.15891589 */15901590int __init pcie_aer_init(void)15911591{
+1-1
drivers/pci/setup-bus.c
···18801880 * Make sure prefetchable memory is reduced from18811881 * the correct resource. Specifically we put 32-bit18821882 * prefetchable memory in non-prefetchable window18831883- * if there is an 64-bit prefetchable window.18831883+ * if there is a 64-bit prefetchable window.18841884 *18851885 * See comments in __pci_bus_size_bridges() for18861886 * more information.
+9-8
include/linux/pci-epf.h
···3838 * @baseclass_code: broadly classifies the type of function the device performs3939 * @cache_line_size: specifies the system cacheline size in units of DWORDs4040 * @subsys_vendor_id: vendor of the add-in card or subsystem4141- * @subsys_id: id specific to vendor4141+ * @subsys_id: ID specific to vendor4242 * @interrupt_pin: interrupt pin the device (or device function) uses4343 */4444struct pci_epf_header {···5959 * @bind: ops to perform when a EPC device has been bound to EPF device6060 * @unbind: ops to perform when a binding has been lost between a EPC device6161 * and EPF device6262- * @add_cfs: ops to initialize function specific configfs attributes6262+ * @add_cfs: ops to initialize function-specific configfs attributes6363 */6464struct pci_epf_ops {6565 int (*bind)(struct pci_epf *epf);···138138 * @epc: the EPC device to which this EPF device is bound139139 * @epf_pf: the physical EPF device to which this virtual EPF device is bound140140 * @driver: the EPF driver to which this EPF device is bound141141- * @id: Pointer to the EPF device ID141141+ * @id: pointer to the EPF device ID142142 * @list: to add pci_epf as a list of PCI endpoint functions to pci_epc143143 * @lock: mutex to protect pci_epf_ops144144 * @sec_epc: the secondary EPC device to which this EPF device is bound···151151 * @is_vf: true - virtual function, false - physical function152152 * @vfunction_num_map: bitmap to manage virtual function number153153 * @pci_vepf: list of virtual endpoint functions associated with this function154154- * @event_ops: Callbacks for capturing the EPC events154154+ * @event_ops: callbacks for capturing the EPC events155155 */156156struct pci_epf {157157 struct device dev;···185185};186186187187/**188188- * struct pci_epf_msix_tbl - represents the MSIX table entry structure189189- * @msg_addr: Writes to this address will trigger MSIX interrupt in host190190- * @msg_data: Data that should be written to @msg_addr to trigger MSIX interrupt188188+ * struct pci_epf_msix_tbl - represents the MSI-X table entry structure189189+ * @msg_addr: Writes to this address will trigger MSI-X interrupt in host190190+ * @msg_data: Data that should be written to @msg_addr to trigger MSI-X191191+ * interrupt191192 * @vector_ctrl: Identifies if the function is prohibited from sending a message192192- * using this MSIX table entry193193+ * using this MSI-X table entry193194 */194195struct pci_epf_msix_tbl {195196 u64 msg_addr;