[2/4] usb: ucsi: Add quirk infrastructure
Commit Message
Allow bus drivers to specify quirks for the UCSI core on
attach. Allow the user to override the quirks on the command
line.
Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
---
Documentation/admin-guide/kernel-parameters.txt | 5 +++++
drivers/usb/typec/ucsi/ucsi.c | 12 +++++++++++-
drivers/usb/typec/ucsi/ucsi.h | 6 +++++-
drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +-
drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +-
drivers/usb/typec/ucsi/ucsi_glink.c | 2 +-
drivers/usb/typec/ucsi/ucsi_stm32g0.c | 2 +-
7 files changed, 25 insertions(+), 6 deletions(-)
Comments
On Sun, Jan 07, 2024 at 01:16:59AM +0100, Christian A. Ehrhardt wrote:
> Allow bus drivers to specify quirks for the UCSI core on
> attach. Allow the user to override the quirks on the command
> line.
>
> Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
> ---
> Documentation/admin-guide/kernel-parameters.txt | 5 +++++
> drivers/usb/typec/ucsi/ucsi.c | 12 +++++++++++-
> drivers/usb/typec/ucsi/ucsi.h | 6 +++++-
> drivers/usb/typec/ucsi/ucsi_acpi.c | 2 +-
> drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +-
> drivers/usb/typec/ucsi/ucsi_glink.c | 2 +-
> drivers/usb/typec/ucsi/ucsi_stm32g0.c | 2 +-
> 7 files changed, 25 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index 0a6a4b7f7a3b..fd8152dd4450 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -6783,6 +6783,11 @@
> <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
> See also Documentation/input/devices/joystick-parport.rst
>
> + typec_ucsi.quirks= [USB]
> + A hex value specifying the quirks to enable for
> + the USB Type-C connector system software interface
> + driver. This overrides auto detected quirks.
New module parameters are not going to be accepted.
Please just fix the issue with Dell's first like I proposed, and then
you can start thinking about the infra for the quirks.
thanks,
@@ -6783,6 +6783,11 @@
<port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
See also Documentation/input/devices/joystick-parport.rst
+ typec_ucsi.quirks= [USB]
+ A hex value specifying the quirks to enable for
+ the USB Type-C connector system software interface
+ driver. This overrides auto detected quirks.
+
udbg-immortal [PPC] When debugging early kernel crashes that
happen after console_init() and before a proper
console driver takes over, this boot options might
@@ -36,6 +36,11 @@
*/
#define UCSI_SWAP_TIMEOUT_MS 5000
+/* Override for auto detected quirks. */
+static unsigned int quirk_override = ~0U;
+module_param_named(quirks, quirk_override, uint, S_IRUGO);
+MODULE_PARM_DESC(quirks, "Override quirks for UCSI");
+
static int ucsi_acknowledge_command(struct ucsi *ucsi)
{
u64 ctrl;
@@ -1507,7 +1512,8 @@ EXPORT_SYMBOL_GPL(ucsi_set_drvdata);
* @dev: Device interface to the PPM (Platform Policy Manager)
* @ops: I/O routines
*/
-struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops)
+struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops,
+ unsigned int quirks)
{
struct ucsi *ucsi;
@@ -1523,6 +1529,10 @@ struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops)
mutex_init(&ucsi->ppm_lock);
ucsi->dev = dev;
ucsi->ops = ops;
+ if (quirk_override != ~0U)
+ ucsi->quirks = quirk_override;
+ else
+ ucsi->quirks = quirks;
return ucsi;
}
@@ -57,7 +57,8 @@ struct ucsi_operations {
struct ucsi_altmode *updated);
};
-struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops);
+struct ucsi *ucsi_create(struct device *dev, const struct ucsi_operations *ops,
+ unsigned int quirks);
void ucsi_destroy(struct ucsi *ucsi);
int ucsi_register(struct ucsi *ucsi);
void ucsi_unregister(struct ucsi *ucsi);
@@ -317,6 +318,9 @@ struct ucsi {
#define EVENT_PENDING 0
#define COMMAND_PENDING 1
#define ACK_PENDING 2
+
+ /* Enabled quirks. */
+ unsigned int quirks;
};
#define UCSI_MAX_SVID 5
@@ -185,7 +185,7 @@ static int ucsi_acpi_probe(struct platform_device *pdev)
if (dmi_check_system(zenbook_dmi_id))
ops = &ucsi_zenbook_ops;
- ua->ucsi = ucsi_create(&pdev->dev, ops);
+ ua->ucsi = ucsi_create(&pdev->dev, ops, 0);
if (IS_ERR(ua->ucsi))
return PTR_ERR(ua->ucsi);
@@ -1387,7 +1387,7 @@ static int ucsi_ccg_probe(struct i2c_client *client)
if (uc->info.mode & CCG_DEVINFO_PDPORTS_MASK)
uc->port_num++;
- uc->ucsi = ucsi_create(dev, &ucsi_ccg_ops);
+ uc->ucsi = ucsi_create(dev, &ucsi_ccg_ops, 0);
if (IS_ERR(uc->ucsi))
return PTR_ERR(uc->ucsi);
@@ -318,7 +318,7 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
init_completion(&ucsi->sync_ack);
mutex_init(&ucsi->lock);
- ucsi->ucsi = ucsi_create(dev, &pmic_glink_ucsi_ops);
+ ucsi->ucsi = ucsi_create(dev, &pmic_glink_ucsi_ops, 0);
if (IS_ERR(ucsi->ucsi))
return PTR_ERR(ucsi->ucsi);
@@ -641,7 +641,7 @@ static int ucsi_stm32g0_probe(struct i2c_client *client)
init_completion(&g0->complete);
i2c_set_clientdata(client, g0);
- g0->ucsi = ucsi_create(dev, &ucsi_stm32g0_ops);
+ g0->ucsi = ucsi_create(dev, &ucsi_stm32g0_ops, 0);
if (IS_ERR(g0->ucsi))
return PTR_ERR(g0->ucsi);