PCI: add 4x lane support for pci-j721e controllers
Subsystems (4)
v3 cover PCI: add 4x lane support for pci-j721e controllers
Adding of dditional support to Cadence PCIe controller (i.e. pci-j721e.c) for up to 4x lanes, and reworking of driver to define maximum lanes per board configuration.
Changes from v1:
* Reworked 'PCI: j721e: Add PCIe 4x lane selection support' to not cause regressions on 1-2x lane platforms
Changes from v2:
* Correct dev_warn format string from %d to %u since lane count is a unsigned integer
* Update CC list
Matt Ranostay (3):
PCI: j721e: Add PCIe 4x lane selection support
PCI: j721e: Add per platform maximum lane settings
PCI: j721e: Add warnings on num-lanes misconfiguration
drivers/pci/controller/cadence/pci-j721e.c | 27 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-)
Signature · 7 lines
2.38.GIT _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 1/3 PCI: j721e: Add PCIe 4x lane selection support
Add support for setting of two-bit field that allows selection of 4x lane PCIe which was previously limited to only 2x lanes.
--- drivers/pci/controller/cadence/pci-j721e.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/cadence/pci-j721e.c +5 -2
@@ -43,7 +43,6 @@ enum link_status { };#define J721E_MODE_RC BIT(7) -#define LANE_COUNT_MASK BIT(8)#define LANE_COUNT (n) ((n) << 8)#define GENERATION_SEL_MASK GENMASK(1, 0)
@@ -207,11 +206,15 @@ static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, {struct device *dev = pcie->cdns_pcie->dev;u32 lanes = pcie->num_lanes; +u32 mask =GENMASK (8 ,8 );u32 val =0 ;int ret; +if (lanes ==4 ) + mask =GENMASK (9 ,8 ); + val =LANE_COUNT (lanes -1 ); - ret =regmap_update_bits (syscon, offset,LANE_COUNT_MASK , val); + ret =regmap_update_bits (syscon, offset, mask, val);if (ret)dev_err (dev,"failed to set link count\n" );
Signature · 7 lines
2.38.GIT _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Vignesh Raghavendra
maintainerRe: [PATCH v3 1/3] PCI: j721e: Add PCIe 4x lane selection support
Hi Matt,
Quoted 21 lines · Matt Ranostay
Add support for setting of two-bit field that allows selection of 4x lane PCIe which was previously limited to only 2x lanes.
Signed-off-by Matt Ranostay <[email protected]>--- drivers/pci/controller/cadence/pci-j721e.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/pci/controller/cadence/pci-j721e.c +0
-1@@ -43,7 +43,6 @@ enum link_status { };#define J721E_MODE_RC BIT(7) -#define LANE_COUNT_MASK BIT(8)#define LANE_COUNT (n) ((n) << 8)#define GENERATION_SEL_MASK GENMASK(1, 0)
drivers/pci/controller/cadence/pci-j721e.c static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, · line 214
Quoted 9 lines
drivers/pci/controller/cadence/pci-j721e.c +3
-0@@ -207,11 +206,15 @@ static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, {struct device *dev = pcie->cdns_pcie->dev;u32 lanes = pcie->num_lanes; +u32 mask =GENMASK (8 ,8 );u32 val =0 ;int ret; +if (lanes ==4 ) + mask =GENMASK (9 ,8 );
Shouldn't we decide "mask" based on max_lanes added in 2/3 (ie how many lanes HW can support and thus width of this bit field) instead of num_lanes? Hypothetically, what if bootloader / other entity has set MSb but Linux is restricted to 2 lanes in DT?
Quoted 7 lines
drivers/pci/controller/cadence/pci-j721e.c +2
-1+ val =LANE_COUNT (lanes -1 ); - ret =regmap_update_bits (syscon, offset,LANE_COUNT_MASK , val); + ret =regmap_update_bits (syscon, offset, mask, val);if (ret)dev_err (dev,"failed to set link count\n" );
Re: [PATCH v3 1/3] PCI: j721e: Add PCIe 4x lane selection support
Quoted 31 lines · Vignesh Raghavendra
Hi Matt,
Quoted 28 lines · Matt Ranostay
Add support for setting of two-bit field that allows selection of 4x lane PCIe which was previously limited to only 2x lanes.
Signed-off-by Matt Ranostay <[email protected]>--- drivers/pci/controller/cadence/pci-j721e.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/pci/controller/cadence/pci-j721e.c +1
-1@@ -43,7 +43,6 @@ enum link_status { };#define J721E_MODE_RC BIT(7) -#define LANE_COUNT_MASK BIT(8)#define LANE_COUNT (n) ((n) << 8)#define GENERATION_SEL_MASK GENMASK(1, 0)@@ -207,11 +206,15 @@ static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, {struct device *dev = pcie->cdns_pcie->dev;u32 lanes = pcie->num_lanes; +u32 mask =GENMASK (8 ,8 );u32 val =0 ;int ret;
Quoted 8 lines
drivers/pci/controller/cadence/pci-j721e.c static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, · line 214
Quoted 2 lines
drivers/pci/controller/cadence/pci-j721e.c +2
-0+if (lanes ==4 ) + mask =GENMASK (9 ,8 );Shouldn't we decide "mask" based on
max_lanesadded in 2/3 (ie how many lanes HW can support and thus width of this bit field) instead ofnum_lanes? Hypothetically, what if bootloader / other entity has set MSb but Linux is restricted to 2 lanes in DT?
Ah yes that is a very good point, and the mask should be based on max_lanes.
Will fix up in v4...
- Matt
Quoted 8 lines
drivers/pci/controller/cadence/pci-j721e.c static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, · line 220
Quoted 8 lines
drivers/pci/controller/cadence/pci-j721e.c +2
-1+ val =LANE_COUNT (lanes -1 ); - ret =regmap_update_bits (syscon, offset,LANE_COUNT_MASK , val); + ret =regmap_update_bits (syscon, offset, mask, val);if (ret)dev_err (dev,"failed to set link count\n" );
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 2/3 PCI: j721e: Add per platform maximum lane settings
In reply to Matt RanostayVarious platforms have different maximum amount of lanes that can be selected. Add max_lanes to struct j721e_pcie to allow for error checking on num-lanes selection from device tree.
--- drivers/pci/controller/cadence/pci-j721e.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pci/controller/cadence/pci-j721e.c +8 -3
@@ -47,8 +47,6 @@ enum link_status {#define GENERATION_SEL_MASK GENMASK(1, 0) -#define MAX_LANES 2 -struct j721e_pcie {struct cdns_pcie *cdns_pcie;struct clk *refclk;
@@ -71,6 +69,7 @@ struct j721e_pcie_data { unsigned int quirk_disable_flr:1;u32 linkdown_irq_regfield; unsigned int byte_access_allowed:1; +unsigned int max_lanes; };static inline u32 j721e_pcie_user_readl (struct j721e_pcie *pcie,u32 offset)
@@ -294,11 +293,13 @@ static const struct j721e_pcie_data j721e_pcie_rc_data = { .quirk_retrain_flag = true, .byte_access_allowed = false, .linkdown_irq_regfield = LINK_DOWN, + .max_lanes = 2, };static const struct j721e_pcie_data j721e_pcie_ep_data = { .mode =PCI_MODE_EP , .linkdown_irq_regfield =LINK_DOWN , + .max_lanes =2 , };static const struct j721e_pcie_data j7200_pcie_rc_data = {
@@ -306,23 +307,27 @@ static const struct j721e_pcie_data j7200_pcie_rc_data = { .quirk_detect_quiet_flag = true, .linkdown_irq_regfield = J7200_LINK_DOWN, .byte_access_allowed = true, + .max_lanes = 4, };static const struct j721e_pcie_data j7200_pcie_ep_data = { .mode =PCI_MODE_EP , .quirk_detect_quiet_flag = true, .quirk_disable_flr = true, + .max_lanes =4 , };static const struct j721e_pcie_data am64_pcie_rc_data = { .mode =PCI_MODE_RC , .linkdown_irq_regfield =J7200_LINK_DOWN , .byte_access_allowed = true, + .max_lanes =1 , };static const struct j721e_pcie_data am64_pcie_ep_data = { .mode =PCI_MODE_EP , .linkdown_irq_regfield =J7200_LINK_DOWN , + .max_lanes =1 , };static const struct of_device_id of_j721e_pcie_match[] = {
@@ -436,7 +441,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) pcie->user_cfg_base = base; ret =of_property_read_u32 (node,"num-lanes" , &num_lanes); -if (ret || num_lanes >MAX_LANES ) +if (ret || num_lanes > data->max_lanes) num_lanes =1 ; pcie->num_lanes = num_lanes;
Signature · 7 lines
2.38.GIT _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 3/3 PCI: j721e: Add warnings on num-lanes misconfiguration
In reply to Matt RanostayAdded dev_warn messages to alert of devicetree misconfigurations for incorrect num-lanes setting, or the lack of one being defined.
--- drivers/pci/controller/cadence/pci-j721e.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/pci/controller/cadence/pci-j721e.c +10 -1
@@ -441,8 +441,17 @@ static int j721e_pcie_probe(struct platform_device *pdev) pcie->user_cfg_base = base; ret =of_property_read_u32 (node,"num-lanes" , &num_lanes); -if (ret || num_lanes > data->max_lanes) +if (ret) { +dev_warn (dev,"no num-lanes defined, defaulting to 1\n" ); num_lanes =1 ; + } + +if (num_lanes > data->max_lanes) { +dev_warn (dev,"defined num-lanes %u is greater than the " +"allowed maximum of %u, defaulting to 1\n" , + num_lanes, data->max_lanes); + num_lanes =1 ; + } pcie->num_lanes = num_lanes;if (dma_set_mask_and_coherent (dev,DMA_BIT_MASK (48 )))
Signature · 7 lines
2.38.GIT _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v3 3/3] PCI: j721e: Add warnings on num-lanes misconfiguration
Quoted 2 lines · Matt Ranostay
Added
dev_warnmessages to alert of devicetree misconfigurations for incorrect num-lanes setting, or the lack of one being defined.
s/Added/Add/ if you repost for anything else:
drivers/pci/controller/cadence/pci-j721e.c static int j721e_pcie_probe(struct platform_device *pdev) · line 452
Quoted 3 lines
drivers/pci/controller/cadence/pci-j721e.c +3
-0+dev_warn (dev,"defined num-lanes %u is greater than the " +"allowed maximum of %u, defaulting to 1\n" , + num_lanes, data->max_lanes);
Don't repost just for this, but I generally prefer to keep printf strings intact even if they exceed 80 columns, because it makes it easier for someone to grep for something like
"greater than the allowed".
Quoted 8 lines
drivers/pci/controller/cadence/pci-j721e.c +2
-0+ num_lanes =1 ; + } pcie->num_lanes = num_lanes;if (dma_set_mask_and_coherent (dev,DMA_BIT_MASK (48 )))Signature · 1 line
2.38.GIT