Unverified Commit f2437e48 authored by Jon Flatley's avatar Jon Flatley Committed by Benson Leung
Browse files

power: supply: cros-ec-usbpd-charger: Fix host events 



There's a bug on ACPI platforms where host events from the ECPD ACPI
device never make their way to the cros-ec-usbpd-charger driver. This
makes it so the only time the charger driver updates its state is when
user space accesses its sysfs attributes.

Now that these events have been unified into a single notifier chain on
both ACPI and non-ACPI platforms, update the charger driver to use this
new notifier.

Reviewed-by: default avatarBenson Leung <bleung@chromium.org>
Co-Developed-by: default avatarPrashant Malani <pmalani@chromium.org>
Signed-off-by: default avatarJon Flatley <jflat@chromium.org>
Signed-off-by: default avatarPrashant Malani <pmalani@chromium.org>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
parent ec2daf6e

drivers/power/supply/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ config CHARGER_RT9455 


config CHARGER_CROS_USBPD

	tristate "ChromeOS EC based USBPD charger"

	depends on CROS_EC

	depends on CROS_USBPD_NOTIFY

	default n

	help

	  Say Y here to enable ChromeOS EC based USBPD charger

drivers/power/supply/cros_usbpd-charger.c

+18 −32
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/module.h>

#include <linux/platform_data/cros_ec_commands.h>

#include <linux/platform_data/cros_ec_proto.h>

#include <linux/platform_data/cros_usbpd_notify.h>

#include <linux/platform_device.h>

#include <linux/power_supply.h>

#include <linux/slab.h>
@@ -517,32 +518,21 @@ static int cros_usbpd_charger_property_is_writeable(struct power_supply *psy, 
}



static int cros_usbpd_charger_ec_event(struct notifier_block *nb,

				       unsigned long queued_during_suspend,

				       unsigned long host_event,

				       void *_notify)

{

	struct cros_ec_device *ec_device;

	struct charger_data *charger;

	u32 host_event;

	struct charger_data *charger = container_of(nb, struct charger_data,

						    notifier);



	charger = container_of(nb, struct charger_data, notifier);

	ec_device = charger->ec_device;



	host_event = cros_ec_get_host_event(ec_device);

	if (host_event & EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)) {

	cros_usbpd_charger_power_changed(charger->ports[0]->psy);

	return NOTIFY_OK;

	} else {

		return NOTIFY_DONE;

	}

}



static void cros_usbpd_charger_unregister_notifier(void *data)

{

	struct charger_data *charger = data;

	struct cros_ec_device *ec_device = charger->ec_device;



	blocking_notifier_chain_unregister(&ec_device->event_notifier,

					   &charger->notifier);

	cros_usbpd_unregister_notify(&charger->notifier);

}



static int cros_usbpd_charger_probe(struct platform_device *pd)
@@ -676,12 +666,9 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) 
		goto fail;

	}



	if (ec_device->mkbp_event_supported) {

	/* Get PD events from the EC */

	charger->notifier.notifier_call = cros_usbpd_charger_ec_event;

		ret = blocking_notifier_chain_register(

						&ec_device->event_notifier,

						&charger->notifier);

	ret = cros_usbpd_register_notify(&charger->notifier);

	if (ret < 0) {

		dev_warn(dev, "failed to register notifier\n");

	} else {
@@ -691,7 +678,6 @@ static int cros_usbpd_charger_probe(struct platform_device *pd) 
		if (ret < 0)

			goto fail;

	}

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE