Commit c6d7e134 authored by Ben Widawsky's avatar Ben Widawsky Committed by Dan Williams
Browse files

ocxl: Use pci core's DVSEC functionality 



Reduce maintenance burden of DVSEC query implementation by using the
centralized PCI core implementation.

There are two obvious places to simply drop in the new core
implementation. There remains find_dvsec_from_pos() which would benefit
from using a core implementation. As that change is less trivial it is
reserved for later.

Cc: linuxppc-dev@lists.ozlabs.org
Cc: Andrew Donnellan <ajd@linux.ibm.com>
Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> (v1)
Signed-off-by: default avatarBen Widawsky <ben.widawsky@intel.com>
Reviewed-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Link: https://lore.kernel.org/r/163379789065.692348.7117946955275586530.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 55006a2c

arch/powerpc/platforms/powernv/ocxl.c

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ static int get_max_afu_index(struct pci_dev *dev, int *afu_idx) 
	int pos;

	u32 val;



	pos = find_dvsec_from_pos(dev, OCXL_DVSEC_FUNC_ID, 0);

	pos = pci_find_dvsec_capability(dev, PCI_VENDOR_ID_IBM,

					OCXL_DVSEC_FUNC_ID);

	if (!pos)

		return -ESRCH;

drivers/misc/ocxl/config.c

+1 −12
Original line number Diff line number Diff line
@@ -33,18 +33,7 @@ 


static int find_dvsec(struct pci_dev *dev, int dvsec_id)

{

	int vsec = 0;

	u16 vendor, id;



	while ((vsec = pci_find_next_ext_capability(dev, vsec,

						    OCXL_EXT_CAP_ID_DVSEC))) {

		pci_read_config_word(dev, vsec + OCXL_DVSEC_VENDOR_OFFSET,

				&vendor);

		pci_read_config_word(dev, vsec + OCXL_DVSEC_ID_OFFSET, &id);

		if (vendor == PCI_VENDOR_ID_IBM && id == dvsec_id)

			return vsec;

	}

	return 0;

	return pci_find_dvsec_capability(dev, PCI_VENDOR_ID_IBM, dvsec_id);

}



static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx)