pinctrl: intel: Split intel_pinctrl_add_padgroups() for better maintenance
Subsystems (3)
PATCH v2 1/3 pinctrl: intel: Split intel_pinctrl_add_padgroups() for better maintenance
Currently the intel_pinctrl_add_padgroups() is twisted a bit due to a different nature of the pin control hardware implementations. Thus, its maintenance is a bit hard. Besides that some pieces of code are run on all hardware and make this code slightly inefficient, and moreover, validation for one case is done in a wrong time in a flow which makes it even slower.
Split intel_pinctrl_add_padgroups() to two functions, one per hardware implementation, for better maintenance and readability.
---
v2: added tag (Mika)
drivers/pinctrl/intel/pinctrl-intel.c | 60 ++++++++++++++++++--------- 1 file changed, 40 insertions(+), 20 deletions(-)
drivers/pinctrl/intel/pinctrl-intel.c +40 -20
@@ -1321,34 +1321,19 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq)return 0 ; } -static int intel_pinctrl_add_padgroups (struct intel_pinctrl *pctrl, -struct intel_community *community) +static int intel_pinctrl_add_padgroups_by_gpps (struct intel_pinctrl *pctrl, +struct intel_community *community) {struct intel_padgroup *gpps; -unsigned int npins = community->npins;unsigned int padown_num =0 ; -size_t ngpps, i; - -if (community->gpps) - ngpps = community->ngpps; -else - ngpps =DIV_ROUND_UP (community->npins, community->gpp_size); +size_t i, ngpps = community->ngpps; gpps =devm_kcalloc (pctrl->dev, ngpps,sizeof (*gpps),GFP_KERNEL );if (!gpps)return -ENOMEM ;for (i =0 ; i < ngpps; i++) { -if (community->gpps) { - gpps[i] = community->gpps[i]; - }else { -unsigned int gpp_size = community->gpp_size; - - gpps[i].reg_num = i; - gpps[i].base = community->pin_base + i * gpp_size; - gpps[i].size =min (gpp_size, npins); - npins -= gpps[i].size; - } + gpps[i] = community->gpps[i];if (gpps[i].size >32 )return -EINVAL ;
@@ -1366,6 +1351,38 @@ static int intel_pinctrl_add_padgroups(struct intel_pinctrl *pctrl,break ; } + gpps[i].padown_num = padown_num; + padown_num +=DIV_ROUND_UP (gpps[i].size *4 ,32 ); + } + + community->gpps = gpps; + +return 0 ; +} + +static int intel_pinctrl_add_padgroups_by_size (struct intel_pinctrl *pctrl, +struct intel_community *community) +{ +struct intel_padgroup *gpps; +unsigned int npins = community->npins; +unsigned int padown_num =0 ; +size_t i, ngpps =DIV_ROUND_UP (npins, community->gpp_size); + +if (community->gpp_size >32 ) +return -EINVAL ; + + gpps =devm_kcalloc (pctrl->dev, ngpps,sizeof (*gpps),GFP_KERNEL ); +if (!gpps) +return -ENOMEM ; + +for (i =0 ; i < ngpps; i++) { +unsigned int gpp_size = community->gpp_size; + + gpps[i].reg_num = i; + gpps[i].base = community->pin_base + i * gpp_size; + gpps[i].size =min (gpp_size, npins); + npins -= gpps[i].size; + gpps[i].padown_num = padown_num;/*
@@ -1483,7 +1500,10 @@ static int intel_pinctrl_probe(struct platform_device *pdev, community->regs = regs; community->pad_regs = regs + padbar; - ret =intel_pinctrl_add_padgroups (pctrl, community); +if (community->gpps) + ret =intel_pinctrl_add_padgroups_by_gpps (pctrl, community); +else + ret =intel_pinctrl_add_padgroups_by_size (pctrl, community);if (ret)return ret; }
Signature · 1 line
2.29.2
PATCH v2 2/3 pinctrl: intel: Drop unnecessary check for predefined features
None of the drivers is overriding features. Remove unnecessary check. While here, rename rev to value to make easier further development.
---
v2: added tag (Mika)
drivers/pinctrl/intel/pinctrl-intel.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/pinctrl/intel/pinctrl-intel.c +6 -12
@@ -1473,6 +1473,7 @@ static int intel_pinctrl_probe(struct platform_device *pdev,struct intel_community *community = &pctrl->communities[i];void __iomem *regs;u32 padbar; +u32 value; *community = pctrl->soc->communities[i];
@@ -1480,18 +1481,11 @@ static int intel_pinctrl_probe(struct platform_device *pdev,if (IS_ERR (regs))return PTR_ERR (regs); -/* -* Determine community features based on the revision if -* not specified already. -*/ -if (!community->features) { -u32 rev; - - rev = (readl (regs +REVID ) &REVID_MASK ) >>REVID_SHIFT ; -if (rev >=0x94 ) { - community->features |=PINCTRL_FEATURE_DEBOUNCE ; - community->features |=PINCTRL_FEATURE_1K_PD ; - } +/* Determine community features based on the revision */ + value =readl (regs +REVID ); +if (((value &REVID_MASK ) >>REVID_SHIFT ) >=0x94 ) { + community->features |=PINCTRL_FEATURE_DEBOUNCE ; + community->features |=PINCTRL_FEATURE_1K_PD ; }/* Read offset of the pad configuration registers */
Signature · 1 line
2.29.2
PATCH v2 3/3 pinctrl: intel: Convert capability list to features
In reply to Andy ShevchenkoCommunities can have features provided in the capability list. Traverse the list and convert to respective features.
---
v2: rebased with dropped previous patch (Mika)
drivers/pinctrl/intel/pinctrl-intel.c | 41 +++++++++++++++++++++++++-- drivers/pinctrl/intel/pinctrl-intel.h | 4 +++ 2 files changed, 42 insertions(+), 3 deletions(-)
drivers/pinctrl/intel/pinctrl-intel.c +38 -3
@@ -29,6 +29,16 @@#define REVID_SHIFT 16#define REVID_MASK GENMASK(31, 16) +#define CAPLIST 0x004 +#define CAPLIST_ID_SHIFT 16 +#define CAPLIST_ID_MASK GENMASK(23, 16) +#define CAPLIST_ID_GPIO_HW_INFO 1 +#define CAPLIST_ID_PWM 2 +#define CAPLIST_ID_BLINK 3 +#define CAPLIST_ID_EXP 4 +#define CAPLIST_NEXT_SHIFT 0 +#define CAPLIST_NEXT_MASK GENMASK(15, 0) +#define PADBAR 0x00c#define PADOWN_BITS 4
@@ -1472,7 +1482,7 @@ static int intel_pinctrl_probe(struct platform_device *pdev,for (i =0 ; i < pctrl->ncommunities; i++) {struct intel_community *community = &pctrl->communities[i];void __iomem *regs; -u32 padbar; +u32 offset;u32 value; *community = pctrl->soc->communities[i];
@@ -1488,11 +1498,36 @@ static int intel_pinctrl_probe(struct platform_device *pdev, community->features |=PINCTRL_FEATURE_1K_PD ; } +/* Determine community features based on the capabilities */ + offset =CAPLIST ; +do { + value =readl (regs + offset); +switch ((value &CAPLIST_ID_MASK ) >>CAPLIST_ID_SHIFT ) { +case CAPLIST_ID_GPIO_HW_INFO : + community->features |=PINCTRL_FEATURE_GPIO_HW_INFO ; +break ; +case CAPLIST_ID_PWM : + community->features |=PINCTRL_FEATURE_PWM ; +break ; +case CAPLIST_ID_BLINK : + community->features |=PINCTRL_FEATURE_BLINK ; +break ; +case CAPLIST_ID_EXP : + community->features |=PINCTRL_FEATURE_EXP ; +break ; +default : +break ; + } + offset = (value &CAPLIST_NEXT_MASK ) >>CAPLIST_NEXT_SHIFT ; + }while (offset); + +dev_dbg (&pdev->dev,"Community%d features: %#08x\n" , i, community->features); +/* Read offset of the pad configuration registers */ - padbar =readl (regs +PADBAR ); + offset =readl (regs +PADBAR ); community->regs = regs; - community->pad_regs = regs + padbar; + community->pad_regs = regs + offset;if (community->gpps) ret =intel_pinctrl_add_padgroups_by_gpps (pctrl, community);
drivers/pinctrl/intel/pinctrl-intel.h +4 -0
@@ -143,6 +143,10 @@ struct intel_community {/* Additional features supported by the hardware */ #define PINCTRL_FEATURE_DEBOUNCE BIT(0)#define PINCTRL_FEATURE_1K_PD BIT(1) +#define PINCTRL_FEATURE_GPIO_HW_INFO BIT(2) +#define PINCTRL_FEATURE_PWM BIT(3) +#define PINCTRL_FEATURE_BLINK BIT(4) +#define PINCTRL_FEATURE_EXP BIT(5)/** * PIN_GROUP - Declare a pin group
Signature · 1 line
2.29.2
Re: [PATCH v2 3/3] pinctrl: intel: Convert capability list to features
Quoted 4 lines · Andy Shevchenko
Communities can have features provided in the capability list. Traverse the list and convert to respective features.
Signed-off-by Andy Shevchenko <[email protected]>
Re: [PATCH v2 3/3] pinctrl: intel: Convert capability list to features
Quoted 7 lines · Mika Westerberg
Quoted 4 lines · Andy Shevchenko
Communities can have features provided in the capability list. Traverse the list and convert to respective features.
Signed-off-by Andy Shevchenko <[email protected]>Acked-by Mika Westerberg <[email protected]>
All three pushed to my review and testing queue. Thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko