Add SR-IOV support in PCIe Endpoint Core
Subsystems (13)
v8 cover Add SR-IOV support in PCIe Endpoint Core
Patch series
*) Adds support to add virtual functions to enable endpoint controller
which supports SR-IOV capability
*) Add support in Cadence endpoint driver to configure virtual functions *) Enable pci_endpoint_test driver to create pci_device for virtual
functions
v1 of the patch series can be found at [1]
v2 of the patch series can be found at [2]
v3 of the patch series can be found at [3]
v4 of the patch series can be found at [4]
v5 of the patch series can be found at [5]
v6 of the patch series can be found at [6]
v7 of the patch series can be found at [7]
Here both physical functions and virtual functions use the same pci_endpoint_test driver and existing pcitest utility can be used to test virtual functions as well.
Changes from v7:
1) Added conditional operator to consicely write code to configure BAR (Added a new patch to first simplify configuring BAR for physical function)
2) Return error if virtual function number is > 1 for configuring config space header
Changes from v6:
*) Rebased to 5.14-rc4
Changes from v5:
*) Rebased to 5.13-rc1
Changes from v4:
*) Added a fix in Cadence driver which was overwriting BAR configuration
of physical function.
*) Didn't include Tom's Acked-by since Cadence driver is modified in
this revision.
Changes from v3:
*) Fixed Rob's comment and added his Reviewed-by as suggested by him.
Changes from v2:
*) Fixed DT binding documentation comment by Rob
*) Fixed the error check in pci-epc-core.c
Changes from v1:
*) Re-based and Re-worked to latest kernel 5.10.0-rc2+ (now has generic
binding for EP)
[1] -> http://lore.kernel.org/r/[email protected]
[2] -> http://lore.kernel.org/r/[email protected]
[3] -> https://lore.kernel.org/r/[email protected]
[4] -> http://lore.kernel.org/r/[email protected]
[5] -> https://lore.kernel.org/r/[email protected]
[6] -> http://lore.kernel.org/r/[email protected]
[7] -> https://lore.kernel.org/r/[email protected]
Kishon Vijay Abraham I (8):
dt-bindings: PCI: pci-ep: Add binding to specify virtual function
PCI: endpoint: Add support to add virtual function in endpoint core
PCI: endpoint: Add support to link a physical function to a virtual
function
PCI: endpoint: Add virtual function number in pci_epc ops
PCI: cadence: Simplify code to get register base address for
configuring BAR
PCI: cadence: Add support to configure virtual functions
misc: pci_endpoint_test: Populate sriov_configure ops to configure
SR-IOV device
Documentation: PCI: endpoint/pci-endpoint-cfs: Guide to use SR-IOV
.../PCI/endpoint/pci-endpoint-cfs.rst | 12 +- .../devicetree/bindings/pci/pci-ep.yaml | 7 + drivers/misc/pci_endpoint_test.c | 1 + .../pci/controller/cadence/pcie-cadence-ep.c | 194 +++++++++++++----- drivers/pci/controller/cadence/pcie-cadence.h | 11 + .../pci/controller/dwc/pcie-designware-ep.c | 36 ++-- drivers/pci/controller/pcie-rcar-ep.c | 19 +- drivers/pci/controller/pcie-rockchip-ep.c | 18 +- drivers/pci/endpoint/functions/pci-epf-ntb.c | 89 ++++---- drivers/pci/endpoint/functions/pci-epf-test.c | 74 ++++--- drivers/pci/endpoint/pci-ep-cfs.c | 24 +++ drivers/pci/endpoint/pci-epc-core.c | 134 ++++++++---- drivers/pci/endpoint/pci-epf-core.c | 144 ++++++++++++- include/linux/pci-epc.h | 57 ++--- include/linux/pci-epf.h | 16 +- 15 files changed, 611 insertions(+), 225 deletions(-)
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v8 1/8 dt-bindings: PCI: pci-ep: Add binding to specify virtual function
Add binding to specify virtual function (associated with each physical function) in endpoint mode.
--- Documentation/devicetree/bindings/pci/pci-ep.yaml | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/pci/pci-ep.yaml +7 -0
@@ -23,6 +23,13 @@ properties: default: 1 maximum: 255 + max-virtual-functions: + description: Array representing the number of virtual functions corresponding to each physical + function + $ref: /schemas/types.yaml#/definitions/uint8-array + minItems: 1 + maxItems: 255 + max-link-speed: $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 1, 2, 3, 4 ]
Signature · 1 line
2.17.1
PATCH v8 2/8 PCI: endpoint: Add support to add virtual function in endpoint core
In reply to Kishon Vijay Abraham IAdd support to add virtual function in endpoint core. The virtual function can only be associated with a physical function instead of a endpoint controller. Provide APIs to associate a virtual function with a physical function here.
--- drivers/pci/endpoint/pci-epc-core.c | 2 +- drivers/pci/endpoint/pci-epf-core.c | 96 ++++++++++++++++++++++++++++- include/linux/pci-epf.h | 16 ++++- 3 files changed, 111 insertions(+), 3 deletions(-)
drivers/pci/endpoint/pci-epc-core.c +1 -1
@@ -548,7 +548,7 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf,u32 func_no;int ret =0 ; -if (IS_ERR_OR_NULL (epc)) +if (IS_ERR_OR_NULL (epc) || epf->is_vf)return -EINVAL ;if (type ==PRIMARY_INTERFACE && epf->epc)
drivers/pci/endpoint/pci-epf-core.c +95 -1
133 lines not on this page · raw message
include/linux/pci-epf.h +15 -1
@@ -121,8 +121,10 @@ struct pci_epf_bar {* @bar: represents the BAR of EPF device * @msi_interrupts: number of MSI interrupts required by this function * @msix_interrupts: number of MSI-X interrupts required by this function -* @func_no: unique function number within this endpoint device +* @func_no: unique (physical) function number within this endpoint device +* @vfunc_no: unique virtual function number within a physical function * @epc: the EPC device to which this EPF device is bound +* @epf_pf: the physical EPF device to which this virtual EPF device is bound * @driver: the EPF driver to which this EPF device is bound * @list: to add pci_epf as a list of PCI endpoint functions to pci_epc * @nb: notifier block to notify EPF of any EPC events (like linkup)
@@ -133,6 +135,10 @@ struct pci_epf_bar {* @sec_epc_bar: represents the BAR of EPF device associated with secondary EPC * @sec_epc_func_no: unique (physical) function number within the secondary EPC * @group: configfs group associated with the EPF device +* @is_bound: indicates if bind notification to function driver has been invoked +* @is_vf: true - virtual function, false - physical function +* @vfunction_num_map: bitmap to manage virtual function number +* @pci_vepf: list of virtual endpoint functions associated with this function */ struct pci_epf {struct device dev;
@@ -142,8 +148,10 @@ struct pci_epf {u8 msi_interrupts;u16 msix_interrupts;u8 func_no; +u8 vfunc_no;struct pci_epc *epc; +struct pci_epf *epf_pf;struct pci_epf_driver *driver;struct list_head list;struct notifier_block nb;
@@ -156,6 +164,10 @@ struct pci_epf {struct pci_epf_bar sec_epc_bar[6 ];u8 sec_epc_func_no;struct config_group *group; +unsigned int is_bound; +unsigned int is_vf; +unsigned long vfunction_num_map; +struct list_head pci_vepf; };/**
@@ -199,4 +211,6 @@ int pci_epf_bind(struct pci_epf *epf);void pci_epf_unbind (struct pci_epf *epf);struct config_group *pci_epf_type_add_cfs (struct pci_epf *epf,struct config_group *group); +int pci_epf_add_vepf (struct pci_epf *epf_pf,struct pci_epf *epf_vf); +void pci_epf_remove_vepf (struct pci_epf *epf_pf,struct pci_epf *epf_vf);#endif /* __LINUX_PCI_EPF_H */
Signature · 1 line
2.17.1
PATCH v8 3/8 PCI: endpoint: Add support to link a physical function to a virtual function
In reply to Kishon Vijay Abraham IWhile the physical function has to be linked to endpoint controller, the virtual function has to be linked to a physical function. Add support to link a physical function to a virtual function in pci-ep-cfs.
--- drivers/pci/endpoint/pci-ep-cfs.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/pci/endpoint/pci-ep-cfs.c +24 -0
@@ -475,6 +475,28 @@ static struct configfs_attribute *pci_epf_attrs[] = { NULL, }; +static int pci_epf_vepf_link (struct config_item *epf_pf_item, +struct config_item *epf_vf_item) +{ +struct pci_epf_group *epf_vf_group =to_pci_epf_group (epf_vf_item); +struct pci_epf_group *epf_pf_group =to_pci_epf_group (epf_pf_item); +struct pci_epf *epf_pf = epf_pf_group->epf; +struct pci_epf *epf_vf = epf_vf_group->epf; + +return pci_epf_add_vepf (epf_pf, epf_vf); +} + +static void pci_epf_vepf_unlink (struct config_item *epf_pf_item, +struct config_item *epf_vf_item) +{ +struct pci_epf_group *epf_vf_group =to_pci_epf_group (epf_vf_item); +struct pci_epf_group *epf_pf_group =to_pci_epf_group (epf_pf_item); +struct pci_epf *epf_pf = epf_pf_group->epf; +struct pci_epf *epf_vf = epf_vf_group->epf; + +pci_epf_remove_vepf (epf_pf, epf_vf); +} +static void pci_epf_release (struct config_item *item) {struct pci_epf_group *epf_group =to_pci_epf_group (item);
@@ -487,6 +509,8 @@ static void pci_epf_release(struct config_item *item) }static struct configfs_item_operations pci_epf_ops = { + .allow_link = pci_epf_vepf_link, + .drop_link = pci_epf_vepf_unlink, .release = pci_epf_release, };
Signature · 1 line
2.17.1
PATCH v8 4/8 PCI: endpoint: Add virtual function number in pci_epc ops
In reply to Kishon Vijay Abraham IAdd virtual function number in pci_epc ops. EPC controller driver can perform virtual function specific initialization based on the virtual function number.
--- .../pci/controller/cadence/pcie-cadence-ep.c | 44 +++--- .../pci/controller/dwc/pcie-designware-ep.c | 36 ++--- drivers/pci/controller/pcie-rcar-ep.c | 19 +-- drivers/pci/controller/pcie-rockchip-ep.c | 18 +-- drivers/pci/endpoint/functions/pci-epf-ntb.c | 89 +++++++----- drivers/pci/endpoint/functions/pci-epf-test.c | 74 +++++----- drivers/pci/endpoint/pci-epc-core.c | 132 +++++++++++++----- drivers/pci/endpoint/pci-epf-core.c | 48 ++++++- include/linux/pci-epc.h | 57 ++++---- 9 files changed, 328 insertions(+), 189 deletions(-)
drivers/pci/controller/cadence/pcie-cadence-ep.c +23 -21
@@ -16,7 +16,7 @@#define CDNS_PCIE_EP_IRQ_PCI_ADDR_NONE 0x1#define CDNS_PCIE_EP_IRQ_PCI_ADDR_LEGACY 0x3 -static int cdns_pcie_ep_write_header (struct pci_epc *epc,u8 fn, +static int cdns_pcie_ep_write_header (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_header *hdr) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);
@@ -47,7 +47,7 @@ static int cdns_pcie_ep_write_header(struct pci_epc *epc, u8 fn,return 0 ; } -static int cdns_pcie_ep_set_bar (struct pci_epc *epc,u8 fn, +static int cdns_pcie_ep_set_bar (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_bar *epf_bar) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);
@@ -117,7 +117,7 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn,return 0 ; } -static void cdns_pcie_ep_clear_bar (struct pci_epc *epc,u8 fn, +static void cdns_pcie_ep_clear_bar (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_bar *epf_bar) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);
@@ -147,8 +147,8 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, epf->epf_bar[bar] =NULL ; } -static int cdns_pcie_ep_map_addr (struct pci_epc *epc,u8 fn,phys_addr_t addr, -u64 pci_addr,size_t size) +static int cdns_pcie_ep_map_addr (struct pci_epc *epc,u8 fn,u8 vfn, +phys_addr_t addr,u64 pci_addr,size_t size) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);struct cdns_pcie *pcie = &ep->pcie;
@@ -169,7 +169,7 @@ static int cdns_pcie_ep_map_addr(struct pci_epc *epc, u8 fn, phys_addr_t addr,return 0 ; } -static void cdns_pcie_ep_unmap_addr (struct pci_epc *epc,u8 fn, +static void cdns_pcie_ep_unmap_addr (struct pci_epc *epc,u8 fn,u8 vfn,phys_addr_t addr) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);
@@ -189,7 +189,7 @@ static void cdns_pcie_ep_unmap_addr(struct pci_epc *epc, u8 fn,clear_bit (r, &ep->ob_region_map); } -static int cdns_pcie_ep_set_msi (struct pci_epc *epc,u8 fn,u8 mmc) +static int cdns_pcie_ep_set_msi (struct pci_epc *epc,u8 fn,u8 vfn,u8 mmc) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);struct cdns_pcie *pcie = &ep->pcie;
@@ -209,7 +209,7 @@ static int cdns_pcie_ep_set_msi(struct pci_epc *epc, u8 fn, u8 mmc)return 0 ; } -static int cdns_pcie_ep_get_msi (struct pci_epc *epc,u8 fn) +static int cdns_pcie_ep_get_msi (struct pci_epc *epc,u8 fn,u8 vfn) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);struct cdns_pcie *pcie = &ep->pcie;
@@ -230,7 +230,7 @@ static int cdns_pcie_ep_get_msi(struct pci_epc *epc, u8 fn)return mme; } -static int cdns_pcie_ep_get_msix (struct pci_epc *epc,u8 func_no) +static int cdns_pcie_ep_get_msix (struct pci_epc *epc,u8 func_no,u8 vfunc_no) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);struct cdns_pcie *pcie = &ep->pcie;
@@ -247,8 +247,9 @@ static int cdns_pcie_ep_get_msix(struct pci_epc *epc, u8 func_no)return val; } -static int cdns_pcie_ep_set_msix (struct pci_epc *epc,u8 fn,u16 interrupts, -enum pci_barno bir,u32 offset) +static int cdns_pcie_ep_set_msix (struct pci_epc *epc,u8 fn,u8 vfn, +u16 interrupts,enum pci_barno bir, +u32 offset) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc);struct cdns_pcie *pcie = &ep->pcie;
@@ -317,7 +318,8 @@ static void cdns_pcie_ep_assert_intx(struct cdns_pcie_ep *ep, u8 fn,writel (0 , ep->irq_cpu_addr + offset); } -static int cdns_pcie_ep_send_legacy_irq (struct cdns_pcie_ep *ep,u8 fn,u8 intx) +static int cdns_pcie_ep_send_legacy_irq (struct cdns_pcie_ep *ep,u8 fn,u8 vfn, +u8 intx) {u16 cmd;
@@ -334,7 +336,7 @@ static int cdns_pcie_ep_send_legacy_irq(struct cdns_pcie_ep *ep, u8 fn, u8 intx)return 0 ; } -static int cdns_pcie_ep_send_msi_irq (struct cdns_pcie_ep *ep,u8 fn, +static int cdns_pcie_ep_send_msi_irq (struct cdns_pcie_ep *ep,u8 fn,u8 vfn,u8 interrupt_num) {struct cdns_pcie *pcie = &ep->pcie;
@@ -382,7 +384,7 @@ static int cdns_pcie_ep_send_msi_irq(struct cdns_pcie_ep *ep, u8 fn,return 0 ; } -static int cdns_pcie_ep_map_msi_irq (struct pci_epc *epc,u8 fn, +static int cdns_pcie_ep_map_msi_irq (struct pci_epc *epc,u8 fn,u8 vfn,phys_addr_t addr,u8 interrupt_num,u32 entry_size,u32 *msi_data,u32 *msi_addr_offset)
@@ -419,7 +421,7 @@ static int cdns_pcie_ep_map_msi_irq(struct pci_epc *epc, u8 fn, pci_addr &=GENMASK_ULL (63 ,2 );for (i =0 ; i < interrupt_num; i++) { - ret =cdns_pcie_ep_map_addr (epc, fn, addr, + ret =cdns_pcie_ep_map_addr (epc, fn, vfn, addr, pci_addr & ~pci_addr_mask, entry_size);if (ret)
@@ -433,7 +435,7 @@ static int cdns_pcie_ep_map_msi_irq(struct pci_epc *epc, u8 fn,return 0 ; } -static int cdns_pcie_ep_send_msix_irq (struct cdns_pcie_ep *ep,u8 fn, +static int cdns_pcie_ep_send_msix_irq (struct cdns_pcie_ep *ep,u8 fn,u8 vfn,u16 interrupt_num) {u32 cap =CDNS_PCIE_EP_FUNC_MSIX_CAP_OFFSET ;
@@ -478,7 +480,7 @@ static int cdns_pcie_ep_send_msix_irq(struct cdns_pcie_ep *ep, u8 fn,return 0 ; } -static int cdns_pcie_ep_raise_irq (struct pci_epc *epc,u8 fn, +static int cdns_pcie_ep_raise_irq (struct pci_epc *epc,u8 fn,u8 vfn,enum pci_epc_irq_type type,u16 interrupt_num) {
@@ -486,13 +488,13 @@ static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn,switch (type) {case PCI_EPC_IRQ_LEGACY : -return cdns_pcie_ep_send_legacy_irq (ep, fn,0 ); +return cdns_pcie_ep_send_legacy_irq (ep, fn, vfn,0 );case PCI_EPC_IRQ_MSI : -return cdns_pcie_ep_send_msi_irq (ep, fn, interrupt_num); +return cdns_pcie_ep_send_msi_irq (ep, fn, vfn, interrupt_num);case PCI_EPC_IRQ_MSIX : -return cdns_pcie_ep_send_msix_irq (ep, fn, interrupt_num); +return cdns_pcie_ep_send_msix_irq (ep, fn, vfn, interrupt_num);default :break ;
@@ -531,7 +533,7 @@ static const struct pci_epc_features cdns_pcie_epc_features = { };static const struct pci_epc_features * -cdns_pcie_ep_get_features (struct pci_epc *epc,u8 func_no) +cdns_pcie_ep_get_features (struct pci_epc *epc,u8 func_no,u8 vfunc_no) {return &cdns_pcie_epc_features; }
drivers/pci/controller/dwc/pcie-designware-ep.c +18 -18
@@ -125,7 +125,7 @@ static u8 dw_pcie_ep_find_capability(struct dw_pcie_ep *ep, u8 func_no, u8 cap)return __dw_pcie_ep_find_next_cap (ep, func_no, next_cap_ptr, cap); } -static int dw_pcie_ep_write_header (struct pci_epc *epc,u8 func_no, +static int dw_pcie_ep_write_header (struct pci_epc *epc,u8 func_no,u8 vfunc_no,struct pci_epf_header *hdr) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);
@@ -202,7 +202,7 @@ static int dw_pcie_ep_outbound_atu(struct dw_pcie_ep *ep, u8 func_no,return 0 ; } -static void dw_pcie_ep_clear_bar (struct pci_epc *epc,u8 func_no, +static void dw_pcie_ep_clear_bar (struct pci_epc *epc,u8 func_no,u8 vfunc_no,struct pci_epf_bar *epf_bar) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);
@@ -217,7 +217,7 @@ static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no, ep->epf_bar[bar] =NULL ; } -static int dw_pcie_ep_set_bar (struct pci_epc *epc,u8 func_no, +static int dw_pcie_ep_set_bar (struct pci_epc *epc,u8 func_no,u8 vfunc_no,struct pci_epf_bar *epf_bar) {int ret;
@@ -276,7 +276,7 @@ static int dw_pcie_find_index(struct dw_pcie_ep *ep, phys_addr_t addr,return -EINVAL ; } -static void dw_pcie_ep_unmap_addr (struct pci_epc *epc,u8 func_no, +static void dw_pcie_ep_unmap_addr (struct pci_epc *epc,u8 func_no,u8 vfunc_no,phys_addr_t addr) {int ret;
@@ -292,9 +292,8 @@ static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no,clear_bit (atu_index, ep->ob_window_map); } -static int dw_pcie_ep_map_addr (struct pci_epc *epc,u8 func_no, -phys_addr_t addr, -u64 pci_addr,size_t size) +static int dw_pcie_ep_map_addr (struct pci_epc *epc,u8 func_no,u8 vfunc_no, +phys_addr_t addr,u64 pci_addr,size_t size) {int ret;struct dw_pcie_ep *ep =epc_get_drvdata (epc);
@@ -309,7 +308,7 @@ static int dw_pcie_ep_map_addr(struct pci_epc *epc, u8 func_no,return 0 ; } -static int dw_pcie_ep_get_msi (struct pci_epc *epc,u8 func_no) +static int dw_pcie_ep_get_msi (struct pci_epc *epc,u8 func_no,u8 vfunc_no) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep);
@@ -333,7 +332,8 @@ static int dw_pcie_ep_get_msi(struct pci_epc *epc, u8 func_no)return val; } -static int dw_pcie_ep_set_msi (struct pci_epc *epc,u8 func_no,u8 interrupts) +static int dw_pcie_ep_set_msi (struct pci_epc *epc,u8 func_no,u8 vfunc_no, +u8 interrupts) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep);
@@ -358,7 +358,7 @@ static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 func_no, u8 interrupts)return 0 ; } -static int dw_pcie_ep_get_msix (struct pci_epc *epc,u8 func_no) +static int dw_pcie_ep_get_msix (struct pci_epc *epc,u8 func_no,u8 vfunc_no) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep);
@@ -382,8 +382,8 @@ static int dw_pcie_ep_get_msix(struct pci_epc *epc, u8 func_no)return val; } -static int dw_pcie_ep_set_msix (struct pci_epc *epc,u8 func_no,u16 interrupts, -enum pci_barno bir,u32 offset) +static int dw_pcie_ep_set_msix (struct pci_epc *epc,u8 func_no,u8 vfunc_no, +u16 interrupts,enum pci_barno bir,u32 offset) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep);
@@ -418,7 +418,7 @@ static int dw_pcie_ep_set_msix(struct pci_epc *epc, u8 func_no, u16 interrupts,return 0 ; } -static int dw_pcie_ep_raise_irq (struct pci_epc *epc,u8 func_no, +static int dw_pcie_ep_raise_irq (struct pci_epc *epc,u8 func_no,u8 vfunc_no,enum pci_epc_irq_type type,u16 interrupt_num) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);
@@ -450,7 +450,7 @@ static int dw_pcie_ep_start(struct pci_epc *epc) }static const struct pci_epc_features * -dw_pcie_ep_get_features (struct pci_epc *epc,u8 func_no) +dw_pcie_ep_get_features (struct pci_epc *epc,u8 func_no,u8 vfunc_no) {struct dw_pcie_ep *ep =epc_get_drvdata (epc);
@@ -525,14 +525,14 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no, aligned_offset = msg_addr_lower & (epc->mem->window.page_size -1 ); msg_addr = ((u64 )msg_addr_upper) <<32 | (msg_addr_lower & ~aligned_offset); - ret =dw_pcie_ep_map_addr (epc, func_no, ep->msi_mem_phys, msg_addr, + ret =dw_pcie_ep_map_addr (epc, func_no,0 , ep->msi_mem_phys, msg_addr, epc->mem->window.page_size);if (ret)return ret;writel (msg_data | (interrupt_num -1 ), ep->msi_mem + aligned_offset); -dw_pcie_ep_unmap_addr (epc, func_no, ep->msi_mem_phys); +dw_pcie_ep_unmap_addr (epc, func_no,0 , ep->msi_mem_phys);return 0 ; }
@@ -593,14 +593,14 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no, } aligned_offset = msg_addr & (epc->mem->window.page_size -1 ); - ret =dw_pcie_ep_map_addr (epc, func_no, ep->msi_mem_phys, msg_addr, + ret =dw_pcie_ep_map_addr (epc, func_no,0 , ep->msi_mem_phys, msg_addr, epc->mem->window.page_size);if (ret)return ret;writel (msg_data, ep->msi_mem + aligned_offset); -dw_pcie_ep_unmap_addr (epc, func_no, ep->msi_mem_phys); +dw_pcie_ep_unmap_addr (epc, func_no,0 , ep->msi_mem_phys);return 0 ; }
drivers/pci/controller/pcie-rcar-ep.c +10 -9
@@ -159,7 +159,7 @@ static int rcar_pcie_ep_get_pdata(struct rcar_pcie_endpoint *ep,return 0 ; } -static int rcar_pcie_ep_write_header (struct pci_epc *epc,u8 fn, +static int rcar_pcie_ep_write_header (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_header *hdr) {struct rcar_pcie_endpoint *ep =epc_get_drvdata (epc);
@@ -195,7 +195,7 @@ static int rcar_pcie_ep_write_header(struct pci_epc *epc, u8 fn,return 0 ; } -static int rcar_pcie_ep_set_bar (struct pci_epc *epc,u8 func_no, +static int rcar_pcie_ep_set_bar (struct pci_epc *epc,u8 func_no,u8 vfunc_no,struct pci_epf_bar *epf_bar) {int flags = epf_bar->flags |LAR_ENABLE |LAM_64BIT ;
@@ -246,7 +246,7 @@ static int rcar_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no,return 0 ; } -static void rcar_pcie_ep_clear_bar (struct pci_epc *epc,u8 fn, +static void rcar_pcie_ep_clear_bar (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_bar *epf_bar) {struct rcar_pcie_endpoint *ep =epc_get_drvdata (epc);
@@ -259,7 +259,8 @@ static void rcar_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn,clear_bit (atu_index +1 , ep->ib_window_map); } -static int rcar_pcie_ep_set_msi (struct pci_epc *epc,u8 fn,u8 interrupts) +static int rcar_pcie_ep_set_msi (struct pci_epc *epc,u8 fn,u8 vfn, +u8 interrupts) {struct rcar_pcie_endpoint *ep =epc_get_drvdata (epc);struct rcar_pcie *pcie = &ep->pcie;
@@ -272,7 +273,7 @@ static int rcar_pcie_ep_set_msi(struct pci_epc *epc, u8 fn, u8 interrupts)return 0 ; } -static int rcar_pcie_ep_get_msi (struct pci_epc *epc,u8 fn) +static int rcar_pcie_ep_get_msi (struct pci_epc *epc,u8 fn,u8 vfn) {struct rcar_pcie_endpoint *ep =epc_get_drvdata (epc);struct rcar_pcie *pcie = &ep->pcie;
@@ -285,7 +286,7 @@ static int rcar_pcie_ep_get_msi(struct pci_epc *epc, u8 fn)return ((flags &MSICAP0_MMESE_MASK ) >>MSICAP0_MMESE_OFFSET ); } -static int rcar_pcie_ep_map_addr (struct pci_epc *epc,u8 fn, +static int rcar_pcie_ep_map_addr (struct pci_epc *epc,u8 fn,u8 vfn,phys_addr_t addr,u64 pci_addr,size_t size) {struct rcar_pcie_endpoint *ep =epc_get_drvdata (epc);
@@ -322,7 +323,7 @@ static int rcar_pcie_ep_map_addr(struct pci_epc *epc, u8 fn,return 0 ; } -static void rcar_pcie_ep_unmap_addr (struct pci_epc *epc,u8 fn, +static void rcar_pcie_ep_unmap_addr (struct pci_epc *epc,u8 fn,u8 vfn,phys_addr_t addr) {struct rcar_pcie_endpoint *ep =epc_get_drvdata (epc);
@@ -403,7 +404,7 @@ static int rcar_pcie_ep_assert_msi(struct rcar_pcie *pcie,return 0 ; } -static int rcar_pcie_ep_raise_irq (struct pci_epc *epc,u8 fn, +static int rcar_pcie_ep_raise_irq (struct pci_epc *epc,u8 fn,u8 vfn,enum pci_epc_irq_type type,u16 interrupt_num) {
@@ -451,7 +452,7 @@ static const struct pci_epc_features rcar_pcie_epc_features = { };static const struct pci_epc_features * -rcar_pcie_ep_get_features (struct pci_epc *epc,u8 func_no) +rcar_pcie_ep_get_features (struct pci_epc *epc,u8 func_no,u8 vfunc_no) {return &rcar_pcie_epc_features; }
drivers/pci/controller/pcie-rockchip-ep.c +9 -9
@@ -122,7 +122,7 @@ static void rockchip_pcie_prog_ep_ob_atu(struct rockchip_pcie *rockchip, u8 fn, ROCKCHIP_PCIE_AT_OB_REGION_CPU_ADDR1(r)); } -static int rockchip_pcie_ep_write_header (struct pci_epc *epc,u8 fn, +static int rockchip_pcie_ep_write_header (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_header *hdr) {struct rockchip_pcie_ep *ep =epc_get_drvdata (epc);
@@ -159,7 +159,7 @@ static int rockchip_pcie_ep_write_header(struct pci_epc *epc, u8 fn,return 0 ; } -static int rockchip_pcie_ep_set_bar (struct pci_epc *epc,u8 fn, +static int rockchip_pcie_ep_set_bar (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_bar *epf_bar) {struct rockchip_pcie_ep *ep =epc_get_drvdata (epc);
@@ -227,7 +227,7 @@ static int rockchip_pcie_ep_set_bar(struct pci_epc *epc, u8 fn,return 0 ; } -static void rockchip_pcie_ep_clear_bar (struct pci_epc *epc,u8 fn, +static void rockchip_pcie_ep_clear_bar (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_bar *epf_bar) {struct rockchip_pcie_ep *ep =epc_get_drvdata (epc);
@@ -256,7 +256,7 @@ static void rockchip_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, ROCKCHIP_PCIE_AT_IB_EP_FUNC_BAR_ADDR1(fn, bar)); } -static int rockchip_pcie_ep_map_addr (struct pci_epc *epc,u8 fn, +static int rockchip_pcie_ep_map_addr (struct pci_epc *epc,u8 fn,u8 vfn,phys_addr_t addr,u64 pci_addr,size_t size) {
@@ -284,7 +284,7 @@ static int rockchip_pcie_ep_map_addr(struct pci_epc *epc, u8 fn,return 0 ; } -static void rockchip_pcie_ep_unmap_addr (struct pci_epc *epc,u8 fn, +static void rockchip_pcie_ep_unmap_addr (struct pci_epc *epc,u8 fn,u8 vfn,phys_addr_t addr) {struct rockchip_pcie_ep *ep =epc_get_drvdata (epc);
@@ -308,7 +308,7 @@ static void rockchip_pcie_ep_unmap_addr(struct pci_epc *epc, u8 fn,clear_bit (r, &ep->ob_region_map); } -static int rockchip_pcie_ep_set_msi (struct pci_epc *epc,u8 fn, +static int rockchip_pcie_ep_set_msi (struct pci_epc *epc,u8 fn,u8 vfn,u8 multi_msg_cap) {struct rockchip_pcie_ep *ep =epc_get_drvdata (epc);
@@ -329,7 +329,7 @@ static int rockchip_pcie_ep_set_msi(struct pci_epc *epc, u8 fn,return 0 ; } -static int rockchip_pcie_ep_get_msi (struct pci_epc *epc,u8 fn) +static int rockchip_pcie_ep_get_msi (struct pci_epc *epc,u8 fn,u8 vfn) {struct rockchip_pcie_ep *ep =epc_get_drvdata (epc);struct rockchip_pcie *rockchip = &ep->rockchip;
@@ -471,7 +471,7 @@ static int rockchip_pcie_ep_send_msi_irq(struct rockchip_pcie_ep *ep, u8 fn,return 0 ; } -static int rockchip_pcie_ep_raise_irq (struct pci_epc *epc,u8 fn, +static int rockchip_pcie_ep_raise_irq (struct pci_epc *epc,u8 fn,u8 vfn,enum pci_epc_irq_type type,u16 interrupt_num) {
@@ -510,7 +510,7 @@ static const struct pci_epc_features rockchip_pcie_epc_features = { };static const struct pci_epc_features * -rockchip_pcie_ep_get_features (struct pci_epc *epc,u8 func_no) +rockchip_pcie_ep_get_features (struct pci_epc *epc,u8 func_no,u8 vfunc_no) {return &rockchip_pcie_epc_features; }
drivers/pci/endpoint/functions/pci-epf-ntb.c +54 -35
363 lines not on this page · raw message
drivers/pci/endpoint/functions/pci-epf-test.c +42 -32
194 lines not on this page · raw message
drivers/pci/endpoint/pci-epc-core.c +94 -38
382 lines not on this page · raw message
drivers/pci/endpoint/pci-epf-core.c +47 -1
65 lines not on this page · raw message
include/linux/pci-epc.h +31 -26
105 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v8 5/8 PCI: cadence: Simplify code to get register base address for configuring BAR
In reply to Kishon Vijay Abraham INo functional change. Simplify code to get register base address for configuring PCI BAR.
--- .../pci/controller/cadence/pcie-cadence-ep.c | 18 ++++-------------- drivers/pci/controller/cadence/pcie-cadence.h | 2 ++ 2 files changed, 6 insertions(+), 14 deletions(-)
drivers/pci/controller/cadence/pcie-cadence-ep.c +4 -14
@@ -97,13 +97,8 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn,cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), addr1); -if (bar <BAR_4 ) { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG0 (fn); - b = bar; - }else { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG1 (fn); - b = bar -BAR_4 ; - } + reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); + b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; cfg =cdns_pcie_readl (pcie, reg); cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK(b) |
@@ -126,13 +121,8 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn,enum pci_barno bar = epf_bar->barno;u32 reg, cfg, b, ctrl; -if (bar <BAR_4 ) { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG0 (fn); - b = bar; - }else { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG1 (fn); - b = bar -BAR_4 ; - } + reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); + b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; cfg =cdns_pcie_readl (pcie, reg);
drivers/pci/controller/cadence/pcie-cadence.h +2 -0
@@ -46,6 +46,8 @@#define CDNS_PCIE_LM_EP_ID_BUS_SHIFT 8/* Endpoint Function f BAR b Configuration Registers */ +#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn) \ + (((bar) < 4) ? CDNS_PCIE_LM_EP_FUNC_BAR_CFG0(fn) : CDNS_PCIE_LM_EP_FUNC_BAR_CFG1(fn))#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG0 (fn) \ (CDNS_PCIE_LM_BASE + 0x0240 + (fn) * 0x0008)#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG1 (fn) \
Signature · 1 line
2.17.1
Re: [PATCH v8 5/8] PCI: cadence: Simplify code to get register base address for configuring BAR
Quoted 50 lines · Kishon Vijay Abraham I
No functional change. Simplify code to get register base address for configuring PCI BAR.
Signed-off-by Kishon Vijay Abraham I <[email protected]>--- .../pci/controller/cadence/pcie-cadence-ep.c | 18 ++++-------------- drivers/pci/controller/cadence/pcie-cadence.h | 2 ++ 2 files changed, 6 insertions(+), 14 deletions(-)drivers/pci/controller/cadence/pcie-cadence-ep.c +4
-14@@ -97,13 +97,8 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn,cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), addr1); -if (bar <BAR_4 ) { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG0 (fn); - b = bar; - }else { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG1 (fn); - b = bar -BAR_4 ; - } + reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); + b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; cfg =cdns_pcie_readl (pcie, reg); cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK(b) |@@ -126,13 +121,8 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn,enum pci_barno bar = epf_bar->barno;u32 reg, cfg, b, ctrl; -if (bar <BAR_4 ) { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG0 (fn); - b = bar; - }else { - reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG1 (fn); - b = bar -BAR_4 ; - } + reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); + b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; cfg =cdns_pcie_readl (pcie, reg);drivers/pci/controller/cadence/pcie-cadence.h +0
-0
drivers/pci/controller/cadence/pcie-cadence.h line 50
Quoted 5 lines
drivers/pci/controller/cadence/pcie-cadence.h +2
-0@@ -46,6 +46,8 @@#define CDNS_PCIE_LM_EP_ID_BUS_SHIFT 8/* Endpoint Function f BAR b Configuration Registers */ +#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn) \ + (((bar) < 4) ? CDNS_PCIE_LM_EP_FUNC_BAR_CFG0(fn) : CDNS_PCIE_LM_EP_FUNC_BAR_CFG1(fn))
Why do we use "BAR_4" above and "4" here? Shouldn't they look the same?
Quoted 6 lines
drivers/pci/controller/cadence/pcie-cadence.h +0
-0#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG0 (fn) \ (CDNS_PCIE_LM_BASE + 0x0240 + (fn) * 0x0008)#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG1 (fn) \Signature · 1 line
2.17.1
PATCH v8 6/8 PCI: cadence: Add support to configure virtual functions
In reply to Kishon Vijay Abraham INow that support for SR-IOV is added in PCIe endpoint core, add support to configure virtual functions in the Cadence PCIe EP driver.
--- .../pci/controller/cadence/pcie-cadence-ep.c | 136 +++++++++++++++--- drivers/pci/controller/cadence/pcie-cadence.h | 9 ++ 2 files changed, 125 insertions(+), 20 deletions(-)
drivers/pci/controller/cadence/pcie-cadence-ep.c +116 -20
@@ -16,11 +16,37 @@#define CDNS_PCIE_EP_IRQ_PCI_ADDR_NONE 0x1#define CDNS_PCIE_EP_IRQ_PCI_ADDR_LEGACY 0x3 +static u8 cdns_pcie_get_fn_from_vfn (struct cdns_pcie *pcie,u8 fn,u8 vfn) +{ +u32 cap =CDNS_PCIE_EP_FUNC_SRIOV_CAP_OFFSET ; +u32 first_vf_offset, stride; + +if (vfn ==0 ) +return fn; + + first_vf_offset =cdns_pcie_ep_fn_readw (pcie, fn, cap +PCI_SRIOV_VF_OFFSET ); + stride =cdns_pcie_ep_fn_readw (pcie, fn, cap +PCI_SRIOV_VF_STRIDE ); + fn = fn + first_vf_offset + ((vfn -1 ) * stride); + +return fn; +} +static int cdns_pcie_ep_write_header (struct pci_epc *epc,u8 fn,u8 vfn,struct pci_epf_header *hdr) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc); +u32 cap =CDNS_PCIE_EP_FUNC_SRIOV_CAP_OFFSET ;struct cdns_pcie *pcie = &ep->pcie; +u32 reg; + +if (vfn >1 ) { +dev_err (&epc->dev,"Only Virtual Function #1 has deviceID\n" ); +return -EINVAL ; + }else if (vfn ==1 ) { + reg = cap +PCI_SRIOV_VF_DID ; +cdns_pcie_ep_fn_writew (pcie, fn, reg, hdr->deviceid); +return 0 ; + }cdns_pcie_ep_fn_writew (pcie, fn,PCI_DEVICE_ID , hdr->deviceid);cdns_pcie_ep_fn_writeb (pcie, fn,PCI_REVISION_ID , hdr->revid);
@@ -92,21 +118,29 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, addr0 =lower_32_bits (bar_phys); addr1 =upper_32_bits (bar_phys); -cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0 (fn, bar), - addr0); -cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), - addr1); reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); +if (vfn ==1 ) + reg =CDNS_PCIE_LM_EP_VFUNC_BAR_CFG (bar, fn); b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; - cfg =cdns_pcie_readl (pcie, reg); - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); - cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE (b, aperture) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl)); -cdns_pcie_writel (pcie, reg, cfg); +if (vfn ==0 || vfn ==1 ) { + cfg =cdns_pcie_readl (pcie, reg); + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); + cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE (b, aperture) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl)); +cdns_pcie_writel (pcie, reg, cfg); + } + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0 (fn, bar), + addr0); +cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), + addr1); + +if (vfn >0 ) + epf = &epf->epf[vfn -1 ]; epf->epf_bar[bar] = epf_bar;return 0 ;
@@ -122,18 +156,25 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn,u32 reg, cfg, b, ctrl; reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); +if (vfn ==1 ) + reg =CDNS_PCIE_LM_EP_VFUNC_BAR_CFG (bar, fn); b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; - ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; - cfg =cdns_pcie_readl (pcie, reg); - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); - cfg |=CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl); -cdns_pcie_writel (pcie, reg, cfg); +if (vfn ==0 || vfn ==1 ) { + ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; + cfg =cdns_pcie_readl (pcie, reg); + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); + cfg |=CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl); +cdns_pcie_writel (pcie, reg, cfg); + } + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn);cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0 (fn, bar),0 );cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar),0 ); +if (vfn >0 ) + epf = &epf->epf[vfn -1 ]; epf->epf_bar[bar] =NULL ; }
@@ -151,6 +192,7 @@ static int cdns_pcie_ep_map_addr(struct pci_epc *epc, u8 fn, u8 vfn,return -EINVAL ; } + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn);cdns_pcie_set_outbound_region (pcie,0 , fn, r, false, addr, pci_addr, size);set_bit (r, &ep->ob_region_map);
@@ -186,6 +228,8 @@ static int cdns_pcie_ep_set_msi(struct pci_epc *epc, u8 fn, u8 vfn, u8 mmc)u32 cap =CDNS_PCIE_EP_FUNC_MSI_CAP_OFFSET ;u16 flags; + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +/* * Set the Multiple Message Capable bitfield into the Message Control * register.
@@ -206,6 +250,8 @@ static int cdns_pcie_ep_get_msi(struct pci_epc *epc, u8 fn, u8 vfn)u32 cap =CDNS_PCIE_EP_FUNC_MSI_CAP_OFFSET ;u16 flags, mme; + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +/* Validate that the MSI feature is actually enabled. */ flags =cdns_pcie_ep_fn_readw (pcie, fn, cap +PCI_MSI_FLAGS );if (!(flags &PCI_MSI_FLAGS_ENABLE ))
@@ -227,6 +273,8 @@ static int cdns_pcie_ep_get_msix(struct pci_epc *epc, u8 func_no, u8 vfunc_no)u32 cap =CDNS_PCIE_EP_FUNC_MSIX_CAP_OFFSET ;u32 val, reg; + func_no =cdns_pcie_get_fn_from_vfn (pcie, func_no, vfunc_no); + reg = cap +PCI_MSIX_FLAGS ; val =cdns_pcie_ep_fn_readw (pcie, func_no, reg);if (!(val &PCI_MSIX_FLAGS_ENABLE ))
@@ -246,6 +294,8 @@ static int cdns_pcie_ep_set_msix(struct pci_epc *epc, u8 fn, u8 vfn,u32 cap =CDNS_PCIE_EP_FUNC_MSIX_CAP_OFFSET ;u32 val, reg; + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); + reg = cap +PCI_MSIX_FLAGS ; val =cdns_pcie_ep_fn_readw (pcie, fn, reg); val &= ~PCI_MSIX_FLAGS_QSIZE ;
@@ -265,8 +315,8 @@ static int cdns_pcie_ep_set_msix(struct pci_epc *epc, u8 fn, u8 vfn,return 0 ; } -static void cdns_pcie_ep_assert_intx (struct cdns_pcie_ep *ep,u8 fn, -u8 intx,bool is_asserted) +static void cdns_pcie_ep_assert_intx (struct cdns_pcie_ep *ep,u8 fn,u8 intx, +bool is_asserted) {struct cdns_pcie *pcie = &ep->pcie;unsigned long flags;
@@ -335,6 +385,8 @@ static int cdns_pcie_ep_send_msi_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn,u8 msi_count;u64 pci_addr, pci_addr_mask =0xff ; + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +/* Check whether the MSI feature has been enabled by the PCI host. */ flags =cdns_pcie_ep_fn_readw (pcie, fn, cap +PCI_MSI_FLAGS );if (!(flags &PCI_MSI_FLAGS_ENABLE ))
@@ -388,6 +440,8 @@ static int cdns_pcie_ep_map_msi_irq(struct pci_epc *epc, u8 fn, u8 vfn,int ret;int i; + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +/* Check whether the MSI feature has been enabled by the PCI host. */ flags =cdns_pcie_ep_fn_readw (pcie, fn, cap +PCI_MSI_FLAGS );if (!(flags &PCI_MSI_FLAGS_ENABLE ))
@@ -438,6 +492,12 @@ static int cdns_pcie_ep_send_msix_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn,u16 flags;u8 bir; + epf = &ep->epf[fn]; +if (vfn >0 ) + epf = &epf->epf[vfn -1 ]; + + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +/* Check whether the MSI-X feature has been enabled by the PCI host. */ flags =cdns_pcie_ep_fn_readw (pcie, fn, cap +PCI_MSIX_FLAGS );if (!(flags &PCI_MSIX_FLAGS_ENABLE ))
@@ -448,7 +508,6 @@ static int cdns_pcie_ep_send_msix_irq(struct cdns_pcie_ep *ep, u8 fn, u8 vfn, bir = tbl_offset &PCI_MSIX_TABLE_BIR ; tbl_offset &=PCI_MSIX_TABLE_OFFSET ; - epf = &ep->epf[fn]; msix_tbl = epf->epf_bar[bir]->addr + tbl_offset; msg_addr = msix_tbl[(interrupt_num -1 )].msg_addr; msg_data = msix_tbl[(interrupt_num -1 )].msg_data;
@@ -475,9 +534,15 @@ static int cdns_pcie_ep_raise_irq(struct pci_epc *epc, u8 fn, u8 vfn, u16 interrupt_num) {struct cdns_pcie_ep *ep =epc_get_drvdata (epc); +struct cdns_pcie *pcie = &ep->pcie; +struct device *dev = pcie->dev;switch (type) {case PCI_EPC_IRQ_LEGACY : +if (vfn >0 ) { +dev_err (dev,"Cannot raise legacy interrupts for VF\n" ); +return -EINVAL ; + }return cdns_pcie_ep_send_legacy_irq (ep, fn, vfn,0 );case PCI_EPC_IRQ_MSI :
@@ -515,6 +580,13 @@ static int cdns_pcie_ep_start(struct pci_epc *epc)return 0 ; } +static const struct pci_epc_features cdns_pcie_epc_vf_features = { + .linkup_notifier = false, + .msi_capable = true, + .msix_capable = true, + .align =65536 , +}; +static const struct pci_epc_features cdns_pcie_epc_features = { .linkup_notifier = false, .msi_capable = true,
@@ -525,7 +597,10 @@ static const struct pci_epc_features cdns_pcie_epc_features = {static const struct pci_epc_features *cdns_pcie_ep_get_features (struct pci_epc *epc,u8 func_no,u8 vfunc_no) { -return &cdns_pcie_epc_features; +if (!vfunc_no) +return &cdns_pcie_epc_features; + +return &cdns_pcie_epc_vf_features; }static const struct pci_epc_ops cdns_pcie_epc_ops = {
@@ -551,9 +626,11 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep)struct platform_device *pdev =to_platform_device (dev);struct device_node *np = dev->of_node;struct cdns_pcie *pcie = &ep->pcie; +struct cdns_pcie_epf *epf;struct resource *res;struct pci_epc *epc;int ret; +int i; pcie->is_rc = false;
@@ -598,6 +675,25 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep)if (!ep->epf)return -ENOMEM ; + epc->max_vfs =devm_kcalloc (dev, epc->max_functions, +sizeof (*epc->max_vfs),GFP_KERNEL ); +if (!epc->max_vfs) +return -ENOMEM ; + + ret =of_property_read_u8_array (np,"max-virtual-functions" , + epc->max_vfs, epc->max_functions); +if (ret ==0 ) { +for (i =0 ; i < epc->max_functions; i++) { + epf = &ep->epf[i]; +if (epc->max_vfs[i] ==0 ) +continue ; + epf->epf =devm_kcalloc (dev, epc->max_vfs[i], +sizeof (*ep->epf),GFP_KERNEL ); +if (!epf->epf) +return -ENOMEM ; + } + } + ret =pci_epc_mem_init (epc, pcie->mem_res->start,resource_size (pcie->mem_res),PAGE_SIZE );if (ret <0 ) {
drivers/pci/controller/cadence/pcie-cadence.h +9 -0
@@ -52,6 +52,12 @@ (CDNS_PCIE_LM_BASE + 0x0240 + (fn) * 0x0008)#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG1 (fn) \ (CDNS_PCIE_LM_BASE + 0x0244 + (fn) * 0x0008) +#define CDNS_PCIE_LM_EP_VFUNC_BAR_CFG (bar, fn) \ + (((bar) < 4) ? CDNS_PCIE_LM_EP_VFUNC_BAR_CFG0(fn) : CDNS_PCIE_LM_EP_VFUNC_BAR_CFG1(fn)) +#define CDNS_PCIE_LM_EP_VFUNC_BAR_CFG0 (fn) \ + (CDNS_PCIE_LM_BASE + 0x0280 + (fn) * 0x0008) +#define CDNS_PCIE_LM_EP_VFUNC_BAR_CFG1 (fn) \ + (CDNS_PCIE_LM_BASE + 0x0284 + (fn) * 0x0008)#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) \ (GENMASK(4, 0) << ((b) * 8))#define CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE (b, a) \
@@ -116,6 +122,7 @@#define CDNS_PCIE_EP_FUNC_MSI_CAP_OFFSET 0x90#define CDNS_PCIE_EP_FUNC_MSIX_CAP_OFFSET 0xb0 +#define CDNS_PCIE_EP_FUNC_SRIOV_CAP_OFFSET 0x200/* * Root Port Registers (PCI configuration space for the root port function)
@@ -310,9 +317,11 @@ struct cdns_pcie_rc {/** * struct cdns_pcie_epf - Structure to hold info about endpoint function +* @epf: Info about virtual functions attached to the physical function * @epf_bar: reference to the pci_epf_bar for the six Base Address Registers */ struct cdns_pcie_epf { +struct cdns_pcie_epf *epf;struct pci_epf_bar *epf_bar[PCI_STD_NUM_BARS ]; };
Signature · 1 line
2.17.1
Re: [PATCH v8 6/8] PCI: cadence: Add support to configure virtual functions
Quoted 11 lines · Kishon Vijay Abraham I
Now that support for SR-IOV is added in PCIe endpoint core, add support to configure virtual functions in the Cadence PCIe EP driver.
Signed-off-by Kishon Vijay Abraham I <[email protected]>--- .../pci/controller/cadence/pcie-cadence-ep.c | 136 +++++++++++++++--- drivers/pci/controller/cadence/pcie-cadence.h | 9 ++ 2 files changed, 125 insertions(+), 20 deletions(-)drivers/pci/controller/cadence/pcie-cadence-ep.c +0
-0@@ -92,21 +118,29 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn,
drivers/pci/controller/cadence/pcie-cadence-ep.c static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, · line 124
Quoted 10 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +2
-4addr0 =lower_32_bits (bar_phys); addr1 =upper_32_bits (bar_phys); -cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0 (fn, bar), - addr0); -cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), - addr1); reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); +if (vfn ==1 ) + reg =CDNS_PCIE_LM_EP_VFUNC_BAR_CFG (bar, fn);
Seems sort of weird to compute "reg", then sometimes overwrite it, as opposed to:
if (vfn == 1)
reg = CDNS_PCIE_LM_EP_VFUNC_BAR_CFG(bar, fn);
else
reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn);Also slightly weird that "vfn" is basically used as a boolean, but it's actually a u8 virtual function number. I guess VF 1 is special and not like the other VFs?
Quoted 29 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +16
-6b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; - cfg =cdns_pcie_readl (pcie, reg); - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); - cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE (b, aperture) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl)); -cdns_pcie_writel (pcie, reg, cfg); +if (vfn ==0 || vfn ==1 ) { + cfg =cdns_pcie_readl (pcie, reg); + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); + cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE (b, aperture) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl)); +cdns_pcie_writel (pcie, reg, cfg); + } + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0 (fn, bar), + addr0); +cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), + addr1); + +if (vfn >0 ) + epf = &epf->epf[vfn -1 ]; epf->epf_bar[bar] = epf_bar;return 0 ;
drivers/pci/controller/cadence/pcie-cadence-ep.c static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn, · line 160
Quoted 5 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +2
-0@@ -122,18 +156,25 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn,u32 reg, cfg, b, ctrl; reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); +if (vfn ==1 ) + reg =CDNS_PCIE_LM_EP_VFUNC_BAR_CFG (bar, fn);
Similar recomputation of "reg".
Quoted 16 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +8
-6b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; - ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; - cfg =cdns_pcie_readl (pcie, reg); - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); - cfg |=CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl); -cdns_pcie_writel (pcie, reg, cfg); +if (vfn ==0 || vfn ==1 ) { + ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; + cfg =cdns_pcie_readl (pcie, reg); + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); + cfg |=CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl); +cdns_pcie_writel (pcie, reg, cfg); + }
Re: [PATCH v8 6/8] PCI: cadence: Add support to configure virtual functions
Hi Bjorn,
Quoted 26 lines · Bjorn Helgaas
Quoted 11 lines · Kishon Vijay Abraham I
Now that support for SR-IOV is added in PCIe endpoint core, add support to configure virtual functions in the Cadence PCIe EP driver.
Signed-off-by Kishon Vijay Abraham I <[email protected]>--- .../pci/controller/cadence/pcie-cadence-ep.c | 136 +++++++++++++++--- drivers/pci/controller/cadence/pcie-cadence.h | 9 ++ 2 files changed, 125 insertions(+), 20 deletions(-)drivers/pci/controller/cadence/pcie-cadence-ep.c +0
-0@@ -92,21 +118,29 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn,drivers/pci/controller/cadence/pcie-cadence-ep.c static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, · line 124
Quoted 10 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +2
-4addr0 =lower_32_bits (bar_phys); addr1 =upper_32_bits (bar_phys); -cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0 (fn, bar), - addr0); -cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), - addr1); reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); +if (vfn ==1 ) + reg =CDNS_PCIE_LM_EP_VFUNC_BAR_CFG (bar, fn);Seems sort of weird to compute "reg", then sometimes overwrite it, as opposed to:
Quoted 4 lines
if (vfn == 1)
reg = CDNS_PCIE_LM_EP_VFUNC_BAR_CFG(bar, fn);
else
reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn);I tried to write it without "else". But I can change it back.
Quoted 4 lines
Also slightly weird that "vfn" is basically used as a boolean, but it's actually a u8 virtual function number. I guess VF 1 is special and not like the other VFs?
VF1 is special in that it's enough for configuring the SR-IOV capability but below the "vfn" is used for configuring inbound window.
Thanks
Kishon
Quoted 40 lines
Quoted 30 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +16
-6b = (bar <BAR_4 ) ? bar : bar -BAR_4 ; - cfg =cdns_pcie_readl (pcie, reg); - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); - cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE (b, aperture) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl)); -cdns_pcie_writel (pcie, reg, cfg); +if (vfn ==0 || vfn ==1 ) { + cfg =cdns_pcie_readl (pcie, reg); + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); + cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE (b, aperture) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl)); +cdns_pcie_writel (pcie, reg, cfg); + } + fn =cdns_pcie_get_fn_from_vfn (pcie, fn, vfn); +cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0 (fn, bar), + addr0); +cdns_pcie_writel (pcie,CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1 (fn, bar), + addr1); + +if (vfn >0 ) + epf = &epf->epf[vfn -1 ]; epf->epf_bar[bar] = epf_bar;return 0 ;drivers/pci/controller/cadence/pcie-cadence-ep.c static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn, · line 160
Quoted 5 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +2
-0@@ -122,18 +156,25 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn,u32 reg, cfg, b, ctrl; reg =CDNS_PCIE_LM_EP_FUNC_BAR_CFG (bar, fn); +if (vfn ==1 ) + reg =CDNS_PCIE_LM_EP_VFUNC_BAR_CFG (bar, fn);Similar recomputation of "reg".
Quoted 2 lines
(quoted diff) +0
-0b = (bar < BAR_4) ? bar : bar - BAR_4;
Quoted 14 lines
Quoted 4 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +0
-4- ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; - cfg =cdns_pcie_readl (pcie, reg); - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | -CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b));drivers/pci/controller/cadence/pcie-cadence-ep.c static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn, · line 170
Quoted 10 lines
drivers/pci/controller/cadence/pcie-cadence-ep.c +8
-2- cfg |=CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl); -cdns_pcie_writel (pcie, reg, cfg); +if (vfn ==0 || vfn ==1 ) { + ctrl =CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED ; + cfg =cdns_pcie_readl (pcie, reg); + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK (b) | +CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK (b)); + cfg |=CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL (b, ctrl); +cdns_pcie_writel (pcie, reg, cfg); + }
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v8 7/8 misc: pci_endpoint_test: Populate sriov_configure ops to configure SR-IOV device
In reply to Kishon Vijay Abraham IPopulate sriov_configure ops with pci_sriov_configure_simple to configure SR-IOV device.
--- drivers/misc/pci_endpoint_test.c | 1 + 1 file changed, 1 insertion(+)
drivers/misc/pci_endpoint_test.c +1 -0
@@ -978,6 +978,7 @@ static struct pci_driver pci_endpoint_test_driver = { .id_table = pci_endpoint_test_tbl, .probe = pci_endpoint_test_probe, .remove = pci_endpoint_test_remove, + .sriov_configure = pci_sriov_configure_simple, };module_pci_driver (pci_endpoint_test_driver);
Signature · 1 line
2.17.1
PATCH v8 8/8 Documentation: PCI: endpoint/pci-endpoint-cfs: Guide to use SR-IOV
In reply to Kishon Vijay Abraham IAdd Documentation to help users use PCI endpoint to create virtual functions using configfs. An endpoint function is designated as a virtual endpoint function device when it is linked to a physical endpoint function device (instead of a endpoint controller).
--- Documentation/PCI/endpoint/pci-endpoint-cfs.rst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
Documentation/PCI/endpoint/pci-endpoint-cfs.rst +11 -1
@@ -43,6 +43,7 @@ entries corresponding to EPF driver will be created by the EPF core. .. <EPF Driver1>/ ... <EPF Device 11>/ ... <EPF Device 21>/ + ... <EPF Device 31>/ .. <EPF Driver2>/ ... <EPF Device 12>/ ... <EPF Device 22>/
@@ -68,6 +69,7 @@ created) ... subsys_vendor_id ... subsys_id ... interrupt_pin + ... <Symlink EPF Device 31>/ ... primary/ ... <Symlink EPC Device1>/ ... secondary/
@@ -79,6 +81,13 @@ interface should be added in 'primary' directory and symlink of endpoint controller connected to secondary interface should be added in 'secondary' directory. +The <EPF Device> directory can have a list of symbolic links +(<Symlink EPF Device 31>) to other <EPF Device>. These symbolic links should +be created by the user to represent the virtual functions that are bound to +the physical function. In the above directory structure <EPF Device 11> is a +physical function and <EPF Device 31> is a virtual function. An EPF device once +it's linked to another EPF device, cannot be linked to a EPC device. + EPC Device ==========
@@ -98,7 +107,8 @@ entries corresponding to EPC device will be created by the EPC core. The <EPC Device> directory will have a list of symbolic links to <EPF Device>. These symbolic links should be created by the user to -represent the functions present in the endpoint device. +represent the functions present in the endpoint device. Only <EPF Device> +that represents a physical function can be linked to a EPC device. The <EPC Device> directory will also have a *start* field. Once "1" is written to this field, the endpoint device will be ready to
Signature · 1 line
2.17.1
Lorenzo Pieralisi
AppliedQuoted 8 lines · Kishon Vijay Abraham I
Patch series
*) Adds support to add virtual functions to enable endpoint controller
which supports SR-IOV capability
*) Add support in Cadence endpoint driver to configure virtual functions *) Enablepci_endpoint_testdriver to createpci_devicefor virtual
functions[...]
Applied to pci/endpoint, thanks!
[1/8] dt-bindings: PCI: pci-ep: Add binding to specify virtual function
https://git.kernel.org/lpieralisi/pci/c/ea96be4a7b [2/8] PCI: endpoint: Add support to add virtual function in endpoint core https://git.kernel.org/lpieralisi/pci/c/b64215ff2b [3/8] PCI: endpoint: Add support to link a physical function to a virtual function https://git.kernel.org/lpieralisi/pci/c/555d7c5f83 [4/8] PCI: endpoint: Add virtual function number in pci_epc ops https://git.kernel.org/lpieralisi/pci/c/22a8013ade [5/8] PCI: cadence: Simplify code to get register base address for configuring BAR https://git.kernel.org/lpieralisi/pci/c/9d26fd710f [6/8] PCI: cadence: Add support to configure virtual functions https://git.kernel.org/lpieralisi/pci/c/f52e1cf18d [7/8] misc: pci_endpoint_test: Populate sriov_configure ops to configure SR-IOV device https://git.kernel.org/lpieralisi/pci/c/681883d1d1 [8/8] Documentation: PCI: endpoint/pci-endpoint-cfs: Guide to use SR-IOV https://git.kernel.org/lpieralisi/pci/c/805ff686a1
Thanks,
Lorenzo