From: Sing-Han Chen <[email protected]>
For the CCGx, when the OPM field in the INTR_REG is cleared, then the
CCI data in the PPM is reset.
To align with the CCGx UCSI interface guide, this patch updates the
driver to copy CCI and MESSAGE_IN before clearing UCSI interrupt.
When a new command is sent, the driver will clear the old CCI and
MESSAGE_IN copy.
Finally, clear UCSI_READ_INT before calling complete() to ensure that
the ucsi_ccg_sync_write() would wait for the interrupt handling to
complete.
It prevents the driver from resetting CCI prematurely.
Signed-off-by: Sing-Han Chen <[email protected]>
Signed-off-by: Haotien Hsu <[email protected]>
---
drivers/usb/typec/ucsi/ucsi_ccg.c | 84 ++++++++++++++++++++++++++++---
1 file changed, 78 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index eab3012e1b01..f59494aae6b9 100644
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -192,6 +192,12 @@ struct ucsi_ccg_altmode {
bool checked;
} __packed;
+#define CCGX_MESSAGE_IN_MAX 4
+struct op_region {
+ u32 cci;
+ u32 message_in[CCGX_MESSAGE_IN_MAX];
+};
+
struct ucsi_ccg {
struct device *dev;
struct ucsi *ucsi;
@@ -222,6 +228,9 @@ struct ucsi_ccg {
bool has_multiple_dp;
struct ucsi_ccg_altmode orig[UCSI_MAX_ALTMODES];
struct ucsi_ccg_altmode updated[UCSI_MAX_ALTMODES];
+
+ spinlock_t op_lock;
+ struct op_region op_data;
};
static int ccg_read(struct ucsi_ccg *uc, u16 rab, u8 *data, u32 len)
@@ -305,12 +314,57 @@ static int ccg_write(struct ucsi_ccg *uc, u16 rab, const u8 *data, u32 len)
return 0;
}
+static void ccg_op_region_read(struct ucsi_ccg *uc, unsigned int offset,
+ void *val, size_t val_len)
+{
+ struct op_region *data = &uc->op_data;
+
+ spin_lock(&uc->op_lock);
+ if (offset == UCSI_CCI)
+ memcpy(val, &data->cci, val_len);
+ else if (offset == UCSI_MESSAGE_IN)
+ memcpy(val, &data->message_in, val_len);
+ spin_unlock(&uc->op_lock);
+}
+
+static void ccg_op_region_update(struct ucsi_ccg *uc, u32 cci)
+{
+ u16 reg = CCGX_RAB_UCSI_DATA_BLOCK(UCSI_MESSAGE_IN);
+ struct op_region *data = &uc->op_data;
+ u32 message_in[CCGX_MESSAGE_IN_MAX];
+
+ if (UCSI_CCI_LENGTH(cci))
+ if (ccg_read(uc, reg, (void *)&message_in,
+ sizeof(message_in))) {
+ dev_err(uc->dev, "failed to read MESSAGE_IN\n");
+ return;
+ }
+
+ spin_lock(&uc->op_lock);
+ memcpy(&data->cci, &cci, sizeof(cci));
+ if (UCSI_CCI_LENGTH(cci))
+ memcpy(&data->message_in, &message_in, sizeof(message_in));
+ spin_unlock(&uc->op_lock);
+}
+
+static void ccg_op_region_clean(struct ucsi_ccg *uc)
+{
+ struct op_region *data = &uc->op_data;
+
+ spin_lock(&uc->op_lock);
+ memset(&data->cci, 0, sizeof(data->cci));
+ memset(&data->message_in, 0, sizeof(data->message_in));
+ spin_unlock(&uc->op_lock);
+}
+
static int ucsi_ccg_init(struct ucsi_ccg *uc)
{
unsigned int count = 10;
u8 data;
int status;
+ spin_lock_init(&uc->op_lock);
+
data = CCGX_RAB_UCSI_CONTROL_STOP;
status = ccg_write(uc, CCGX_RAB_UCSI_CONTROL, &data, sizeof(data));
if (status < 0)
@@ -520,9 +574,13 @@ static int ucsi_ccg_read(struct ucsi *ucsi, unsigned int offset,
u16 reg = CCGX_RAB_UCSI_DATA_BLOCK(offset);
struct ucsi_capability *cap;
struct ucsi_altmode *alt;
- int ret;
+ int ret = 0;
+
+ if ((offset == UCSI_CCI) || (offset == UCSI_MESSAGE_IN))
+ ccg_op_region_read(uc, offset, val, val_len);
+ else
+ ret = ccg_read(uc, reg, val, val_len);
- ret = ccg_read(uc, reg, val, val_len);
if (ret)
return ret;
@@ -559,9 +617,13 @@ static int ucsi_ccg_read(struct ucsi *ucsi, unsigned int offset,
static int ucsi_ccg_async_write(struct ucsi *ucsi, unsigned int offset,
const void *val, size_t val_len)
{
+ struct ucsi_ccg *uc = ucsi_get_drvdata(ucsi);
u16 reg = CCGX_RAB_UCSI_DATA_BLOCK(offset);
- return ccg_write(ucsi_get_drvdata(ucsi), reg, val, val_len);
+ if (offset == UCSI_CONTROL)
+ ccg_op_region_clean(uc);
+
+ return ccg_write(uc, reg, val, val_len);
}
static int ucsi_ccg_sync_write(struct ucsi *ucsi, unsigned int offset,
@@ -622,6 +684,11 @@ static irqreturn_t ccg_irq_handler(int irq, void *data)
if (ret)
return ret;
+ if (!intr_reg)
+ return IRQ_HANDLED;
+ else if (!(intr_reg & UCSI_READ_INT))
+ goto err_clear_irq;
+
ret = ccg_read(uc, reg, (void *)&cci, sizeof(cci));
if (ret)
goto err_clear_irq;
@@ -629,13 +696,18 @@ static irqreturn_t ccg_irq_handler(int irq, void *data)
if (UCSI_CCI_CONNECTOR(cci))
ucsi_connector_change(uc->ucsi, UCSI_CCI_CONNECTOR(cci));
- if (test_bit(DEV_CMD_PENDING, &uc->flags) &&
- cci & (UCSI_CCI_ACK_COMPLETE | UCSI_CCI_COMMAND_COMPLETE))
- complete(&uc->complete);
+ /* As per CCGx UCSI interface guide, copy CCI and MESSAGE_IN
+ * to the OpRegion before clear the UCSI interrupt
+ */
+ ccg_op_region_update(uc, cci);
err_clear_irq:
ccg_write(uc, CCGX_RAB_INTR_REG, &intr_reg, sizeof(intr_reg));
+ if (!ret && test_bit(DEV_CMD_PENDING, &uc->flags) &&
+ cci & (UCSI_CCI_ACK_COMPLETE | UCSI_CCI_COMMAND_COMPLETE))
+ complete(&uc->complete);
+
return IRQ_HANDLED;
}
--
2.25.1
Hi Haotien,
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Haotien-Hsu/ucsi_ccg-Refine-the-UCSI-Interrupt-handling/20221221-163923
base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
patch link: https://lore.kernel.org/r/20221221083812.3363045-1-haotienh%40nvidia.com
patch subject: [PATCH] ucsi_ccg: Refine the UCSI Interrupt handling
config: x86_64-randconfig-m001-20221226
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Reported-by: Dan Carpenter <[email protected]>
smatch warnings:
drivers/usb/typec/ucsi/ucsi_ccg.c:708 ccg_irq_handler() error: uninitialized symbol 'cci'.
vim +/cci +708 drivers/usb/typec/ucsi/ucsi_ccg.c
247c554a14aa16 Ajay Gupta 2018-10-26 675 static irqreturn_t ccg_irq_handler(int irq, void *data)
247c554a14aa16 Ajay Gupta 2018-10-26 676 {
e32fd989ac1c45 Heikki Krogerus 2019-11-04 677 u16 reg = CCGX_RAB_UCSI_DATA_BLOCK(UCSI_CCI);
247c554a14aa16 Ajay Gupta 2018-10-26 678 struct ucsi_ccg *uc = data;
e32fd989ac1c45 Heikki Krogerus 2019-11-04 679 u8 intr_reg;
e32fd989ac1c45 Heikki Krogerus 2019-11-04 680 u32 cci;
e32fd989ac1c45 Heikki Krogerus 2019-11-04 681 int ret;
e32fd989ac1c45 Heikki Krogerus 2019-11-04 682
e32fd989ac1c45 Heikki Krogerus 2019-11-04 683 ret = ccg_read(uc, CCGX_RAB_INTR_REG, &intr_reg, sizeof(intr_reg));
e32fd989ac1c45 Heikki Krogerus 2019-11-04 684 if (ret)
e32fd989ac1c45 Heikki Krogerus 2019-11-04 685 return ret;
e32fd989ac1c45 Heikki Krogerus 2019-11-04 686
e65232d7f1fccd Sing-Han Chen 2022-12-21 687 if (!intr_reg)
e65232d7f1fccd Sing-Han Chen 2022-12-21 688 return IRQ_HANDLED;
e65232d7f1fccd Sing-Han Chen 2022-12-21 689 else if (!(intr_reg & UCSI_READ_INT))
e65232d7f1fccd Sing-Han Chen 2022-12-21 690 goto err_clear_irq;
cci is uninitialized on this goto.
e65232d7f1fccd Sing-Han Chen 2022-12-21 691
e32fd989ac1c45 Heikki Krogerus 2019-11-04 692 ret = ccg_read(uc, reg, (void *)&cci, sizeof(cci));
e32fd989ac1c45 Heikki Krogerus 2019-11-04 693 if (ret)
e32fd989ac1c45 Heikki Krogerus 2019-11-04 694 goto err_clear_irq;
e32fd989ac1c45 Heikki Krogerus 2019-11-04 695
e32fd989ac1c45 Heikki Krogerus 2019-11-04 696 if (UCSI_CCI_CONNECTOR(cci))
e32fd989ac1c45 Heikki Krogerus 2019-11-04 697 ucsi_connector_change(uc->ucsi, UCSI_CCI_CONNECTOR(cci));
247c554a14aa16 Ajay Gupta 2018-10-26 698
e65232d7f1fccd Sing-Han Chen 2022-12-21 699 /* As per CCGx UCSI interface guide, copy CCI and MESSAGE_IN
e65232d7f1fccd Sing-Han Chen 2022-12-21 700 * to the OpRegion before clear the UCSI interrupt
e65232d7f1fccd Sing-Han Chen 2022-12-21 701 */
e65232d7f1fccd Sing-Han Chen 2022-12-21 702 ccg_op_region_update(uc, cci);
e32fd989ac1c45 Heikki Krogerus 2019-11-04 703
e32fd989ac1c45 Heikki Krogerus 2019-11-04 704 err_clear_irq:
e32fd989ac1c45 Heikki Krogerus 2019-11-04 705 ccg_write(uc, CCGX_RAB_INTR_REG, &intr_reg, sizeof(intr_reg));
247c554a14aa16 Ajay Gupta 2018-10-26 706
e65232d7f1fccd Sing-Han Chen 2022-12-21 707 if (!ret && test_bit(DEV_CMD_PENDING, &uc->flags) &&
e65232d7f1fccd Sing-Han Chen 2022-12-21 @708 cci & (UCSI_CCI_ACK_COMPLETE | UCSI_CCI_COMMAND_COMPLETE))
e65232d7f1fccd Sing-Han Chen 2022-12-21 709 complete(&uc->complete);
e65232d7f1fccd Sing-Han Chen 2022-12-21 710
247c554a14aa16 Ajay Gupta 2018-10-26 711 return IRQ_HANDLED;
247c554a14aa16 Ajay Gupta 2018-10-26 712 }
--
0-DAY CI Kernel Test Service
https://01.org/lkp