PCI: Add support for J7200 and AM64
Subsystems (6)
cover PCI: Add support for J7200 and AM64
This series adds the compatible specific to J7200 and AM64 and applies the erratas and configuration specific to them.
This series also includes Nadeem's patch that adds a quirk in Cadence driver which is used by J7200 [1].
The DT binding for both J7200 and AM64 is already merged.
[1] -> https://lore.kernel.org/r/[email protected]
Kishon Vijay Abraham I (4):
PCI: j721e: Add PCIe support for J7200
PCI: j721e: Add PCIe support for AM64
misc: pci_endpoint_test: Do not request or allocate IRQs in probe
misc: pci_endpoint_test: Add deviceID for AM64 and J7200
Nadeem Athani (1):
PCI: cadence: Add quirk flag to set minimum delay in LTSSM
Detect.Quiet state
drivers/misc/pci_endpoint_test.c | 27 ++++++-- drivers/pci/controller/cadence/pci-j721e.c | 63 +++++++++++++++++-- .../pci/controller/cadence/pcie-cadence-ep.c | 4 ++ .../controller/cadence/pcie-cadence-host.c | 3 + drivers/pci/controller/cadence/pcie-cadence.c | 17 +++++ drivers/pci/controller/cadence/pcie-cadence.h | 15 +++++ 6 files changed, 119 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/5 PCI: cadence: Add quirk flag to set minimum delay in LTSSM Detect.Quiet state
From: Nadeem Athani <[email protected]>
PCIe fails to link up if SERDES lanes not used by PCIe are assigned to another protocol. For example, link training fails if lanes 2 and 3 are assigned to another protocol while lanes 0 and 1 are used for PCIe to form a two lane link. This failure is due to an incorrect tie-off on an internal status signal indicating electrical idle.
Status signals going from SERDES to PCIe Controller are tied-off when a lane is not assigned to PCIe. Signal indicating electrical idle is incorrectly tied-off to a state that indicates non-idle. As a result, PCIe sees unused lanes to be out of electrical idle and this causes LTSSM to exit Detect.Quiet state without waiting for 12ms timeout to occur. If a receiver is not detected on the first receiver detection attempt in Detect.Active state, LTSSM goes back to Detect.Quiet and again moves forward to Detect.Active state without waiting for 12ms as required by PCIe base specification. Since wait time in Detect.Quiet is skipped, multiple receiver detect operations are performed back-to-back without allowing time for capacitance on the transmit lines to discharge. This causes subsequent receiver detection to always fail even if a receiver gets connected eventually.
Add a quirk flag "quirk_detect_quiet_flag" to program the minimum time the LTSSM should wait on entering Detect.Quiet state here. This has to be set for J7200 as it has an incorrect tie-off on unused lanes.
---
Changes from v2:
1) Removed terminating '.' in subject
2) Modified commit log
Changes from v1:
1) Add function cdns_pcie_detect_quiet_min_delay_set in pcie-cadence.c and invoke it from host and endpoint driver file.
v2: https://lore.kernel.org/r/[email protected]
v1: https://lore.kernel.org/r/[email protected]
.../pci/controller/cadence/pcie-cadence-ep.c | 4 ++++ .../pci/controller/cadence/pcie-cadence-host.c | 3 +++ drivers/pci/controller/cadence/pcie-cadence.c | 17 +++++++++++++++++ drivers/pci/controller/cadence/pcie-cadence.h | 15 +++++++++++++++ 4 files changed, 39 insertions(+)
drivers/pci/controller/cadence/pcie-cadence-ep.c +4 -0
@@ -804,6 +804,10 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) ep->irq_pci_addr =CDNS_PCIE_EP_IRQ_PCI_ADDR_NONE ;/* Reserve region 0 for IRQs */ set_bit (0 , &ep->ob_region_map); + +if (ep->quirk_detect_quiet_flag) +cdns_pcie_detect_quiet_min_delay_set (&ep->pcie); +spin_lock_init (&ep->lock);return 0 ;
drivers/pci/controller/cadence/pcie-cadence-host.c +3 -0
@@ -498,6 +498,9 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc)return PTR_ERR (rc->cfg_base); rc->cfg_res = res; +if (rc->quirk_detect_quiet_flag) +cdns_pcie_detect_quiet_min_delay_set (&rc->pcie); + ret =cdns_pcie_start_link (pcie);if (ret) {dev_err (dev,"Failed to start link\n" );
drivers/pci/controller/cadence/pcie-cadence.c +17 -0
@@ -7,6 +7,23 @@#include "pcie-cadence.h" +void cdns_pcie_detect_quiet_min_delay_set (struct cdns_pcie *pcie) +{ +u32 delay =0x3 ; +u32 ltssm_control_cap; + +/* +* Set the LTSSM Detect Quiet state min. delay to 2ms. +*/ + + ltssm_control_cap =cdns_pcie_readl (pcie,CDNS_PCIE_LTSSM_CONTROL_CAP ); + ltssm_control_cap = ((ltssm_control_cap & + ~CDNS_PCIE_DETECT_QUIET_MIN_DELAY_MASK ) | +CDNS_PCIE_DETECT_QUIET_MIN_DELAY (delay)); + +cdns_pcie_writel (pcie,CDNS_PCIE_LTSSM_CONTROL_CAP , ltssm_control_cap); +} +void cdns_pcie_set_outbound_region (struct cdns_pcie *pcie,u8 busnr,u8 fn,u32 r,bool is_io,u64 cpu_addr,u64 pci_addr,size_t size)
drivers/pci/controller/cadence/pcie-cadence.h +15 -0
@@ -194,6 +194,14 @@/* AXI link down register */ #define CDNS_PCIE_AT_LINKDOWN (CDNS_PCIE_AT_BASE + 0x0824) +/* LTSSM Capabilities register */ +#define CDNS_PCIE_LTSSM_CONTROL_CAP (CDNS_PCIE_LM_BASE + 0x0054) +#define CDNS_PCIE_DETECT_QUIET_MIN_DELAY_MASK GENMASK(2, 1) +#define CDNS_PCIE_DETECT_QUIET_MIN_DELAY_SHIFT 1 +#define CDNS_PCIE_DETECT_QUIET_MIN_DELAY (delay) \ + (((delay) << CDNS_PCIE_DETECT_QUIET_MIN_DELAY_SHIFT) & \ + CDNS_PCIE_DETECT_QUIET_MIN_DELAY_MASK) +enum cdns_pcie_rp_bar {RP_BAR_UNDEFINED =-1 ,RP_BAR0 ,
@@ -297,6 +305,7 @@ struct cdns_pcie {* @avail_ib_bar: Satus of RP_BAR0, RP_BAR1 and RP_NO_BAR if it's free or * available * @quirk_retrain_flag: Retrain link as quirk for PCIe Gen2 +* @quirk_detect_quiet_flag: LTSSM Detect Quiet min delay set as quirk */ struct cdns_pcie_rc {struct cdns_pcie pcie;
@@ -306,6 +315,7 @@ struct cdns_pcie_rc {u32 device_id;bool avail_ib_bar[CDNS_PCIE_RP_MAX_IB ];bool quirk_retrain_flag; +bool quirk_detect_quiet_flag; };/**
@@ -338,6 +348,7 @@ struct cdns_pcie_epf {* registers fields (RMW) accessible by both remote RC and EP to * minimize time between read and write * @epf: Structure to hold info about endpoint function +* @quirk_detect_quiet_flag: LTSSM Detect Quiet min delay set as quirk */ struct cdns_pcie_ep {struct cdns_pcie pcie;
@@ -352,6 +363,7 @@ struct cdns_pcie_ep {/* protect writing to PCI_STATUS while raising legacy interrupts */ spinlock_t lock;struct cdns_pcie_epf *epf; +bool quirk_detect_quiet_flag; };
@@ -512,6 +524,9 @@ static inline int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) return 0; }#endif + +void cdns_pcie_detect_quiet_min_delay_set (struct cdns_pcie *pcie); +void cdns_pcie_set_outbound_region (struct cdns_pcie *pcie,u8 busnr,u8 fn,u32 r,bool is_io,u64 cpu_addr,u64 pci_addr,size_t size);
Signature · 1 line
2.17.1
PATCH 2/5 PCI: j721e: Add PCIe support for J7200
In reply to Kishon Vijay Abraham IJ7200 has the same PCIe IP as in J721E with minor changes in the wrapper. J7200 allows byte access of bridge configuration space registers and the register field for LINK_DOWN interrupt is different. J7200 also requires "quirk_detect_quiet_flag" to be set. Configure these changes as part of driver data applicable only to J7200.
--- drivers/pci/controller/cadence/pci-j721e.c | 44 ++++++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-)
drivers/pci/controller/cadence/pci-j721e.c +40 -4
@@ -27,6 +27,7 @@#define STATUS_REG_SYS_2 0x508#define STATUS_CLR_REG_SYS_2 0x708#define LINK_DOWN BIT(1) +#define J7200_LINK_DOWN BIT(10)#define J721E_PCIE_USER_CMD_STATUS 0x4#define LINK_TRAINING_ENABLE BIT(0)
@@ -57,6 +58,7 @@ struct j721e_pcie {struct cdns_pcie *cdns_pcie;void __iomem *user_cfg_base;void __iomem *intd_cfg_base; +u32 link_irq_reg_field; };enum j721e_pcie_mode {
@@ -67,6 +69,9 @@ enum j721e_pcie_mode {struct j721e_pcie_data {enum j721e_pcie_mode mode;bool quirk_retrain_flag; +bool quirk_detect_quiet_flag; +u32 link_irq_reg_field; +bool byte_access_allowed; };static inline u32 j721e_pcie_user_readl (struct j721e_pcie *pcie,u32 offset)
@@ -98,12 +103,12 @@ static irqreturn_t j721e_pcie_link_irq_handler(int irq, void *priv)u32 reg; reg =j721e_pcie_intd_readl (pcie,STATUS_REG_SYS_2 ); -if (!(reg &LINK_DOWN )) +if (!(reg & pcie->link_irq_reg_field))return IRQ_NONE ;dev_err (dev,"LINK DOWN!\n" ); -j721e_pcie_intd_writel (pcie,STATUS_CLR_REG_SYS_2 ,LINK_DOWN ); +j721e_pcie_intd_writel (pcie,STATUS_CLR_REG_SYS_2 , pcie->link_irq_reg_field);return IRQ_HANDLED ; }
@@ -112,7 +117,7 @@ static void j721e_pcie_config_link_irq(struct j721e_pcie *pcie)u32 reg; reg =j721e_pcie_intd_readl (pcie,ENABLE_REG_SYS_2 ); - reg |=LINK_DOWN ; + reg |= pcie->link_irq_reg_field;j721e_pcie_intd_writel (pcie,ENABLE_REG_SYS_2 , reg); }
@@ -284,10 +289,25 @@ static struct pci_ops cdns_ti_pcie_host_ops = {static const struct j721e_pcie_data j721e_pcie_rc_data = { .mode =PCI_MODE_RC , .quirk_retrain_flag = true, + .byte_access_allowed = false, + .link_irq_reg_field =LINK_DOWN , };static const struct j721e_pcie_data j721e_pcie_ep_data = { .mode =PCI_MODE_EP , + .link_irq_reg_field =LINK_DOWN , +}; + +static const struct j721e_pcie_data j7200_pcie_rc_data = { + .mode =PCI_MODE_RC , + .quirk_detect_quiet_flag = true, + .link_irq_reg_field =J7200_LINK_DOWN , + .byte_access_allowed = true, +}; + +static const struct j721e_pcie_data j7200_pcie_ep_data = { + .mode =PCI_MODE_EP , + .quirk_detect_quiet_flag = true, };static const struct of_device_id of_j721e_pcie_match[] = {
@@ -299,6 +319,14 @@ static const struct of_device_id of_j721e_pcie_match[] = { .compatible = "ti,j721e-pcie-ep", .data = &j721e_pcie_ep_data, }, + { + .compatible = "ti,j7200-pcie-host", + .data = &j7200_pcie_rc_data, + }, + { + .compatible = "ti,j7200-pcie-ep", + .data = &j7200_pcie_ep_data, + }, {}, };
@@ -309,10 +337,12 @@ static int j721e_pcie_probe(struct platform_device *pdev)struct pci_host_bridge *bridge;struct j721e_pcie_data *data;struct cdns_pcie *cdns_pcie; +bool byte_access_allowed;struct j721e_pcie *pcie;struct cdns_pcie_rc *rc;struct cdns_pcie_ep *ep;struct gpio_desc *gpiod; +u32 link_irq_reg_field;void __iomem *base;struct clk *clk;u32 num_lanes;
@@ -325,6 +355,8 @@ static int j721e_pcie_probe(struct platform_device *pdev)return -EINVAL ; mode = (u32 )data->mode; + byte_access_allowed = data->byte_access_allowed; + link_irq_reg_field = data->link_irq_reg_field; pcie =devm_kzalloc (dev,sizeof (*pcie),GFP_KERNEL );if (!pcie)
@@ -332,6 +364,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) pcie->dev = dev; pcie->mode = mode; + pcie->link_irq_reg_field = link_irq_reg_field; base =devm_platform_ioremap_resource_byname (pdev,"intd_cfg" );if (IS_ERR (base))
@@ -391,9 +424,11 @@ static int j721e_pcie_probe(struct platform_device *pdev) goto err_get_sync; } - bridge->ops = &cdns_ti_pcie_host_ops; +if (!byte_access_allowed) + bridge->ops = &cdns_ti_pcie_host_ops; rc =pci_host_bridge_priv (bridge); rc->quirk_retrain_flag = data->quirk_retrain_flag; + rc->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag; cdns_pcie = &rc->pcie; cdns_pcie->dev = dev;
@@ -459,6 +494,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) ret = -ENOMEM ; goto err_get_sync; } + ep->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag; cdns_pcie = &ep->pcie; cdns_pcie->dev = dev;
Signature · 1 line
2.17.1
Re: [PATCH 2/5] PCI: j721e: Add PCIe support for J7200
Quoted 24 lines · Kishon Vijay Abraham I
J7200 has the same PCIe IP as in J721E with minor changes in the wrapper. J7200 allows byte access of bridge configuration space registers and the register field for
LINK_DOWNinterrupt is different. J7200 also requires "quirk_detect_quiet_flag" to be set. Configure these changes as part of driver data applicable only to J7200.Signed-off-by Kishon Vijay Abraham I <[email protected]>--- drivers/pci/controller/cadence/pci-j721e.c | 44 ++++++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-)drivers/pci/controller/cadence/pci-j721e.c +1
-0@@ -27,6 +27,7 @@#define STATUS_REG_SYS_2 0x508#define STATUS_CLR_REG_SYS_2 0x708#define LINK_DOWN BIT(1) +#define J7200_LINK_DOWN BIT(10)#define J721E_PCIE_USER_CMD_STATUS 0x4#define LINK_TRAINING_ENABLE BIT(0)
drivers/pci/controller/cadence/pci-j721e.c struct j721e_pcie { · line 61
Quoted 4 lines
drivers/pci/controller/cadence/pci-j721e.c +1
-0@@ -57,6 +58,7 @@ struct j721e_pcie {struct cdns_pcie *cdns_pcie;void __iomem *user_cfg_base;void __iomem *intd_cfg_base; +u32 link_irq_reg_field;
This seems to be a device-specific "link down" bit, so maybe a more descriptive name that suggests "link down"?
drivers/pci/controller/cadence/pci-j721e.c enum j721e_pcie_mode { · line 74
Quoted 10 lines
drivers/pci/controller/cadence/pci-j721e.c +3
-0};enum j721e_pcie_mode {@@ -67,6 +69,9 @@ enum j721e_pcie_mode {struct j721e_pcie_data {enum j721e_pcie_mode mode;bool quirk_retrain_flag; +bool quirk_detect_quiet_flag; +u32 link_irq_reg_field; +bool byte_access_allowed;
Maybe re-indent quirk_retrain_flag so the struct is consistent?
I know there's a pattern of using "bool" in these structs, but I don't think it's really any better than "unsigned int :1" and it takes more space.
https://lore.kernel.org/r/CA+55aFzKQ6Pj18TB8p4Yr0M4t+S+BsiHH=BJNmn=76-NcjTj-g@mail.gmail.com/
https://lore.kernel.org/r/CA+55aFxnePDimkVKVtv3gNmRGcwc8KQ5mHYvUxY8sAQg6yvVYg@mail.gmail.com/
Quoted 99 lines
drivers/pci/controller/cadence/pci-j721e.c +31
-3};static inline u32 j721e_pcie_user_readl (struct j721e_pcie *pcie,u32 offset)@@ -98,12 +103,12 @@ static irqreturn_t j721e_pcie_link_irq_handler(int irq, void *priv)u32 reg; reg =j721e_pcie_intd_readl (pcie,STATUS_REG_SYS_2 ); -if (!(reg &LINK_DOWN )) +if (!(reg & pcie->link_irq_reg_field))return IRQ_NONE ;dev_err (dev,"LINK DOWN!\n" ); -j721e_pcie_intd_writel (pcie,STATUS_CLR_REG_SYS_2 ,LINK_DOWN ); +j721e_pcie_intd_writel (pcie,STATUS_CLR_REG_SYS_2 , pcie->link_irq_reg_field);return IRQ_HANDLED ; }@@ -112,7 +117,7 @@ static void j721e_pcie_config_link_irq(struct j721e_pcie *pcie)u32 reg; reg =j721e_pcie_intd_readl (pcie,ENABLE_REG_SYS_2 ); - reg |=LINK_DOWN ; + reg |= pcie->link_irq_reg_field;j721e_pcie_intd_writel (pcie,ENABLE_REG_SYS_2 , reg); }@@ -284,10 +289,25 @@ static struct pci_ops cdns_ti_pcie_host_ops = {static const struct j721e_pcie_data j721e_pcie_rc_data = { .mode =PCI_MODE_RC , .quirk_retrain_flag = true, + .byte_access_allowed = false, + .link_irq_reg_field =LINK_DOWN , };static const struct j721e_pcie_data j721e_pcie_ep_data = { .mode =PCI_MODE_EP , + .link_irq_reg_field =LINK_DOWN , +}; + +static const struct j721e_pcie_data j7200_pcie_rc_data = { + .mode =PCI_MODE_RC , + .quirk_detect_quiet_flag = true, + .link_irq_reg_field =J7200_LINK_DOWN , + .byte_access_allowed = true, +}; + +static const struct j721e_pcie_data j7200_pcie_ep_data = { + .mode =PCI_MODE_EP , + .quirk_detect_quiet_flag = true, };static const struct of_device_id of_j721e_pcie_match[] = {@@ -299,6 +319,14 @@ static const struct of_device_id of_j721e_pcie_match[] = { .compatible = "ti,j721e-pcie-ep", .data = &j721e_pcie_ep_data, }, + { + .compatible = "ti,j7200-pcie-host", + .data = &j7200_pcie_rc_data, + }, + { + .compatible = "ti,j7200-pcie-ep", + .data = &j7200_pcie_ep_data, + }, {}, };@@ -309,10 +337,12 @@ static int j721e_pcie_probe(struct platform_device *pdev)struct pci_host_bridge *bridge;struct j721e_pcie_data *data;struct cdns_pcie *cdns_pcie; +bool byte_access_allowed;struct j721e_pcie *pcie;struct cdns_pcie_rc *rc;struct cdns_pcie_ep *ep;struct gpio_desc *gpiod; +u32 link_irq_reg_field;void __iomem *base;struct clk *clk;u32 num_lanes;@@ -325,6 +355,8 @@ static int j721e_pcie_probe(struct platform_device *pdev)return -EINVAL ; mode = (u32 )data->mode; + byte_access_allowed = data->byte_access_allowed; + link_irq_reg_field = data->link_irq_reg_field; pcie =devm_kzalloc (dev,sizeof (*pcie),GFP_KERNEL );if (!pcie)@@ -332,6 +364,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) pcie->dev = dev; pcie->mode = mode; + pcie->link_irq_reg_field = link_irq_reg_field; base =devm_platform_ioremap_resource_byname (pdev,"intd_cfg" );if (IS_ERR (base))
drivers/pci/controller/cadence/pci-j721e.c static int j721e_pcie_probe(struct platform_device *pdev) · line 427
Quoted 5 lines
drivers/pci/controller/cadence/pci-j721e.c +1
-1@@ -391,9 +424,11 @@ static int j721e_pcie_probe(struct platform_device *pdev) goto err_get_sync; } - bridge->ops = &cdns_ti_pcie_host_ops; +if (!byte_access_allowed)
Why bother with the "byte_access_allowed" local variable? Could just use "data->byte_access_allowed" here, as the code below uses "data->quirk_retrain_flag", etc.
Same with "link_irq_reg_field" above, I guess.
Quoted 18 lines
drivers/pci/controller/cadence/pci-j721e.c +3
-0+ bridge->ops = &cdns_ti_pcie_host_ops; rc =pci_host_bridge_priv (bridge); rc->quirk_retrain_flag = data->quirk_retrain_flag; + rc->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag; cdns_pcie = &rc->pcie; cdns_pcie->dev = dev;@@ -459,6 +494,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) ret = -ENOMEM ; goto err_get_sync; } + ep->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag; cdns_pcie = &ep->pcie; cdns_pcie->dev = dev;Signature · 1 line
2.17.1
PATCH 3/5 PCI: j721e: Add PCIe support for AM64
In reply to Kishon Vijay Abraham IAM64 has the same PCIe IP as in J7200 with certain erratas not applicable (quirk_detect_quiet_flag). Add support for "ti,am64-pcie-host" compatible and "ti,am64-pcie-ep" compatible that is specific to AM64.
--- drivers/pci/controller/cadence/pci-j721e.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/pci/controller/cadence/pci-j721e.c +19 -0
@@ -310,6 +310,17 @@ static const struct j721e_pcie_data j7200_pcie_ep_data = { .quirk_detect_quiet_flag = true, }; +static const struct j721e_pcie_data am64_pcie_rc_data = { + .mode =PCI_MODE_RC , + .link_irq_reg_field =J7200_LINK_DOWN , + .byte_access_allowed = true, +}; + +static const struct j721e_pcie_data am64_pcie_ep_data = { + .mode =PCI_MODE_EP , + .link_irq_reg_field =J7200_LINK_DOWN , +}; +static const struct of_device_id of_j721e_pcie_match[] = { { .compatible ="ti,j721e-pcie-host" ,
@@ -327,6 +338,14 @@ static const struct of_device_id of_j721e_pcie_match[] = { .compatible = "ti,j7200-pcie-ep", .data = &j7200_pcie_ep_data, }, + { + .compatible = "ti,am64-pcie-host", + .data = &am64_pcie_rc_data, + }, + { + .compatible = "ti,am64-pcie-ep", + .data = &am64_pcie_ep_data, + }, {}, };
Signature · 1 line
2.17.1
PATCH 4/5 misc: pci_endpoint_test: Do not request or allocate IRQs in probe
In reply to Kishon Vijay Abraham IAllocation of IRQ vectors and requesting IRQ is done as part of PCITEST_SET_IRQTYPE. Do not request or allocate IRQs in probe for AM654 and J721E so that the user space test script has better control of the devices for which the IRQs are configured. Since certain user space scripts could rely on allocation of IRQ vectors during probe, remove allocation of IRQs only for TI's K3 platform.
--- drivers/misc/pci_endpoint_test.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/misc/pci_endpoint_test.c +13 -6
@@ -79,6 +79,9 @@#define PCI_DEVICE_ID_RENESAS_R8A774C0 0x002d#define PCI_DEVICE_ID_RENESAS_R8A774E1 0x0025 +#define is_j721e_pci_dev (pdev) \ + ((pdev)->device == PCI_DEVICE_ID_TI_J721E) +static DEFINE_IDA (pci_endpoint_test_ida);#define to_endpoint_test (priv) container_of((priv), struct pci_endpoint_test, \
@@ -810,9 +813,11 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,pci_set_master (pdev); -if (!pci_endpoint_test_alloc_irq_vectors (test, irq_type)) { - err = -EINVAL ; - goto err_disable_irq; +if (!(is_am654_pci_dev (pdev) ||is_j721e_pci_dev (pdev))) { +if (!pci_endpoint_test_alloc_irq_vectors (test, irq_type)) { + err = -EINVAL ; + goto err_disable_irq; + } }for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++) {
@@ -850,9 +855,11 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, goto err_ida_remove; } -if (!pci_endpoint_test_request_irq (test)) { - err = -EINVAL ; - goto err_kfree_test_name; +if (!(is_am654_pci_dev (pdev) ||is_j721e_pci_dev (pdev))) { +if (!pci_endpoint_test_request_irq (test)) { + err = -EINVAL ; + goto err_kfree_test_name; + } } misc_device = &test->miscdev;
Signature · 1 line
2.17.1
PATCH 5/5 misc: pci_endpoint_test: Add deviceID for AM64 and J7200
In reply to Kishon Vijay Abraham IAdd device ID specific to AM64 and J7200 in pci_endpoint_test so that endpoints configured with those deviceIDs can use pci_endpoint_test driver.
--- drivers/misc/pci_endpoint_test.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/misc/pci_endpoint_test.c +8 -0
@@ -69,6 +69,8 @@#define FLAG_USE_DMA BIT(0)#define PCI_DEVICE_ID_TI_AM654 0xb00c +#define PCI_DEVICE_ID_TI_J7200 0xb00f +#define PCI_DEVICE_ID_TI_AM64 0xb010#define PCI_DEVICE_ID_LS1088A 0x80c0#define is_am654_pci_dev (pdev) \
@@ -976,6 +978,12 @@ static const struct pci_device_id pci_endpoint_test_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J721E), .driver_data = (kernel_ulong_t)&j721e_data, }, + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J7200), + .driver_data = (kernel_ulong_t)&j721e_data, + }, + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_AM64), + .driver_data = (kernel_ulong_t)&j721e_data, + }, { } };MODULE_DEVICE_TABLE (pci, pci_endpoint_test_tbl);
Signature · 1 line
2.17.1