niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

usb: typec: ucsi: fix UCSI on buggy Qualcomm devices

Browse source 
On sevral Qualcomm platforms (SC8180X, SM8350, SC8280XP) a call to
UCSI_GET_PDOS for non-PD partners will cause a firmware crash with no
easy way to recover from it. Since we have no easy way to determine
whether the partner really has PD support, shortcut UCSI_GET_PDOS on
such platforms. This allows us to enable UCSI support on such devices.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231025115620.905538-2-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2023-10-25 14:49:29 +03:00 • committed by Bjorn Andersson
parent 6da02af3f9
commit 1d103d6af2
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/usb/typec/ucsi/ucsi.c
View file

@ -578,6 +578,9 @@ static int ucsi_read_pdos(struct ucsi_connector *con,
u64 command; u64 command;
int ret; int ret;
if (ucsi->quirks & UCSI_NO_PARTNER_PDOS)
return 0;
command = UCSI_COMMAND(UCSI_GET_PDOS) | UCSI_CONNECTOR_NUMBER(con->num); command = UCSI_COMMAND(UCSI_GET_PDOS) | UCSI_CONNECTOR_NUMBER(con->num);
command |= UCSI_GET_PDOS_PARTNER_PDO(is_partner); command |= UCSI_GET_PDOS_PARTNER_PDO(is_partner);
command |= UCSI_GET_PDOS_PDO_OFFSET(offset); command |= UCSI_GET_PDOS_PDO_OFFSET(offset);

3
drivers/usb/typec/ucsi/ucsi.h
View file

@ -317,6 +317,9 @@ struct ucsi {
#define EVENT_PENDING 0 #define EVENT_PENDING 0
#define COMMAND_PENDING 1 #define COMMAND_PENDING 1
#define ACK_PENDING 2 #define ACK_PENDING 2
unsigned long quirks;
#define UCSI_NO_PARTNER_PDOS BIT(0) /* Don't read partner's PDOs */
}; };
#define UCSI_MAX_SVID 5 #define UCSI_MAX_SVID 5

13
drivers/usb/typec/ucsi/ucsi_glink.c
View file

@ -6,6 +6,7 @@
#include <linux/auxiliary_bus.h> #include <linux/auxiliary_bus.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/of_device.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/soc/qcom/pdr.h> #include <linux/soc/qcom/pdr.h>
#include <linux/usb/typec_mux.h> #include <linux/usb/typec_mux.h>
@ -296,11 +297,19 @@ static void pmic_glink_ucsi_destroy(void *data)
mutex_unlock(&ucsi->lock); mutex_unlock(&ucsi->lock);
} }
static const struct of_device_id pmic_glink_ucsi_of_quirks[] = {
{ .compatible = "qcom,sc8180x-pmic-glink", .data = (void *)UCSI_NO_PARTNER_PDOS, },
{ .compatible = "qcom,sc8280xp-pmic-glink", .data = (void *)UCSI_NO_PARTNER_PDOS, },
{ .compatible = "qcom,sm8350-pmic-glink", .data = (void *)UCSI_NO_PARTNER_PDOS, },
{}
};
static int pmic_glink_ucsi_probe(struct auxiliary_device *adev, static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
const struct auxiliary_device_id *id) const struct auxiliary_device_id *id)
{ {
struct pmic_glink_ucsi *ucsi; struct pmic_glink_ucsi *ucsi;
struct device *dev = &adev->dev; struct device *dev = &adev->dev;
const struct of_device_id *match;
struct fwnode_handle *fwnode; struct fwnode_handle *fwnode;
int ret; int ret;
@ -327,6 +336,10 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
if (ret) if (ret)
return ret; return ret;
match = of_match_device(pmic_glink_ucsi_of_quirks, dev->parent);
if (match)
ucsi->ucsi->quirks = (unsigned long)match->data;
ucsi_set_drvdata(ucsi->ucsi, ucsi); ucsi_set_drvdata(ucsi->ucsi, ucsi);
device_for_each_child_node(dev, fwnode) { device_for_each_child_node(dev, fwnode) {