[PATCH v3 1/4] input: misc: pm8941-pwrkey: fix error message

[PATCH v3 1/4] input: misc: pm8941-pwrkey: fix error message

[Anjelique Melendez]

Currently, error message reads "failed to set debounce". However,
code is attempting to read revision not set debounce. Fix this.

Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
---
 drivers/input/misc/pm8941-pwrkey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
index 33609603245d..e0240db12d4f 100644
--- a/drivers/input/misc/pm8941-pwrkey.c
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -217,7 +217,7 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
 	error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_REV2,
 			    &pwrkey->revision);
 	if (error) {
-		dev_err(&pdev->dev, "failed to set debounce: %d\n", error);
+		dev_err(&pdev->dev, "failed to read revision: %d\n", error);
 		return error;
 	}
 
-- 
2.34.1

[PATCH v3 2/4] input: misc: pm8941-pwrkey: add support for PON GEN3 base addresses

[Anjelique Melendez]

Currently, PON address is read from the "reg" property. For PON GEN3,
which starts with PMK8350, the "reg" property will have both the PON
HLOS and PON PBS addesses defined. Add support so that all PON
generations can be configured.

Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
---
 drivers/input/misc/pm8941-pwrkey.c | 31 +++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
index e0240db12d4f..2a42a676b021 100644
--- a/drivers/input/misc/pm8941-pwrkey.c
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -12,6 +12,7 @@
 #include <linux/log2.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
@@ -44,6 +45,7 @@ struct pm8941_data {
 	unsigned int	status_bit;
 	bool		supports_ps_hold_poff_config;
 	bool		supports_debounce_config;
+	bool		has_pon_pbs;
 	const char	*name;
 	const char	*phys;
 };
@@ -52,6 +54,7 @@ struct pm8941_pwrkey {
 	struct device *dev;
 	int irq;
 	u32 baseaddr;
+	u32 pon_pbs_baseaddr;
 	struct regmap *regmap;
 	struct input_dev *input;
 
@@ -167,6 +170,8 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
 	struct pm8941_pwrkey *pwrkey;
 	bool pull_up;
 	struct device *parent;
+	struct device_node *regmap_node;
+	const __be32 *addr;
 	u32 req_delay;
 	int error;
 
@@ -188,8 +193,10 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
 	pwrkey->data = of_device_get_match_data(&pdev->dev);
 
 	parent = pdev->dev.parent;
+	regmap_node = pdev->dev.of_node;
 	pwrkey->regmap = dev_get_regmap(parent, NULL);
 	if (!pwrkey->regmap) {
+		regmap_node = parent->of_node;
 		/*
 		 * We failed to get regmap for parent. Let's see if we are
 		 * a child of pon node and read regmap and reg from its
@@ -200,15 +207,21 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
 			dev_err(&pdev->dev, "failed to locate regmap\n");
 			return -ENODEV;
 		}
+	}
 
-		error = of_property_read_u32(parent->of_node,
-					     "reg", &pwrkey->baseaddr);
-	} else {
-		error = of_property_read_u32(pdev->dev.of_node, "reg",
-					     &pwrkey->baseaddr);
+	addr = of_get_address(regmap_node, 0, NULL, NULL);
+	if (!addr) {
+		dev_err(&pdev->dev, "reg property missing\n");
+		return -EINVAL;
+	}
+	pwrkey->baseaddr = be32_to_cpup(*addr);
+
+	if (pwrkey->data->has_pon_pbs) {
+		/* PON_PBS base address is optional */
+		addr = of_get_address(regmap_node, 1, NULL, NULL);
+		if (addr)
+			pwrkey->pon_pbs_baseaddr = be32_to_cpup(*addr);
 	}
-	if (error)
-		return error;
 
 	pwrkey->irq = platform_get_irq(pdev, 0);
 	if (pwrkey->irq < 0)
@@ -316,6 +329,7 @@ static const struct pm8941_data pwrkey_data = {
 	.phys = "pm8941_pwrkey/input0",
 	.supports_ps_hold_poff_config = true,
 	.supports_debounce_config = true,
+	.has_pon_pbs = false,
 };
 
 static const struct pm8941_data resin_data = {
@@ -325,6 +339,7 @@ static const struct pm8941_data resin_data = {
 	.phys = "pm8941_resin/input0",
 	.supports_ps_hold_poff_config = true,
 	.supports_debounce_config = true,
+	.has_pon_pbs = false,
 };
 
 static const struct pm8941_data pon_gen3_pwrkey_data = {
@@ -333,6 +348,7 @@ static const struct pm8941_data pon_gen3_pwrkey_data = {
 	.phys = "pmic_pwrkey/input0",
 	.supports_ps_hold_poff_config = false,
 	.supports_debounce_config = false,
+	.has_pon_pbs = true,
 };
 
 static const struct pm8941_data pon_gen3_resin_data = {
@@ -341,6 +357,7 @@ static const struct pm8941_data pon_gen3_resin_data = {
 	.phys = "pmic_resin/input0",
 	.supports_ps_hold_poff_config = false,
 	.supports_debounce_config = false,
+	.has_pon_pbs = true,
 };
 
 static const struct of_device_id pm8941_pwr_key_id_table[] = {
-- 
2.34.1

Re: [PATCH v3 2/4] input: misc: pm8941-pwrkey: add support for PON GEN3 base addresses

[kernel test robot]

Hi Anjelique,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on dtor-input/next]
[also build test WARNING on hid/for-next linux/master linus/master v5.17-rc2 next-20220202]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Anjelique-Melendez/input-misc-pm8941-pwrkey-fix-error-message/20220203-091113
base:   https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next
config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20220203/202202031020.M3pmrtmN-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/11f3823037831d0412ab1a6895c5bcf204a3c3b1
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Anjelique-Melendez/input-misc-pm8941-pwrkey-fix-error-message/20220203-091113
        git checkout 11f3823037831d0412ab1a6895c5bcf204a3c3b1
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=s390 SHELL=/bin/bash drivers/input/misc/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   drivers/input/misc/pm8941-pwrkey.c: In function 'pm8941_pwrkey_probe':
>> drivers/input/misc/pm8941-pwrkey.c:221:41: warning: passing argument 1 of '__be32_to_cpup' makes pointer from integer without a cast [-Wint-conversion]
     221 |         pwrkey->baseaddr = be32_to_cpup(*addr);
         |                                         ^~~~~
         |                                         |
         |                                         __be32 {aka unsigned int}
   In file included from include/linux/byteorder/big_endian.h:5,
                    from arch/s390/include/uapi/asm/byteorder.h:5,
                    from include/asm-generic/bitops/le.h:7,
                    from arch/s390/include/asm/bitops.h:393,
                    from include/linux/bitops.h:33,
                    from include/linux/thread_info.h:27,
                    from arch/s390/include/asm/preempt.h:6,
                    from include/linux/preempt.h:78,
                    from arch/s390/include/asm/percpu.h:5,
                    from include/linux/irqflags.h:17,
                    from include/linux/rcupdate.h:26,
                    from include/linux/rculist.h:11,
                    from include/linux/pid.h:5,
                    from include/linux/sched.h:14,
                    from include/linux/delay.h:23,
                    from drivers/input/misc/pm8941-pwrkey.c:7:
   include/uapi/linux/byteorder/big_endian.h:81:59: note: expected 'const __be32 *' {aka 'const unsigned int *'} but argument is of type '__be32' {aka 'unsigned int'}
      81 | static __always_inline __u32 __be32_to_cpup(const __be32 *p)
         |                                             ~~~~~~~~~~~~~~^
   drivers/input/misc/pm8941-pwrkey.c:227:65: warning: passing argument 1 of '__be32_to_cpup' makes pointer from integer without a cast [-Wint-conversion]
     227 |                         pwrkey->pon_pbs_baseaddr = be32_to_cpup(*addr);
         |                                                                 ^~~~~
         |                                                                 |
         |                                                                 __be32 {aka unsigned int}
   In file included from include/linux/byteorder/big_endian.h:5,
                    from arch/s390/include/uapi/asm/byteorder.h:5,
                    from include/asm-generic/bitops/le.h:7,
                    from arch/s390/include/asm/bitops.h:393,
                    from include/linux/bitops.h:33,
                    from include/linux/thread_info.h:27,
                    from arch/s390/include/asm/preempt.h:6,
                    from include/linux/preempt.h:78,
                    from arch/s390/include/asm/percpu.h:5,
                    from include/linux/irqflags.h:17,
                    from include/linux/rcupdate.h:26,
                    from include/linux/rculist.h:11,
                    from include/linux/pid.h:5,
                    from include/linux/sched.h:14,
                    from include/linux/delay.h:23,
                    from drivers/input/misc/pm8941-pwrkey.c:7:
   include/uapi/linux/byteorder/big_endian.h:81:59: note: expected 'const __be32 *' {aka 'const unsigned int *'} but argument is of type '__be32' {aka 'unsigned int'}
      81 | static __always_inline __u32 __be32_to_cpup(const __be32 *p)
         |                                             ~~~~~~~~~~~~~~^


vim +/__be32_to_cpup +221 drivers/input/misc/pm8941-pwrkey.c

   168	
   169	static SIMPLE_DEV_PM_OPS(pm8941_pwr_key_pm_ops,
   170				 pm8941_pwrkey_suspend, pm8941_pwrkey_resume);
   171	
   172	static int pm8941_pwrkey_probe(struct platform_device *pdev)
   173	{
   174		struct pm8941_pwrkey *pwrkey;
   175		bool pull_up;
   176		struct device *parent;
   177		struct device_node *regmap_node;
   178		const __be32 *addr;
   179		u32 req_delay;
   180		int error;
   181	
   182		if (of_property_read_u32(pdev->dev.of_node, "debounce", &req_delay))
   183			req_delay = 15625;
   184	
   185		if (req_delay > 2000000 || req_delay == 0) {
   186			dev_err(&pdev->dev, "invalid debounce time: %u\n", req_delay);
   187			return -EINVAL;
   188		}
   189	
   190		pull_up = of_property_read_bool(pdev->dev.of_node, "bias-pull-up");
   191	
   192		pwrkey = devm_kzalloc(&pdev->dev, sizeof(*pwrkey), GFP_KERNEL);
   193		if (!pwrkey)
   194			return -ENOMEM;
   195	
   196		pwrkey->dev = &pdev->dev;
   197		pwrkey->data = of_device_get_match_data(&pdev->dev);
   198	
   199		parent = pdev->dev.parent;
   200		regmap_node = pdev->dev.of_node;
   201		pwrkey->regmap = dev_get_regmap(parent, NULL);
   202		if (!pwrkey->regmap) {
   203			regmap_node = parent->of_node;
   204			/*
   205			 * We failed to get regmap for parent. Let's see if we are
   206			 * a child of pon node and read regmap and reg from its
   207			 * parent.
   208			 */
   209			pwrkey->regmap = dev_get_regmap(parent->parent, NULL);
   210			if (!pwrkey->regmap) {
   211				dev_err(&pdev->dev, "failed to locate regmap\n");
   212				return -ENODEV;
   213			}
   214		}
   215	
   216		addr = of_get_address(regmap_node, 0, NULL, NULL);
   217		if (!addr) {
   218			dev_err(&pdev->dev, "reg property missing\n");
   219			return -EINVAL;
   220		}
 > 221		pwrkey->baseaddr = be32_to_cpup(*addr);
   222	
   223		if (pwrkey->data->has_pon_pbs) {
   224			/* PON_PBS base address is optional */
   225			addr = of_get_address(regmap_node, 1, NULL, NULL);
   226			if (addr)
   227				pwrkey->pon_pbs_baseaddr = be32_to_cpup(*addr);
   228		}
   229	
   230		pwrkey->irq = platform_get_irq(pdev, 0);
   231		if (pwrkey->irq < 0)
   232			return pwrkey->irq;
   233	
   234		error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_REV2,
   235				    &pwrkey->revision);
   236		if (error) {
   237			dev_err(&pdev->dev, "failed to read revision: %d\n", error);
   238			return error;
   239		}
   240	
   241		error = of_property_read_u32(pdev->dev.of_node, "linux,code",
   242					     &pwrkey->code);
   243		if (error) {
   244			dev_dbg(&pdev->dev,
   245				"no linux,code assuming power (%d)\n", error);
   246			pwrkey->code = KEY_POWER;
   247		}
   248	
   249		pwrkey->input = devm_input_allocate_device(&pdev->dev);
   250		if (!pwrkey->input) {
   251			dev_dbg(&pdev->dev, "unable to allocate input device\n");
   252			return -ENOMEM;
   253		}
   254	
   255		input_set_capability(pwrkey->input, EV_KEY, pwrkey->code);
   256	
   257		pwrkey->input->name = pwrkey->data->name;
   258		pwrkey->input->phys = pwrkey->data->phys;
   259	
   260		if (pwrkey->data->supports_debounce_config) {
   261			req_delay = (req_delay << 6) / USEC_PER_SEC;
   262			req_delay = ilog2(req_delay);
   263	
   264			error = regmap_update_bits(pwrkey->regmap,
   265						   pwrkey->baseaddr + PON_DBC_CTL,
   266						   PON_DBC_DELAY_MASK,
   267						   req_delay);
   268			if (error) {
   269				dev_err(&pdev->dev, "failed to set debounce: %d\n",
   270					error);
   271				return error;
   272			}
   273		}
   274	
   275		if (pwrkey->data->pull_up_bit) {
   276			error = regmap_update_bits(pwrkey->regmap,
   277						   pwrkey->baseaddr + PON_PULL_CTL,
   278						   pwrkey->data->pull_up_bit,
   279						   pull_up ? pwrkey->data->pull_up_bit :
   280							     0);
   281			if (error) {
   282				dev_err(&pdev->dev, "failed to set pull: %d\n", error);
   283				return error;
   284			}
   285		}
   286	
   287		error = devm_request_threaded_irq(&pdev->dev, pwrkey->irq,
   288						  NULL, pm8941_pwrkey_irq,
   289						  IRQF_ONESHOT,
   290						  pwrkey->data->name, pwrkey);
   291		if (error) {
   292			dev_err(&pdev->dev, "failed requesting IRQ: %d\n", error);
   293			return error;
   294		}
   295	
   296		error = input_register_device(pwrkey->input);
   297		if (error) {
   298			dev_err(&pdev->dev, "failed to register input device: %d\n",
   299				error);
   300			return error;
   301		}
   302	
   303		if (pwrkey->data->supports_ps_hold_poff_config) {
   304			pwrkey->reboot_notifier.notifier_call = pm8941_reboot_notify;
   305			error = register_reboot_notifier(&pwrkey->reboot_notifier);
   306			if (error) {
   307				dev_err(&pdev->dev, "failed to register reboot notifier: %d\n",
   308					error);
   309				return error;
   310			}
   311		}
   312	
   313		platform_set_drvdata(pdev, pwrkey);
   314		device_init_wakeup(&pdev->dev, 1);
   315	
   316		return 0;
   317	}
   318	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

Re: [PATCH v3 2/4] input: misc: pm8941-pwrkey: add support for PON GEN3 base addresses

[kernel test robot]

[-- Attachment #1: Type: text/plain, Size: 10405 bytes --]

Hi Anjelique,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on dtor-input/next]
[also build test WARNING on hid/for-next linux/master linus/master v5.17-rc2 next-20220202]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Anjelique-Melendez/input-misc-pm8941-pwrkey-fix-error-message/20220203-091113
base:   https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git next
config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20220203/202202031020.M3pmrtmN-lkp(a)intel.com/config)
compiler: s390-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/11f3823037831d0412ab1a6895c5bcf204a3c3b1
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Anjelique-Melendez/input-misc-pm8941-pwrkey-fix-error-message/20220203-091113
        git checkout 11f3823037831d0412ab1a6895c5bcf204a3c3b1
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=s390 SHELL=/bin/bash drivers/input/misc/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   drivers/input/misc/pm8941-pwrkey.c: In function 'pm8941_pwrkey_probe':
>> drivers/input/misc/pm8941-pwrkey.c:221:41: warning: passing argument 1 of '__be32_to_cpup' makes pointer from integer without a cast [-Wint-conversion]
     221 |         pwrkey->baseaddr = be32_to_cpup(*addr);
         |                                         ^~~~~
         |                                         |
         |                                         __be32 {aka unsigned int}
   In file included from include/linux/byteorder/big_endian.h:5,
                    from arch/s390/include/uapi/asm/byteorder.h:5,
                    from include/asm-generic/bitops/le.h:7,
                    from arch/s390/include/asm/bitops.h:393,
                    from include/linux/bitops.h:33,
                    from include/linux/thread_info.h:27,
                    from arch/s390/include/asm/preempt.h:6,
                    from include/linux/preempt.h:78,
                    from arch/s390/include/asm/percpu.h:5,
                    from include/linux/irqflags.h:17,
                    from include/linux/rcupdate.h:26,
                    from include/linux/rculist.h:11,
                    from include/linux/pid.h:5,
                    from include/linux/sched.h:14,
                    from include/linux/delay.h:23,
                    from drivers/input/misc/pm8941-pwrkey.c:7:
   include/uapi/linux/byteorder/big_endian.h:81:59: note: expected 'const __be32 *' {aka 'const unsigned int *'} but argument is of type '__be32' {aka 'unsigned int'}
      81 | static __always_inline __u32 __be32_to_cpup(const __be32 *p)
         |                                             ~~~~~~~~~~~~~~^
   drivers/input/misc/pm8941-pwrkey.c:227:65: warning: passing argument 1 of '__be32_to_cpup' makes pointer from integer without a cast [-Wint-conversion]
     227 |                         pwrkey->pon_pbs_baseaddr = be32_to_cpup(*addr);
         |                                                                 ^~~~~
         |                                                                 |
         |                                                                 __be32 {aka unsigned int}
   In file included from include/linux/byteorder/big_endian.h:5,
                    from arch/s390/include/uapi/asm/byteorder.h:5,
                    from include/asm-generic/bitops/le.h:7,
                    from arch/s390/include/asm/bitops.h:393,
                    from include/linux/bitops.h:33,
                    from include/linux/thread_info.h:27,
                    from arch/s390/include/asm/preempt.h:6,
                    from include/linux/preempt.h:78,
                    from arch/s390/include/asm/percpu.h:5,
                    from include/linux/irqflags.h:17,
                    from include/linux/rcupdate.h:26,
                    from include/linux/rculist.h:11,
                    from include/linux/pid.h:5,
                    from include/linux/sched.h:14,
                    from include/linux/delay.h:23,
                    from drivers/input/misc/pm8941-pwrkey.c:7:
   include/uapi/linux/byteorder/big_endian.h:81:59: note: expected 'const __be32 *' {aka 'const unsigned int *'} but argument is of type '__be32' {aka 'unsigned int'}
      81 | static __always_inline __u32 __be32_to_cpup(const __be32 *p)
         |                                             ~~~~~~~~~~~~~~^


vim +/__be32_to_cpup +221 drivers/input/misc/pm8941-pwrkey.c

   168	
   169	static SIMPLE_DEV_PM_OPS(pm8941_pwr_key_pm_ops,
   170				 pm8941_pwrkey_suspend, pm8941_pwrkey_resume);
   171	
   172	static int pm8941_pwrkey_probe(struct platform_device *pdev)
   173	{
   174		struct pm8941_pwrkey *pwrkey;
   175		bool pull_up;
   176		struct device *parent;
   177		struct device_node *regmap_node;
   178		const __be32 *addr;
   179		u32 req_delay;
   180		int error;
   181	
   182		if (of_property_read_u32(pdev->dev.of_node, "debounce", &req_delay))
   183			req_delay = 15625;
   184	
   185		if (req_delay > 2000000 || req_delay == 0) {
   186			dev_err(&pdev->dev, "invalid debounce time: %u\n", req_delay);
   187			return -EINVAL;
   188		}
   189	
   190		pull_up = of_property_read_bool(pdev->dev.of_node, "bias-pull-up");
   191	
   192		pwrkey = devm_kzalloc(&pdev->dev, sizeof(*pwrkey), GFP_KERNEL);
   193		if (!pwrkey)
   194			return -ENOMEM;
   195	
   196		pwrkey->dev = &pdev->dev;
   197		pwrkey->data = of_device_get_match_data(&pdev->dev);
   198	
   199		parent = pdev->dev.parent;
   200		regmap_node = pdev->dev.of_node;
   201		pwrkey->regmap = dev_get_regmap(parent, NULL);
   202		if (!pwrkey->regmap) {
   203			regmap_node = parent->of_node;
   204			/*
   205			 * We failed to get regmap for parent. Let's see if we are
   206			 * a child of pon node and read regmap and reg from its
   207			 * parent.
   208			 */
   209			pwrkey->regmap = dev_get_regmap(parent->parent, NULL);
   210			if (!pwrkey->regmap) {
   211				dev_err(&pdev->dev, "failed to locate regmap\n");
   212				return -ENODEV;
   213			}
   214		}
   215	
   216		addr = of_get_address(regmap_node, 0, NULL, NULL);
   217		if (!addr) {
   218			dev_err(&pdev->dev, "reg property missing\n");
   219			return -EINVAL;
   220		}
 > 221		pwrkey->baseaddr = be32_to_cpup(*addr);
   222	
   223		if (pwrkey->data->has_pon_pbs) {
   224			/* PON_PBS base address is optional */
   225			addr = of_get_address(regmap_node, 1, NULL, NULL);
   226			if (addr)
   227				pwrkey->pon_pbs_baseaddr = be32_to_cpup(*addr);
   228		}
   229	
   230		pwrkey->irq = platform_get_irq(pdev, 0);
   231		if (pwrkey->irq < 0)
   232			return pwrkey->irq;
   233	
   234		error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_REV2,
   235				    &pwrkey->revision);
   236		if (error) {
   237			dev_err(&pdev->dev, "failed to read revision: %d\n", error);
   238			return error;
   239		}
   240	
   241		error = of_property_read_u32(pdev->dev.of_node, "linux,code",
   242					     &pwrkey->code);
   243		if (error) {
   244			dev_dbg(&pdev->dev,
   245				"no linux,code assuming power (%d)\n", error);
   246			pwrkey->code = KEY_POWER;
   247		}
   248	
   249		pwrkey->input = devm_input_allocate_device(&pdev->dev);
   250		if (!pwrkey->input) {
   251			dev_dbg(&pdev->dev, "unable to allocate input device\n");
   252			return -ENOMEM;
   253		}
   254	
   255		input_set_capability(pwrkey->input, EV_KEY, pwrkey->code);
   256	
   257		pwrkey->input->name = pwrkey->data->name;
   258		pwrkey->input->phys = pwrkey->data->phys;
   259	
   260		if (pwrkey->data->supports_debounce_config) {
   261			req_delay = (req_delay << 6) / USEC_PER_SEC;
   262			req_delay = ilog2(req_delay);
   263	
   264			error = regmap_update_bits(pwrkey->regmap,
   265						   pwrkey->baseaddr + PON_DBC_CTL,
   266						   PON_DBC_DELAY_MASK,
   267						   req_delay);
   268			if (error) {
   269				dev_err(&pdev->dev, "failed to set debounce: %d\n",
   270					error);
   271				return error;
   272			}
   273		}
   274	
   275		if (pwrkey->data->pull_up_bit) {
   276			error = regmap_update_bits(pwrkey->regmap,
   277						   pwrkey->baseaddr + PON_PULL_CTL,
   278						   pwrkey->data->pull_up_bit,
   279						   pull_up ? pwrkey->data->pull_up_bit :
   280							     0);
   281			if (error) {
   282				dev_err(&pdev->dev, "failed to set pull: %d\n", error);
   283				return error;
   284			}
   285		}
   286	
   287		error = devm_request_threaded_irq(&pdev->dev, pwrkey->irq,
   288						  NULL, pm8941_pwrkey_irq,
   289						  IRQF_ONESHOT,
   290						  pwrkey->data->name, pwrkey);
   291		if (error) {
   292			dev_err(&pdev->dev, "failed requesting IRQ: %d\n", error);
   293			return error;
   294		}
   295	
   296		error = input_register_device(pwrkey->input);
   297		if (error) {
   298			dev_err(&pdev->dev, "failed to register input device: %d\n",
   299				error);
   300			return error;
   301		}
   302	
   303		if (pwrkey->data->supports_ps_hold_poff_config) {
   304			pwrkey->reboot_notifier.notifier_call = pm8941_reboot_notify;
   305			error = register_reboot_notifier(&pwrkey->reboot_notifier);
   306			if (error) {
   307				dev_err(&pdev->dev, "failed to register reboot notifier: %d\n",
   308					error);
   309				return error;
   310			}
   311		}
   312	
   313		platform_set_drvdata(pdev, pwrkey);
   314		device_init_wakeup(&pdev->dev, 1);
   315	
   316		return 0;
   317	}
   318	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

Re: [PATCH v3 2/4] input: misc: pm8941-pwrkey: add support for PON GEN3 base addresses

[Stephen Boyd]

Quoting Anjelique Melendez (2022-02-02 17:08:05)
> diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
> index e0240db12d4f..2a42a676b021 100644
> --- a/drivers/input/misc/pm8941-pwrkey.c
> +++ b/drivers/input/misc/pm8941-pwrkey.c
> @@ -200,15 +207,21 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
>                         dev_err(&pdev->dev, "failed to locate regmap\n");
>                         return -ENODEV;
>                 }
> +       }
>
> -               error = of_property_read_u32(parent->of_node,
> -                                            "reg", &pwrkey->baseaddr);
> -       } else {
> -               error = of_property_read_u32(pdev->dev.of_node, "reg",
> -                                            &pwrkey->baseaddr);
> +       addr = of_get_address(regmap_node, 0, NULL, NULL);
> +       if (!addr) {
> +               dev_err(&pdev->dev, "reg property missing\n");
> +               return -EINVAL;
> +       }
> +       pwrkey->baseaddr = be32_to_cpup(*addr);
> +
> +       if (pwrkey->data->has_pon_pbs) {
> +               /* PON_PBS base address is optional */
> +               addr = of_get_address(regmap_node, 1, NULL, NULL);
> +               if (addr)
> +                       pwrkey->pon_pbs_baseaddr = be32_to_cpup(*addr);

With the deref dropped.

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

Re: [PATCH v3 2/4] input: misc: pm8941-pwrkey: add support for PON GEN3 base addresses

[Anjelique Melendez]

On 2/3/2022 1:16 PM, Stephen Boyd wrote:
> Quoting Anjelique Melendez (2022-02-02 17:08:05)
>> diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
>> index e0240db12d4f..2a42a676b021 100644
>> --- a/drivers/input/misc/pm8941-pwrkey.c
>> +++ b/drivers/input/misc/pm8941-pwrkey.c
>> @@ -200,15 +207,21 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
>>                         dev_err(&pdev->dev, "failed to locate regmap\n");
>>                         return -ENODEV;
>>                 }
>> +       }
>>
>> -               error = of_property_read_u32(parent->of_node,
>> -                                            "reg", &pwrkey->baseaddr);
>> -       } else {
>> -               error = of_property_read_u32(pdev->dev.of_node, "reg",
>> -                                            &pwrkey->baseaddr);
>> +       addr = of_get_address(regmap_node, 0, NULL, NULL);
>> +       if (!addr) {
>> +               dev_err(&pdev->dev, "reg property missing\n");
>> +               return -EINVAL;
>> +       }
>> +       pwrkey->baseaddr = be32_to_cpup(*addr);
>> +
>> +       if (pwrkey->data->has_pon_pbs) {
>> +               /* PON_PBS base address is optional */
>> +               addr = of_get_address(regmap_node, 1, NULL, NULL);
>> +               if (addr)
>> +                       pwrkey->pon_pbs_baseaddr = be32_to_cpup(*addr);
> 
> With the deref dropped.
> 
> Reviewed-by: Stephen Boyd <swboyd@chromium.org>

ACK

[PATCH v3 3/4] input: misc: pm8941-pwrkey: add software key press debouncing support

[Anjelique Melendez]

From: David Collins <collinsd@codeaurora.org>

On certain PMICs, an unexpected assertion of KPDPWR_DEB (the
positive logic hardware debounced power key signal) may be seen
during the falling edge of KPDPWR_N (i.e. a power key press) when
it occurs close to the rising edge of SLEEP_CLK.  This then
triggers a spurious KPDPWR interrupt.

Handle this issue by adding software debouncing support to ignore
key events that occur within the hardware debounce delay after the
most recent key release event.

Signed-off-by: David Collins <collinsd@codeaurora.org>
Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
---
 drivers/input/misc/pm8941-pwrkey.c | 80 +++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 6 deletions(-)

diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
index 2a42a676b021..4768a542777d 100644
--- a/drivers/input/misc/pm8941-pwrkey.c
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -9,6 +9,7 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/ktime.h>
 #include <linux/log2.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -20,6 +21,16 @@
 
 #define PON_REV2			0x01
 
+#define PON_SUBTYPE			0x05
+
+#define PON_SUBTYPE_PRIMARY		0x01
+#define PON_SUBTYPE_SECONDARY		0x02
+#define PON_SUBTYPE_1REG		0x03
+#define PON_SUBTYPE_GEN2_PRIMARY	0x04
+#define PON_SUBTYPE_GEN2_SECONDARY	0x05
+#define PON_SUBTYPE_GEN3_PBS		0x08
+#define PON_SUBTYPE_GEN3_HLOS		0x09
+
 #define PON_RT_STS			0x10
 #define  PON_KPDPWR_N_SET		BIT(0)
 #define  PON_RESIN_N_SET		BIT(1)
@@ -59,9 +70,12 @@ struct pm8941_pwrkey {
 	struct input_dev *input;
 
 	unsigned int revision;
+	unsigned int subtype;
 	struct notifier_block reboot_notifier;
 
 	u32 code;
+	u32 sw_debounce_time_us;
+	ktime_t sw_debounce_end_time;
 	const struct pm8941_data *data;
 };
 
@@ -128,20 +142,63 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data)
 {
 	struct pm8941_pwrkey *pwrkey = _data;
 	unsigned int sts;
-	int error;
+	int err;
 
-	error = regmap_read(pwrkey->regmap,
-			    pwrkey->baseaddr + PON_RT_STS, &sts);
-	if (error)
+	if (pwrkey->sw_debounce_time_us) {
+		if (ktime_before(ktime_get(), pwrkey->sw_debounce_end_time)) {
+			dev_dbg(pwrkey->dev, "ignoring key event received before debounce end %llu us\n",
+				pwrkey->sw_debounce_end_time);
+			return IRQ_HANDLED;
+		}
+	}
+
+	err = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_RT_STS, &sts);
+	if (err)
 		return IRQ_HANDLED;
 
-	input_report_key(pwrkey->input, pwrkey->code,
-			 sts & pwrkey->data->status_bit);
+	sts &= pwrkey->data->status_bit;
+
+	if (pwrkey->sw_debounce_time_us && !sts)
+		pwrkey->sw_debounce_end_time = ktime_add_us(ktime_get(),
+						pwrkey->sw_debounce_time_us);
+
+	input_report_key(pwrkey->input, pwrkey->code, sts);
 	input_sync(pwrkey->input);
 
 	return IRQ_HANDLED;
 }
 
+static int pm8941_pwrkey_sw_debounce_init(struct pm8941_pwrkey *pwrkey)
+{
+	unsigned int val, addr, mask;
+	int error;
+
+	if (pwrkey->data->has_pon_pbs && !pwrkey->pon_pbs_baseaddr) {
+		dev_err(pwrkey->dev, "PON_PBS address missing, can't read HW debounce time\n");
+		return 0;
+	}
+
+	if (pwrkey->pon_pbs_baseaddr)
+		addr = pwrkey->pon_pbs_baseaddr + PON_DBC_CTL;
+	else
+		addr = pwrkey->baseaddr + PON_DBC_CTL;
+	error = regmap_read(pwrkey->regmap, addr, &val);
+	if (error)
+		return error;
+
+	if (pwrkey->subtype >= PON_SUBTYPE_GEN2_PRIMARY)
+		mask = 0xf;
+	else
+		mask = 0x7;
+
+	pwrkey->sw_debounce_time_us = 2 * USEC_PER_SEC / (1 << (mask - (val & mask)));
+
+	dev_dbg(pwrkey->dev, "SW debounce time = %u us\n",
+		pwrkey->sw_debounce_time_us);
+
+	return 0;
+}
+
 static int __maybe_unused pm8941_pwrkey_suspend(struct device *dev)
 {
 	struct pm8941_pwrkey *pwrkey = dev_get_drvdata(dev);
@@ -234,6 +291,13 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
 		return error;
 	}
 
+	error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_SUBTYPE,
+			    &pwrkey->subtype);
+	if (error) {
+		dev_err(&pdev->dev, "failed to read subtype: %d\n", error);
+		return error;
+	}
+
 	error = of_property_read_u32(pdev->dev.of_node, "linux,code",
 				     &pwrkey->code);
 	if (error) {
@@ -268,6 +332,10 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)
 		}
 	}
 
+	error = pm8941_pwrkey_sw_debounce_init(pwrkey);
+	if (error)
+		return error;
+
 	if (pwrkey->data->pull_up_bit) {
 		error = regmap_update_bits(pwrkey->regmap,
 					   pwrkey->baseaddr + PON_PULL_CTL,
-- 
2.34.1

Re: [PATCH v3 3/4] input: misc: pm8941-pwrkey: add software key press debouncing support

[Stephen Boyd]

Quoting Anjelique Melendez (2022-02-02 17:08:07)
> From: David Collins <collinsd@codeaurora.org>
>
> On certain PMICs, an unexpected assertion of KPDPWR_DEB (the
> positive logic hardware debounced power key signal) may be seen
> during the falling edge of KPDPWR_N (i.e. a power key press) when
> it occurs close to the rising edge of SLEEP_CLK.  This then
> triggers a spurious KPDPWR interrupt.
>
> Handle this issue by adding software debouncing support to ignore
> key events that occur within the hardware debounce delay after the
> most recent key release event.
>
> Signed-off-by: David Collins <collinsd@codeaurora.org>
> Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
> ---

Is there a Fixes tag that should be here? Is it a new problem with newer
PMICs?

Re: [PATCH v3 3/4] input: misc: pm8941-pwrkey: add software key press debouncing support

[Anjelique Melendez]

On 2/3/2022 1:20 PM, Stephen Boyd wrote:
> Quoting Anjelique Melendez (2022-02-02 17:08:07)
>> From: David Collins <collinsd@codeaurora.org>
>>
>> On certain PMICs, an unexpected assertion of KPDPWR_DEB (the
>> positive logic hardware debounced power key signal) may be seen
>> during the falling edge of KPDPWR_N (i.e. a power key press) when
>> it occurs close to the rising edge of SLEEP_CLK.  This then
>> triggers a spurious KPDPWR interrupt.
>>
>> Handle this issue by adding software debouncing support to ignore
>> key events that occur within the hardware debounce delay after the
>> most recent key release event.
>>
>> Signed-off-by: David Collins <collinsd@codeaurora.org>
>> Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
>> ---
> 
> Is there a Fixes tag that should be here? Is it a new problem with newer
> PMICs?

There is no Fixes tag since this is a workaround for a HW bug. Yes, this is a relatively new problem
with the past few PMICs. Starting with PM8450, we need this workaround in pm8941-pwrkey
since we are no longer using an older downstream driver that had an equivalent work around.

[PATCH v3 4/4] input: misc: pm8941-pwrkey: simulate missed key press events

[Anjelique Melendez]

From: David Collins <collinsd@codeaurora.org>

The status of the keys connected to the KPDPWR_N and RESIN_N pins
is identified by reading corresponding bits in the interrupt real
time status register.  If the status has changed by the time that
the interrupt is handled then a press event will be missed.

Maintain a last known status variable to find unbalanced release
events and simulate press events for each accordingly.

Signed-off-by: David Collins <collinsd@codeaurora.org>
Signed-off-by: Anjelique Melendez <quic_amelende@quicinc.com>
---
 drivers/input/misc/pm8941-pwrkey.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
index 4768a542777d..60de6581af21 100644
--- a/drivers/input/misc/pm8941-pwrkey.c
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -76,6 +76,7 @@ struct pm8941_pwrkey {
 	u32 code;
 	u32 sw_debounce_time_us;
 	ktime_t sw_debounce_end_time;
+	bool last_status;
 	const struct pm8941_data *data;
 };
 
@@ -162,6 +163,16 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data)
 		pwrkey->sw_debounce_end_time = ktime_add_us(ktime_get(),
 						pwrkey->sw_debounce_time_us);
 
+	/*
+	 * Simulate a press event in case a release event occurred without a
+	 * corresponding press event.
+	 */
+	if (!pwrkey->last_status && !sts) {
+		input_report_key(pwrkey->input, pwrkey->code, 1);
+		input_sync(pwrkey->input);
+	}
+	pwrkey->last_status = sts;
+
 	input_report_key(pwrkey->input, pwrkey->code, sts);
 	input_sync(pwrkey->input);
 
-- 
2.34.1