Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 00:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

thunderbolt: Rework NFC credits handling

Browse Source 
NFC (non flow control) credits is actually 20-bit field so update
tb_port_add_nfc_credits() to handle this properly. This allows us to set
NFC credits for Display Port path in subsequent patches.

Also make sure the function does not update the hardware if the
underlying switch is already unplugged.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Mika Westerberg 2018-10-11 11:38:22 +03:00
parent e78db6f08b
commit c5ee6feb34
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/thunderbolt/switch.c
View File

@ -537,14 +537,20 @@ int tb_wait_for_port(struct tb_port *port, bool wait_if_unplugged)
*/ */
int tb_port_add_nfc_credits(struct tb_port *port, int credits) int tb_port_add_nfc_credits(struct tb_port *port, int credits)
{ {
if (credits == 0) u32 nfc_credits;
if (credits == 0 || port->sw->is_unplugged)
return 0; return 0;
tb_port_info(port,
"adding %#x NFC credits (%#x -> %#x)", nfc_credits = port->config.nfc_credits & TB_PORT_NFC_CREDITS_MASK;
credits, nfc_credits += credits;
port->config.nfc_credits,
port->config.nfc_credits + credits); tb_port_dbg(port, "adding %d NFC credits to %lu",
port->config.nfc_credits += credits; credits, port->config.nfc_credits & TB_PORT_NFC_CREDITS_MASK);
port->config.nfc_credits &= ~TB_PORT_NFC_CREDITS_MASK;
port->config.nfc_credits |= nfc_credits;
return tb_port_write(port, &port->config.nfc_credits, return tb_port_write(port, &port->config.nfc_credits,
TB_CFG_PORT, 4, 1); TB_CFG_PORT, 4, 1);
} }

3
drivers/thunderbolt/tb_regs.h
View File

@ -211,6 +211,9 @@ struct tb_regs_port_header {
} __packed; } __packed;
/* DWORD 4 */
#define TB_PORT_NFC_CREDITS_MASK GENMASK(19, 0)
/* PCIe adapter registers */ /* PCIe adapter registers */
#define TB_PCI_EN BIT(31) #define TB_PCI_EN BIT(31)