| Message ID | 20250409034156.92686-5-18255117159@163.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Krzysztof Wilczyński |
| Headers | show |
| Series | Refactor capability search into common macros | expand |
Hi Hans,
kernel test robot noticed the following build errors:
[auto build test ERROR on a24588245776dafc227243a01bfbeb8a59bafba9]
url: https://github.com/intel-lab-lkp/linux/commits/Hans-Zhang/PCI-Introduce-generic-bus-config-read-helper-function/20250409-115839
base: a24588245776dafc227243a01bfbeb8a59bafba9
patch link: https://lore.kernel.org/r/20250409034156.92686-5-18255117159%40163.com
patch subject: [PATCH v9 4/6] PCI: dwc: Use common PCI host bridge APIs for finding the capabilities
config: arc-randconfig-001-20250410 (https://download.01.org/0day-ci/archive/20250410/202504101228.CX8tAgfW-lkp@intel.com/config)
compiler: arc-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250410/202504101228.CX8tAgfW-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202504101228.CX8tAgfW-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/pci/controller/dwc/pcie-designware.c: In function '__dw_pcie_find_vsec_capability':
>> drivers/pci/controller/dwc/pcie-designware.c:239:24: error: implicit declaration of function 'dw_pcie_find_next_ext_capability'; did you mean 'pci_find_next_ext_capability'? [-Wimplicit-function-declaration]
239 | while ((vsec = dw_pcie_find_next_ext_capability(pci, vsec,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| pci_find_next_ext_capability
vim +239 drivers/pci/controller/dwc/pcie-designware.c
5b0841fa653f6c Vidya Sagar 2019-08-13 229
efaf16de43f599 Shradha Todi 2025-02-21 230 static u16 __dw_pcie_find_vsec_capability(struct dw_pcie *pci, u16 vendor_id,
efaf16de43f599 Shradha Todi 2025-02-21 231 u16 vsec_id)
efaf16de43f599 Shradha Todi 2025-02-21 232 {
efaf16de43f599 Shradha Todi 2025-02-21 233 u16 vsec = 0;
efaf16de43f599 Shradha Todi 2025-02-21 234 u32 header;
efaf16de43f599 Shradha Todi 2025-02-21 235
efaf16de43f599 Shradha Todi 2025-02-21 236 if (vendor_id != dw_pcie_readw_dbi(pci, PCI_VENDOR_ID))
efaf16de43f599 Shradha Todi 2025-02-21 237 return 0;
efaf16de43f599 Shradha Todi 2025-02-21 238
efaf16de43f599 Shradha Todi 2025-02-21 @239 while ((vsec = dw_pcie_find_next_ext_capability(pci, vsec,
efaf16de43f599 Shradha Todi 2025-02-21 240 PCI_EXT_CAP_ID_VNDR))) {
efaf16de43f599 Shradha Todi 2025-02-21 241 header = dw_pcie_readl_dbi(pci, vsec + PCI_VNDR_HEADER);
efaf16de43f599 Shradha Todi 2025-02-21 242 if (PCI_VNDR_HEADER_ID(header) == vsec_id)
efaf16de43f599 Shradha Todi 2025-02-21 243 return vsec;
efaf16de43f599 Shradha Todi 2025-02-21 244 }
efaf16de43f599 Shradha Todi 2025-02-21 245
efaf16de43f599 Shradha Todi 2025-02-21 246 return 0;
efaf16de43f599 Shradha Todi 2025-02-21 247 }
efaf16de43f599 Shradha Todi 2025-02-21 248
On 2025/4/10 14:02, kernel test robot wrote: > Hi Hans, > > kernel test robot noticed the following build errors: > > [auto build test ERROR on a24588245776dafc227243a01bfbeb8a59bafba9] > > url: https://github.com/intel-lab-lkp/linux/commits/Hans-Zhang/PCI-Introduce-generic-bus-config-read-helper-function/20250409-115839 > base: a24588245776dafc227243a01bfbeb8a59bafba9 > patch link: https://lore.kernel.org/r/20250409034156.92686-5-18255117159%40163.com > patch subject: [PATCH v9 4/6] PCI: dwc: Use common PCI host bridge APIs for finding the capabilities > config: arc-randconfig-001-20250410 (https://download.01.org/0day-ci/archive/20250410/202504101228.CX8tAgfW-lkp@intel.com/config) > compiler: arc-linux-gcc (GCC) 14.2.0 > reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250410/202504101228.CX8tAgfW-lkp@intel.com/reproduce) > > If you fix the issue in a separate patch/commit (i.e. not just a new version of > the same patch/commit), kindly add following tags > | Reported-by: kernel test robot <lkp@intel.com> > | Closes: https://lore.kernel.org/oe-kbuild-all/202504101228.CX8tAgfW-lkp@intel.com/ > > All errors (new ones prefixed by >>): > > drivers/pci/controller/dwc/pcie-designware.c: In function '__dw_pcie_find_vsec_capability': >>> drivers/pci/controller/dwc/pcie-designware.c:239:24: error: implicit declaration of function 'dw_pcie_find_next_ext_capability'; did you mean 'pci_find_next_ext_capability'? [-Wimplicit-function-declaration] > 239 | while ((vsec = dw_pcie_find_next_ext_capability(pci, vsec, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | pci_find_next_ext_capability > > > vim +239 drivers/pci/controller/dwc/pcie-designware.c > > 5b0841fa653f6c Vidya Sagar 2019-08-13 229 > efaf16de43f599 Shradha Todi 2025-02-21 230 static u16 __dw_pcie_find_vsec_capability(struct dw_pcie *pci, u16 vendor_id, > efaf16de43f599 Shradha Todi 2025-02-21 231 u16 vsec_id) > efaf16de43f599 Shradha Todi 2025-02-21 232 { > efaf16de43f599 Shradha Todi 2025-02-21 233 u16 vsec = 0; > efaf16de43f599 Shradha Todi 2025-02-21 234 u32 header; > efaf16de43f599 Shradha Todi 2025-02-21 235 > efaf16de43f599 Shradha Todi 2025-02-21 236 if (vendor_id != dw_pcie_readw_dbi(pci, PCI_VENDOR_ID)) > efaf16de43f599 Shradha Todi 2025-02-21 237 return 0; > efaf16de43f599 Shradha Todi 2025-02-21 238 > efaf16de43f599 Shradha Todi 2025-02-21 @239 while ((vsec = dw_pcie_find_next_ext_capability(pci, vsec, > efaf16de43f599 Shradha Todi 2025-02-21 240 PCI_EXT_CAP_ID_VNDR))) { > efaf16de43f599 Shradha Todi 2025-02-21 241 header = dw_pcie_readl_dbi(pci, vsec + PCI_VNDR_HEADER); > efaf16de43f599 Shradha Todi 2025-02-21 242 if (PCI_VNDR_HEADER_ID(header) == vsec_id) > efaf16de43f599 Shradha Todi 2025-02-21 243 return vsec; > efaf16de43f599 Shradha Todi 2025-02-21 244 } > efaf16de43f599 Shradha Todi 2025-02-21 245 > efaf16de43f599 Shradha Todi 2025-02-21 246 return 0; > efaf16de43f599 Shradha Todi 2025-02-21 247 } > efaf16de43f599 Shradha Todi 2025-02-21 248 > I'm terribly sorry. The latest 6.15 rc1 merge __dw_pcie_find_vsec_capability, which uses dw_pcie_find_next_ext_capability. This should be replaced with PCI_FIND_NEXT_CAP_TTL. This will be changed in the next version. Best regards, Hans
diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c index 97d76d3dc066..274f1add95b0 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -205,83 +205,25 @@ void dw_pcie_version_detect(struct dw_pcie *pci) pci->type = ver; } -/* - * These interfaces resemble the pci_find_*capability() interfaces, but these - * are for configuring host controllers, which are bridges *to* PCI devices but - * are not PCI devices themselves. - */ -static u8 __dw_pcie_find_next_cap(struct dw_pcie *pci, u8 cap_ptr, - u8 cap) +static int dw_pcie_read_cfg(void *priv, int where, int size, u32 *val) { - u8 cap_id, next_cap_ptr; - u16 reg; - - if (!cap_ptr) - return 0; - - reg = dw_pcie_readw_dbi(pci, cap_ptr); - cap_id = (reg & 0x00ff); - - if (cap_id > PCI_CAP_ID_MAX) - return 0; + struct dw_pcie *pci = priv; - if (cap_id == cap) - return cap_ptr; + *val = dw_pcie_read_dbi(pci, where, size); - next_cap_ptr = (reg & 0xff00) >> 8; - return __dw_pcie_find_next_cap(pci, next_cap_ptr, cap); + return PCIBIOS_SUCCESSFUL; } u8 dw_pcie_find_capability(struct dw_pcie *pci, u8 cap) { - u8 next_cap_ptr; - u16 reg; - - reg = dw_pcie_readw_dbi(pci, PCI_CAPABILITY_LIST); - next_cap_ptr = (reg & 0x00ff); - - return __dw_pcie_find_next_cap(pci, next_cap_ptr, cap); + return PCI_FIND_NEXT_CAP_TTL(dw_pcie_read_cfg, PCI_CAPABILITY_LIST, cap, + pci); } EXPORT_SYMBOL_GPL(dw_pcie_find_capability); -static u16 dw_pcie_find_next_ext_capability(struct dw_pcie *pci, u16 start, - u8 cap) -{ - u32 header; - int ttl; - int pos = PCI_CFG_SPACE_SIZE; - - /* minimum 8 bytes per capability */ - ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8; - - if (start) - pos = start; - - header = dw_pcie_readl_dbi(pci, pos); - /* - * If we have no capabilities, this is indicated by cap ID, - * cap version and next pointer all being 0. - */ - if (header == 0) - return 0; - - while (ttl-- > 0) { - if (PCI_EXT_CAP_ID(header) == cap && pos != start) - return pos; - - pos = PCI_EXT_CAP_NEXT(header); - if (pos < PCI_CFG_SPACE_SIZE) - break; - - header = dw_pcie_readl_dbi(pci, pos); - } - - return 0; -} - u16 dw_pcie_find_ext_capability(struct dw_pcie *pci, u8 cap) { - return dw_pcie_find_next_ext_capability(pci, 0, cap); + return PCI_FIND_NEXT_EXT_CAPABILITY(dw_pcie_read_cfg, 0, cap, pci); } EXPORT_SYMBOL_GPL(dw_pcie_find_ext_capability);
Use the PCI core is now exposing generic macros for the host bridges to search for the PCIe capabilities, make use of them in the DWC driver. Signed-off-by: Hans Zhang <18255117159@163.com> --- Changes since v8: - None Changes since v7: - Resolve compilation errors. Changes since v6: https://lore.kernel.org/linux-pci/20250323164852.430546-3-18255117159@163.com/ - The patch commit message were modified. Changes since v5: https://lore.kernel.org/linux-pci/20250321163803.391056-3-18255117159@163.com/ - Kconfig add "select PCI_HOST_HELPERS" --- drivers/pci/controller/dwc/pcie-designware.c | 72 ++------------------ 1 file changed, 7 insertions(+), 65 deletions(-)