qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: typec: tcpci: use GENMASK() for TCPC_TRANSMIT register fields 

JIRA: https://issues.redhat.com/browse/RHEL-59052

commit 7cd41974d2c81055f61ba9f69e31c02e866716e0
Author: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@linaro.org>
Date: Wed, 10 Jul 2024 11:36:14 +0100

  Convert all fields from register TCPC_TRANSMIT to using GENMASK() and
  FIELD_PREP() so as to keep using a similar approach throughout the code
  base and make it arguably easier to read.

  Signed-off-by: André Draszik <andre.draszik@linaro.org>
  Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
  Link: https://lore.kernel.org/r/20240710-tcpc-cleanup-v1-7-0ec1f41f4263@linaro.org
  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Desnes Nunes <desnesn@redhat.com>
This commit is contained in:
Desnes Nunes 2024-11-28 16:53:11 -03:00
parent 778aba359b
commit ab57cdac01
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/typec/tcpm/tcpci.c
View File

@ -607,8 +607,11 @@ static int tcpci_pd_transmit(struct tcpc_dev *tcpc, enum tcpm_transmit_type type
}
/* nRetryCount is 3 in PD2.0 spec where 2 in PD3.0 spec */
reg = ((negotiated_rev > PD_REV20 ? PD_RETRY_COUNT_3_0_OR_HIGHER : PD_RETRY_COUNT_DEFAULT)
<< TCPC_TRANSMIT_RETRY_SHIFT) | (type << TCPC_TRANSMIT_TYPE_SHIFT);
reg = FIELD_PREP(TCPC_TRANSMIT_RETRY,
(negotiated_rev > PD_REV20
? PD_RETRY_COUNT_3_0_OR_HIGHER
: PD_RETRY_COUNT_DEFAULT));
reg |= FIELD_PREP(TCPC_TRANSMIT_TYPE, type);
ret = regmap_write(tcpci->regmap, TCPC_TRANSMIT, reg);
if (ret < 0)
return ret;

6
include/linux/usb/tcpci.h
View File

@ -148,10 +148,8 @@
#define TCPC_RX_DATA 0x34 /* through 0x4f */
#define TCPC_TRANSMIT 0x50
#define TCPC_TRANSMIT_RETRY_SHIFT 4
#define TCPC_TRANSMIT_RETRY_MASK 0x3
#define TCPC_TRANSMIT_TYPE_SHIFT 0
#define TCPC_TRANSMIT_TYPE_MASK 0x7
#define TCPC_TRANSMIT_RETRY GENMASK(5, 4)
#define TCPC_TRANSMIT_TYPE GENMASK(2, 0)
#define TCPC_TX_BYTE_CNT 0x51
#define TCPC_TX_HDR 0x52