PCI: Miscellaneous cleanups
Subsystems (10)
cover PCI: Miscellaneous cleanups
From: Bjorn Helgaas <[email protected]>
Simplify some trivial things and fix some typos and formatting inconsistencies.
Most are based on v6.5-rc1 (actually on the current "misc" branch, so there may be minor conflicts).
The last ("Simplify pcie_capability_clear_and_set_word()") is based on the current "pcie-rmw" branch because it changes the same code as that branch does.
No functional change intended for any of this, except the printk changes ("%#08x" vs "%#010x").
Bjorn Helgaas (12):
PCI: mvebu: Remove unused struct mvebu_pcie.busn
PCI: Unexport pcie_port_bus_type
PCI: Remove unnecessary initializations
PCI: Fix printk field formatting
PCI: Use consistent put_user() pointer types
PCI/AER: Simplify AER_RECOVER_RING_SIZE definition
PCI: Simplify pci_pio_to_address()
PCI: Simplify pci_dev_driver()
PCI: Fix pci_bus_resetable(), pci_slot_resetable() name typos
PCI: Fix typos in docs and comments
PCI: Fix code formatting inconsistencies
PCI: Simplify pcie_capability_clear_and_set_word() control flow
Signature · 1 line
2.34.1
PATCH 1/12 PCI: mvebu: Remove unused struct mvebu_pcie.busn
From: Bjorn Helgaas <[email protected]>
The busn member of struct mvebu_pcie is unused, so drop it.
--- drivers/pci/controller/pci-mvebu.c | 1 - 1 file changed, 1 deletion(-)
drivers/pci/controller/pci-mvebu.c +0 -1
@@ -87,7 +87,6 @@ struct mvebu_pcie {struct resource io;struct resource realio;struct resource mem; -struct resource busn;int nports; };
Signature · 1 line
2.34.1
Pali Rohár
maintainerRe: [PATCH 01/12] PCI: mvebu: Remove unused struct mvebu_pcie.busn
Duplicate of https://lore.kernel.org/linux-pci/[email protected]/ ?
Quoted 26 lines · On Thursday 24 August 2023 14:37:01 Bjorn Helgaas wrote:
From: Bjorn Helgaas <[email protected]>
The busn member of struct
mvebu_pcieis unused, so drop it.Signed-off-by Bjorn Helgaas <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Pali Rohár <[email protected]>--- drivers/pci/controller/pci-mvebu.c | 1 - 1 file changed, 1 deletion(-)drivers/pci/controller/pci-mvebu.c +0
-1@@ -87,7 +87,6 @@ struct mvebu_pcie {struct resource io;struct resource realio;struct resource mem; -struct resource busn;int nports; };Signature · 1 line
2.34.1
Re: [PATCH 01/12] PCI: mvebu: Remove unused struct mvebu_pcie.busn
Quoted 1 line · Pali Rohár
Duplicate of https://lore.kernel.org/linux-pci/[email protected]/ ?
Thank you! Updated with you as author.
Quoted 27 lines · On Thursday 24 August 2023 14:37:01 Bjorn Helgaas wrote:
Quoted 26 lines
From: Bjorn Helgaas <[email protected]>
The busn member of struct
mvebu_pcieis unused, so drop it.Signed-off-by Bjorn Helgaas <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Pali Rohár <[email protected]>--- drivers/pci/controller/pci-mvebu.c | 1 - 1 file changed, 1 deletion(-)drivers/pci/controller/pci-mvebu.c +0
-1@@ -87,7 +87,6 @@ struct mvebu_pcie {struct resource io;struct resource realio;struct resource mem; -struct resource busn;int nports; };Signature · 1 line
2.34.1
PATCH 2/12 PCI: Unexport pcie_port_bus_type
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
pcie_port_bus_type is used only in pci-driver.c and pcie/portdrv_core.c and pcie/portdrv_pci.c. None of these can be built as modules, so pcie_port_bus_type doesn't need to be exported. Unexport it.
--- drivers/pci/pci-driver.c | 1 - 1 file changed, 1 deletion(-)
drivers/pci/pci-driver.c +0 -1
@@ -1705,7 +1705,6 @@ struct bus_type pcie_port_bus_type = { .name = "pci_express", .match = pcie_port_bus_match, }; -EXPORT_SYMBOL_GPL (pcie_port_bus_type);#endif static int __init pci_driver_init (void )
Signature · 1 line
2.34.1
PATCH 3/12 PCI: Remove unnecessary initializations
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
We always assign "fields" immediately, so remove the unnecessary initializations. No functional change intended.
--- drivers/pci/pci-driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci-driver.c +2 -2
@@ -193,7 +193,7 @@ static ssize_t new_id_store(struct device_driver *driver, const char *buf,u32 vendor, device, subvendor =PCI_ANY_ID , subdevice =PCI_ANY_ID , class =0 , class_mask =0 ;unsigned long driver_data =0 ; -int fields =0 ; +int fields;int retval =0 ; fields = sscanf(buf, "%x %x %x %x %x %x %lx",
@@ -260,7 +260,7 @@ static ssize_t remove_id_store(struct device_driver *driver, const char *buf,struct pci_driver *pdrv =to_pci_driver (driver);u32 vendor, device, subvendor =PCI_ANY_ID , subdevice =PCI_ANY_ID , class =0 , class_mask =0 ; -int fields =0 ; +int fields;size_t retval = -ENODEV ; fields = sscanf(buf, "%x %x %x %x %x %x",
Signature · 1 line
2.34.1
PATCH 4/12 PCI: Fix printk field formatting
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Previously we used "%#08x" to print a 32-bit value. This fills an 8-character field with "0x...", but of course many 32-bit values require a 10-character field "0x12345678" for this format. Fix the formats to avoid confusion.
--- drivers/pci/setup-res.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/setup-res.c +2 -2
@@ -104,7 +104,7 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno)pci_read_config_dword (dev, reg, &check);if ((new ^ check) & mask) { -pci_err (dev,"BAR %d: error updating (%#08x != %#08x)\n" , +pci_err (dev,"BAR %d: error updating (%#010x != %#010x)\n" , resno, new, check); }
@@ -113,7 +113,7 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno)pci_write_config_dword (dev, reg +4 , new);pci_read_config_dword (dev, reg +4 , &check);if (check != new) { -pci_err (dev,"BAR %d: error updating (high %#08x != %#08x)\n" , +pci_err (dev,"BAR %d: error updating (high %#010x != %#010x)\n" , resno, new, check); } }
Signature · 1 line
2.34.1
PATCH 5/12 PCI: Use consistent put_user() pointer types
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
We used u8, u16, and u32 for get_user() pointer types, but "unsigned char", "unsigned short", and "unsigned int" for put_user().
Use u8, u16, and u32 for put_user() for consistency. No functional change intended.
--- drivers/pci/syscall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pci/syscall.c +6 -6
@@ -52,13 +52,13 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn,switch (len) {case 1 : - err =put_user (byte, (unsigned char __user *)buf); + err =put_user (byte, (u8 __user *)buf);break ;case 2 : - err =put_user (word, (unsigned short __user *)buf); + err =put_user (word, (u16 __user *)buf);break ;case 4 : - err =put_user (dword, (unsigned int __user *)buf); + err =put_user (dword, (u32 __user *)buf);break ; }pci_dev_put (dev);
@@ -70,13 +70,13 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn,they get instead of a machine check on x86. */ switch (len) {case 1 : -put_user (-1 , (unsigned char __user *)buf); +put_user (-1 , (u8 __user *)buf);break ;case 2 : -put_user (-1 , (unsigned short __user *)buf); +put_user (-1 , (u16 __user *)buf);break ;case 4 : -put_user (-1 , (unsigned int __user *)buf); +put_user (-1 , (u32 __user *)buf);break ; }pci_dev_put (dev);
Signature · 1 line
2.34.1
PATCH 6/12 PCI/AER: Simplify AER_RECOVER_RING_SIZE definition
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
ACPI Platform Error Interfaces (APEI) convey error information to the OS. If the APEI GHES driver receives information about PCI errors, it queues it in aer_recover_ring for processing by the PCI AER code.
AER_RECOVER_RING_SIZE is the size of the aer_recover_ring FIFO and is arbitrary, with no direct connection to hardware.
AER_RECOVER_RING_ORDER was only used to compute AER_RECOVER_RING_SIZE. Remove it and define AER_RECOVER_RING_SIZE directly. No functional change intended.
--- drivers/pci/pcie/aer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/pcie/aer.c +1 -2
@@ -981,8 +981,7 @@ static void handle_error_source(struct pci_dev *dev, struct aer_err_info *info) #ifdef CONFIG_ACPI_APEI_PCIEAER -#define AER_RECOVER_RING_ORDER 4 -#define AER_RECOVER_RING_SIZE (1 << AER_RECOVER_RING_ORDER) +#define AER_RECOVER_RING_SIZE 16 struct aer_recover_entry { u8 bus;
Signature · 1 line
2.34.1
PATCH 7/12 PCI: Simplify pci_pio_to_address()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Simplify pci_pio_to_address() by removing an unnecessary local variable. No functional change intended.
--- drivers/pci/pci.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/pci/pci.c +3 -7
@@ -4191,16 +4191,12 @@ int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr,phys_addr_t pci_pio_to_address (unsigned long pio) { -phys_addr_t address = (phys_addr_t )OF_BAD_ADDR ; -#ifdef PCI_IOBASE -if (pio >=MMIO_UPPER_LIMIT ) -return address; - - address =logic_pio_to_hwaddr (pio); +if (pio <MMIO_UPPER_LIMIT ) +return logic_pio_to_hwaddr (pio);#endif -return address; +return (phys_addr_t )OF_BAD_ADDR ; }EXPORT_SYMBOL_GPL (pci_pio_to_address);
Signature · 1 line
2.34.1
PATCH 8/12 PCI: Simplify pci_dev_driver()
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Simplify pci_dev_driver() by removing the "else". The "if" case always returns, so the "else" is superfluous. No functional change intended.
--- drivers/pci/pci-driver.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/pci/pci-driver.c +7 -6
@@ -1474,14 +1474,15 @@ static struct pci_driver pci_compat_driver = {*/ struct pci_driver *pci_dev_driver (const struct pci_dev *dev) { +int i; +if (dev->driver)return dev->driver; -else { -int i; -for (i =0 ; i <=PCI_ROM_RESOURCE ; i++) -if (dev->resource[i].flags &IORESOURCE_BUSY ) -return &pci_compat_driver; - } + +for (i =0 ; i <=PCI_ROM_RESOURCE ; i++) +if (dev->resource[i].flags &IORESOURCE_BUSY ) +return &pci_compat_driver; +return NULL ; }EXPORT_SYMBOL (pci_dev_driver);
Signature · 1 line
2.34.1
PATCH 9/12 PCI: Fix pci_bus_resetable(), pci_slot_resetable() name typos
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Fix typos in the pci_bus_resetable() and pci_slot_resetable() function names. No functional change intended.
--- drivers/pci/pci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pci/pci.c +6 -6
@@ -5627,7 +5627,7 @@ int pci_try_reset_function(struct pci_dev *dev)EXPORT_SYMBOL_GPL (pci_try_reset_function);/* Do any devices on or below this bus prevent a bus reset? */ -static bool pci_bus_resetable (struct pci_bus *bus) +static bool pci_bus_resettable (struct pci_bus *bus) {struct pci_dev *dev;
@@ -5637,7 +5637,7 @@ static bool pci_bus_resetable(struct pci_bus *bus)list_for_each_entry (dev, &bus->devices, bus_list) {if (dev->dev_flags &PCI_DEV_FLAGS_NO_BUS_RESET || - (dev->subordinate && !pci_bus_resetable (dev->subordinate))) + (dev->subordinate && !pci_bus_resettable (dev->subordinate)))return false; }
@@ -5695,7 +5695,7 @@ static int pci_bus_trylock(struct pci_bus *bus) }/* Do any devices on or below this slot prevent a bus reset? */ -static bool pci_slot_resetable (struct pci_slot *slot) +static bool pci_slot_resettable (struct pci_slot *slot) {struct pci_dev *dev;
@@ -5707,7 +5707,7 @@ static bool pci_slot_resetable(struct pci_slot *slot)if (!dev->slot || dev->slot != slot)continue ;if (dev->dev_flags &PCI_DEV_FLAGS_NO_BUS_RESET || - (dev->subordinate && !pci_bus_resetable (dev->subordinate))) + (dev->subordinate && !pci_bus_resettable (dev->subordinate)))return false; }
@@ -5843,7 +5843,7 @@ static int pci_slot_reset(struct pci_slot *slot, bool probe) {int rc; -if (!slot || !pci_slot_resetable (slot)) +if (!slot || !pci_slot_resettable (slot))return -ENOTTY ;if (!probe)
@@ -5910,7 +5910,7 @@ static int pci_bus_reset(struct pci_bus *bus, bool probe) {int ret; -if (!bus->self || !pci_bus_resetable (bus)) +if (!bus->self || !pci_bus_resettable (bus))return -ENOTTY ;if (probe)
Signature · 1 line
2.34.1
PATCH 10/12 PCI: Fix typos in docs and comments
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Fix typos in docs and comments.
--- Documentation/PCI/pci-error-recovery.rst | 12 +++---- drivers/pci/controller/cadence/pcie-cadence.h | 2 +- drivers/pci/endpoint/functions/pci-epf-vntb.c | 32 +++++++++---------- drivers/pci/msi/irqdomain.c | 4 +-- drivers/pci/p2pdma.c | 2 +- drivers/pci/pci.c | 2 +- drivers/pci/probe.c | 2 +- drivers/pci/quirks.c | 8 ++--- drivers/pci/setup-bus.c | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-)
Documentation/PCI/pci-error-recovery.rst +6 -6
@@ -17,7 +17,7 @@ chipsets are able to deal with these errors; these include PCI-E chipsets, and the PCI-host bridges found on IBM Power4, Power5 and Power6-based pSeries boxes. A typical action taken is to disconnect the affected device, halting all I/O to it. The goal of a disconnection is to avoid system -corruption; for example, to halt system memory corruption due to DMA's +corruption; for example, to halt system memory corruption due to DMAs to "wild" addresses. Typically, a reconnection mechanism is also offered, so that the affected PCI device(s) are reset and put back into working condition. The reset phase requires coordination
@@ -178,9 +178,9 @@ is STEP 6 (Permanent Failure). complex and not worth implementing. The current powerpc implementation doesn't much care if the device - attempts I/O at this point, or not. I/O's will fail, returning + attempts I/O at this point, or not. I/Os will fail, returning a value of 0xff on read, and writes will be dropped. If more than - EEH_MAX_FAILS I/O's are attempted to a frozen adapter, EEH + EEH_MAX_FAILS I/Os are attempted to a frozen adapter, EEH assumes that the device driver has gone into an infinite loop and prints an error to syslog. A reboot is then required to get the device working again.
@@ -204,7 +204,7 @@ instead will have gone directly to STEP 3 (Link Reset) or STEP 4 (Slot Reset) .. note:: The following is proposed; no platform implements this yet: - Proposal: All I/O's should be done _synchronously_ from within + Proposal: All I/Os should be done _synchronously_ from within this callback, errors triggered by them will be returned via the normal pci_check_whatever() API, no new error_detected() callback will be issued due to an error happening here. However,
@@ -258,7 +258,7 @@ Powerpc platforms implement two levels of slot reset: soft reset(default) and fundamental(optional) reset. Powerpc soft reset consists of asserting the adapter #RST line and then -restoring the PCI BAR's and PCI configuration header to a state +restoring the PCI BARs and PCI configuration header to a state that is equivalent to what it would be after a fresh system power-on followed by power-on BIOS/system firmware initialization. Soft reset is also known as hot-reset.
@@ -362,7 +362,7 @@ permanent failure in some way. If the device is hotplug-capable, the operator will probably want to remove and replace the device. Note, however, not all failures are truly "permanent". Some are caused by over-heating, some by a poorly seated card. Many -PCI error events are caused by software bugs, e.g. DMA's to +PCI error events are caused by software bugs, e.g. DMAs to wild addresses or bogus split transactions due to programming errors. See the discussion in Documentation/powerpc/eeh-pci-error-recovery.rst for additional detail on real-life experience of the causes of
drivers/pci/controller/cadence/pcie-cadence.h +1 -1
@@ -32,7 +32,7 @@#define CDNS_PCIE_LM_ID_SUBSYS (sub) \ (((sub) << CDNS_PCIE_LM_ID_SUBSYS_SHIFT) & CDNS_PCIE_LM_ID_SUBSYS_MASK) -/* Root Port Requestor ID Register */ +/* Root Port Requester ID Register */ #define CDNS_PCIE_LM_RP_RID (CDNS_PCIE_LM_BASE + 0x0228)#define CDNS_PCIE_LM_RP_RID_MASK GENMASK(15, 0)#define CDNS_PCIE_LM_RP_RID_SHIFT 0
drivers/pci/endpoint/functions/pci-epf-vntb.c +16 -16
@@ -986,22 +986,22 @@ static struct config_group *epf_ntb_add_cfs(struct pci_epf *epf,/*==== virtual PCI bus driver, which only load virtual NTB PCI driver ====*/ static u32 pci_space[] = { -0xffffffff ,/*DeviceID, Vendor ID*/ -0 ,/*Status, Command*/ -0xffffffff ,/*Class code, subclass, prog if, revision id*/ -0x40 ,/*bist, header type, latency Timer, cache line size*/ -0 ,/*BAR 0*/ -0 ,/*BAR 1*/ -0 ,/*BAR 2*/ -0 ,/*BAR 3*/ -0 ,/*BAR 4*/ -0 ,/*BAR 5*/ -0 ,/*Cardbus cis point*/ -0 ,/*Subsystem ID Subystem vendor id*/ -0 ,/*ROM Base Address*/ -0 ,/*Reserved, Cap. Point*/ -0 ,/*Reserved,*/ -0 ,/*Max Lat, Min Gnt, interrupt pin, interrupt line*/ +0xffffffff ,/* Device ID, Vendor ID */ +0 ,/* Status, Command */ +0xffffffff ,/* Base Class, Subclass, Prog Intf, Revision ID */ +0x40 ,/* BIST, Header Type, Latency Timer, Cache Line Size */ +0 ,/* BAR 0 */ +0 ,/* BAR 1 */ +0 ,/* BAR 2 */ +0 ,/* BAR 3 */ +0 ,/* BAR 4 */ +0 ,/* BAR 5 */ +0 ,/* Cardbus CIS Pointer */ +0 ,/* Subsystem ID, Subsystem Vendor ID */ +0 ,/* ROM Base Address */ +0 ,/* Reserved, Capabilities Pointer */ +0 ,/* Reserved */ +0 ,/* Max_Lat, Min_Gnt, Interrupt Pin, Interrupt Line */ };static int pci_read (struct pci_bus *bus,unsigned int devfn,int where,int size,u32 *val)
drivers/pci/msi/irqdomain.c +2 -2
@@ -336,7 +336,7 @@ bool pci_msi_domain_supports(struct pci_dev *pdev, unsigned int feature_mask,if (!irq_domain_is_msi_parent (domain)) {/* * For "global" PCI/MSI interrupt domains the associated -* msi_domain_info::flags is the authoritive source of +* msi_domain_info::flags is the authoritative source of * information. */ info = domain->host_data;
@@ -344,7 +344,7 @@ bool pci_msi_domain_supports(struct pci_dev *pdev, unsigned int feature_mask, }else {/* * For MSI parent domains the supported feature set -* is avaliable in the parent ops. This makes checks +* is available in the parent ops. This makes checks * possible before actually instantiating the * per device domain because the parent is never * expanding the PCI/MSI functionality.
drivers/pci/p2pdma.c +1 -1
@@ -435,7 +435,7 @@ static const struct pci_p2pdma_whitelist_entry {/* Intel Xeon E7 v3/Xeon E5 v3/Core i7 */ {PCI_VENDOR_ID_INTEL, 0x2f00, REQ_SAME_HOST_BRIDGE}, {PCI_VENDOR_ID_INTEL, 0x2f01, REQ_SAME_HOST_BRIDGE}, -/* Intel SkyLake-E */ +/* Intel Skylake-E */ {PCI_VENDOR_ID_INTEL, 0x2030, 0}, {PCI_VENDOR_ID_INTEL, 0x2031, 0}, {PCI_VENDOR_ID_INTEL, 0x2032, 0},
drivers/pci/pci.c +1 -1
@@ -1290,7 +1290,7 @@ int pci_power_up(struct pci_dev *dev)* * Call pci_power_up() to put @dev into D0, read from its PCI_PM_CTRL register * to confirm the state change, restore its BARs if they might be lost and -* reconfigure ASPM in acordance with the new power state. +* reconfigure ASPM in accordance with the new power state. * * If pci_restore_state() is going to be called right after a power state change * to D0, it is more efficient to use pci_power_up() directly instead of this
drivers/pci/probe.c +1 -1
@@ -2136,7 +2136,7 @@ static void pci_configure_relaxed_ordering(struct pci_dev *dev) {struct pci_dev *root; -/* PCI_EXP_DEVICE_RELAX_EN is RsvdP in VFs */ +/* PCI_EXP_DEVCTL_RELAX_EN is RsvdP in VFs */ if (dev->is_virtfn)return ;
drivers/pci/quirks.c +4 -4
@@ -362,7 +362,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_d#endif /* -* Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear +* Intel NM10 "Tiger Point" LPC PM1a_STS.BM_STS must be clear * for some HT machines to use C4 w/o hanging. */ static void quirk_tigerpoint_bm_sts (struct pci_dev *dev)
@@ -375,7 +375,7 @@ static void quirk_tigerpoint_bm_sts(struct pci_dev *dev) pm1a =inw (pmbase);if (pm1a &0x10 ) { -pci_info (dev,FW_BUG "TigerPoint LPC.BM_STS cleared\n" ); +pci_info (dev,FW_BUG "Tiger Point LPC.BM_STS cleared\n" );outw (0x10 , pmbase); } }
@@ -3073,7 +3073,7 @@ static void __nv_msi_ht_cap_quirk(struct pci_dev *dev, int all)/* * HT MSI mapping should be disabled on devices that are below -* a non-Hypertransport host bridge. Locate the host bridge... +* a non-HyperTransport host bridge. Locate the host bridge. */ host_bridge =pci_get_domain_bus_and_slot (pci_domain_nr (dev->bus),0 ,PCI_DEVFN (0 ,0 ));
@@ -5729,7 +5729,7 @@ int pci_idt_bus_quirk(struct pci_bus *bus, int devfn, u32 *l, int timeout)/* * Microsemi Switchtec NTB uses devfn proxy IDs to move TLPs between * NT endpoints via the internal switch fabric. These IDs replace the -* originating requestor ID TLPs which access host memory on peer NTB +* originating Requester ID TLPs which access host memory on peer NTB * ports. Therefore, all proxy IDs must be aliased to the NTB device * to permit access when the IOMMU is turned on. */
drivers/pci/setup-bus.c +1 -1
@@ -1799,7 +1799,7 @@ static void remove_dev_resources(struct pci_dev *dev, struct resource *io,* Make sure prefetchable memory is reduced from * the correct resource. Specifically we put 32-bit * prefetchable memory in non-prefetchable window -* if there is an 64-bit pretchable window. +* if there is an 64-bit prefetchable window. * * See comments in __pci_bus_size_bridges() for * more information.
Signature · 1 line
2.34.1
Re: [PATCH 10/12] PCI: Fix typos in docs and comments
Quoted 5 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
Fix typos in docs and comments.
Signed-off-by Bjorn Helgaas <[email protected]>
Quoted 12 lines
--- Documentation/PCI/pci-error-recovery.rst | 12 +++---- drivers/pci/controller/cadence/pcie-cadence.h | 2 +- drivers/pci/endpoint/functions/pci-epf-vntb.c | 32 +++++++++---------- drivers/pci/msi/irqdomain.c | 4 +-- drivers/pci/p2pdma.c | 2 +- drivers/pci/pci.c | 2 +- drivers/pci/probe.c | 2 +- drivers/pci/quirks.c | 8 ++--- drivers/pci/setup-bus.c | 2 +- 9 files changed, 33 insertions(+), 33 deletions(-)
Thanks.
Signature · 1 line
~Randy
PATCH 11/12 PCI: Fix code formatting inconsistencies
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Remove unnecessary "return;" in void functions and format consistently. No functional change intended.
--- drivers/pci/pci.h | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-)
drivers/pci/pci.h +14 -21
@@ -147,8 +147,8 @@ int pci_hp_add_bridge(struct pci_dev *dev);void pci_create_legacy_files (struct pci_bus *bus);void pci_remove_legacy_files (struct pci_bus *bus);#else -static inline void pci_create_legacy_files (struct pci_bus *bus) {return ; } -static inline void pci_remove_legacy_files (struct pci_bus *bus) {return ; } +static inline void pci_create_legacy_files (struct pci_bus *bus) { } +static inline void pci_remove_legacy_files (struct pci_bus *bus) { }#endif /* Lock for read/write access to pci device and bus lists */
@@ -422,9 +422,9 @@ void dpc_process_error(struct pci_dev *pdev);pci_ers_result_t dpc_reset_link (struct pci_dev *pdev);bool pci_dpc_recovered (struct pci_dev *pdev);#else -static inline void pci_save_dpc_state (struct pci_dev *dev) {} -static inline void pci_restore_dpc_state (struct pci_dev *dev) {} -static inline void pci_dpc_init (struct pci_dev *pdev) {} +static inline void pci_save_dpc_state (struct pci_dev *dev) { } +static inline void pci_restore_dpc_state (struct pci_dev *dev) { } +static inline void pci_dpc_init (struct pci_dev *pdev) { }static inline bool pci_dpc_recovered (struct pci_dev *pdev) {return false; }#endif
@@ -436,12 +436,12 @@ void pcie_walk_rcec(struct pci_dev *rcec,int (*cb)(struct pci_dev *,void *), void *userdata);#else -static inline void pci_rcec_init (struct pci_dev *dev) {} -static inline void pci_rcec_exit (struct pci_dev *dev) {} -static inline void pcie_link_rcec (struct pci_dev *rcec) {} +static inline void pci_rcec_init (struct pci_dev *dev) { } +static inline void pci_rcec_exit (struct pci_dev *dev) { } +static inline void pcie_link_rcec (struct pci_dev *rcec) { }static inline void pcie_walk_rcec (struct pci_dev *rcec,int (*cb)(struct pci_dev *,void *), -void *userdata) {} +void *userdata) { }#endif #ifdef CONFIG_PCI_ATS
@@ -484,16 +484,9 @@ static inline int pci_iov_init(struct pci_dev *dev) {return -ENODEV ; } -static inline void pci_iov_release (struct pci_dev *dev) - -{ -} -static inline void pci_iov_remove (struct pci_dev *dev) -{ -} -static inline void pci_restore_iov_state (struct pci_dev *dev) -{ -} +static inline void pci_iov_release (struct pci_dev *dev) { } +static inline void pci_iov_remove (struct pci_dev *dev) { } +static inline void pci_restore_iov_state (struct pci_dev *dev) { }static inline int pci_iov_bus_range (struct pci_bus *bus) {return 0 ;
@@ -718,7 +711,7 @@ static inline int pci_dev_acpi_reset(struct pci_dev *dev, bool probe) {return -ENOTTY ; } -static inline void pci_set_acpi_fwnode (struct pci_dev *dev) {} +static inline void pci_set_acpi_fwnode (struct pci_dev *dev) { }static inline int pci_acpi_program_hp_params (struct pci_dev *dev) {return -ENODEV ;
@@ -739,7 +732,7 @@ static inline pci_power_t acpi_pci_get_power_state(struct pci_dev *dev) {return PCI_UNKNOWN ; } -static inline void acpi_pci_refresh_power_state (struct pci_dev *dev) {} +static inline void acpi_pci_refresh_power_state (struct pci_dev *dev) { }static inline int acpi_pci_wakeup (struct pci_dev *dev,bool enable) {return -ENODEV ;
Signature · 1 line
2.34.1
PATCH 12/12 PCI: Simplify pcie_capability_clear_and_set_word() control flow
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Return early for errors in pcie_capability_clear_and_set_word_unlocked() and pcie_capability_clear_and_set_dword() to simplify the control flow.
No functional change intended.
--- drivers/pci/access.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/pci/access.c +10 -12
@@ -504,13 +504,12 @@ int pcie_capability_clear_and_set_word_unlocked(struct pci_dev *dev, int pos,u16 val; ret =pcie_capability_read_word (dev, pos, &val); -if (!ret) { - val &= ~clear; - val |= set; - ret =pcie_capability_write_word (dev, pos, val); - } +if (ret) +return ret; -return ret; + val &= ~clear; + val |= set; +return pcie_capability_write_word (dev, pos, val); }EXPORT_SYMBOL (pcie_capability_clear_and_set_word_unlocked);
@@ -535,13 +534,12 @@ int pcie_capability_clear_and_set_dword(struct pci_dev *dev, int pos,u32 val; ret =pcie_capability_read_dword (dev, pos, &val); -if (!ret) { - val &= ~clear; - val |= set; - ret =pcie_capability_write_dword (dev, pos, val); - } +if (ret) +return ret; -return ret; + val &= ~clear; + val |= set; +return pcie_capability_write_dword (dev, pos, val); }EXPORT_SYMBOL (pcie_capability_clear_and_set_dword);
Signature · 1 line
2.34.1
Re: [PATCH 12/12] PCI: Simplify pcie_capability_clear_and_set_word() control flow
Quoted 9 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
Return early for errors in
pcie_capability_clear_and_set_word_unlocked()andpcie_capability_clear_and_set_dword()to simplify the control flow.No functional change intended.
Signed-off-by Bjorn Helgaas <[email protected]>Cc Ilpo Järvinen <[email protected]>
Signature · 1 line
i.
Quoted 47 lines
--- drivers/pci/access.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)drivers/pci/access.c +10
-12@@ -504,13 +504,12 @@ int pcie_capability_clear_and_set_word_unlocked(struct pci_dev *dev, int pos,u16 val; ret =pcie_capability_read_word (dev, pos, &val); -if (!ret) { - val &= ~clear; - val |= set; - ret =pcie_capability_write_word (dev, pos, val); - } +if (ret) +return ret; -return ret; + val &= ~clear; + val |= set; +return pcie_capability_write_word (dev, pos, val); }EXPORT_SYMBOL (pcie_capability_clear_and_set_word_unlocked);@@ -535,13 +534,12 @@ int pcie_capability_clear_and_set_dword(struct pci_dev *dev, int pos,u32 val; ret =pcie_capability_read_dword (dev, pos, &val); -if (!ret) { - val &= ~clear; - val |= set; - ret =pcie_capability_write_dword (dev, pos, val); - } +if (ret) +return ret; -return ret; + val &= ~clear; + val |= set; +return pcie_capability_write_dword (dev, pos, val); }EXPORT_SYMBOL (pcie_capability_clear_and_set_dword);
Quoted 15 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
Simplify some trivial things and fix some typos and formatting inconsistencies.
Most are based on v6.5-rc1 (actually on the current "misc" branch, so there may be minor conflicts).
The last ("Simplify
pcie_capability_clear_and_set_word()") is based on the current "pcie-rmw" branch because it changes the same code as that branch does.No functional change intended for any of this, except the printk changes ("%#08x" vs "%#010x").
Quoted 13 lines
Bjorn Helgaas (12):
PCI: mvebu: Remove unused struct mvebu_pcie.busn
PCI: Unexportpcie_port_bus_type
PCI: Remove unnecessary initializations
PCI: Fix printk field formatting
PCI: Use consistentput_user()pointer types
PCI/AER: SimplifyAER_RECOVER_RING_SIZEdefinition
PCI: Simplifypci_pio_to_address()
PCI: Simplifypci_dev_driver()
PCI: Fixpci_bus_resetable(),pci_slot_resetable()name typos
PCI: Fix typos in docs and comments
PCI: Fix code formatting inconsistencies
PCI: Simplifypcie_capability_clear_and_set_word()control flow
I read through all these patches. For the whole series:
Signature · 1 line
i.