Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/ncsi: Introduce NCSI_RESERVED_CHANNEL

Browse Source 
This defines NCSI_RESERVED_CHANNEL as the reserved NCSI channel
ID (0x1f). No logical changes introduced.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gavin Shan 2016-10-04 11:25:48 +11:00 committed by David S. Miller
parent d8cedaabe7
commit bc7e0f50aa
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/ncsi/internal.h
View File

@ -170,6 +170,7 @@ struct ncsi_package;
#define NCSI_PACKAGE_SHIFT 5 #define NCSI_PACKAGE_SHIFT 5
#define NCSI_PACKAGE_INDEX(c) (((c) >> NCSI_PACKAGE_SHIFT) & 0x7) #define NCSI_PACKAGE_INDEX(c) (((c) >> NCSI_PACKAGE_SHIFT) & 0x7)
#define NCSI_RESERVED_CHANNEL 0x1f
#define NCSI_CHANNEL_INDEX(c) ((c) & ((1 << NCSI_PACKAGE_SHIFT) - 1)) #define NCSI_CHANNEL_INDEX(c) ((c) & ((1 << NCSI_PACKAGE_SHIFT) - 1))
#define NCSI_TO_CHANNEL(p, c) (((p) << NCSI_PACKAGE_SHIFT) | (c)) #define NCSI_TO_CHANNEL(p, c) (((p) << NCSI_PACKAGE_SHIFT) | (c))

14
net/ncsi/ncsi-manage.c
View File

@ -542,7 +542,7 @@ static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp)
nca.package = np->id; nca.package = np->id;
if (nd->state == ncsi_dev_state_suspend_select) { if (nd->state == ncsi_dev_state_suspend_select) {
nca.type = NCSI_PKT_CMD_SP; nca.type = NCSI_PKT_CMD_SP;
nca.channel = 0x1f; nca.channel = NCSI_RESERVED_CHANNEL;
if (ndp->flags & NCSI_DEV_HWA) if (ndp->flags & NCSI_DEV_HWA)
nca.bytes[0] = 0; nca.bytes[0] = 0;
else else
@ -559,7 +559,7 @@ static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp)
nd->state = ncsi_dev_state_suspend_deselect; nd->state = ncsi_dev_state_suspend_deselect;
} else if (nd->state == ncsi_dev_state_suspend_deselect) { } else if (nd->state == ncsi_dev_state_suspend_deselect) {
nca.type = NCSI_PKT_CMD_DP; nca.type = NCSI_PKT_CMD_DP;
nca.channel = 0x1f; nca.channel = NCSI_RESERVED_CHANNEL;
nd->state = ncsi_dev_state_suspend_done; nd->state = ncsi_dev_state_suspend_done;
} }
@ -608,7 +608,7 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp)
else else
nca.bytes[0] = 1; nca.bytes[0] = 1;
nca.package = np->id; nca.package = np->id;
nca.channel = 0x1f; nca.channel = NCSI_RESERVED_CHANNEL;
ret = ncsi_xmit_cmd(&nca); ret = ncsi_xmit_cmd(&nca);
if (ret) if (ret)
goto error; goto error;
@ -834,7 +834,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
/* Deselect all possible packages */ /* Deselect all possible packages */
nca.type = NCSI_PKT_CMD_DP; nca.type = NCSI_PKT_CMD_DP;
nca.channel = 0x1f; nca.channel = NCSI_RESERVED_CHANNEL;
for (index = 0; index < 8; index++) { for (index = 0; index < 8; index++) {
nca.package = index; nca.package = index;
ret = ncsi_xmit_cmd(&nca); ret = ncsi_xmit_cmd(&nca);
@ -850,7 +850,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
/* Select all possible packages */ /* Select all possible packages */
nca.type = NCSI_PKT_CMD_SP; nca.type = NCSI_PKT_CMD_SP;
nca.bytes[0] = 1; nca.bytes[0] = 1;
nca.channel = 0x1f; nca.channel = NCSI_RESERVED_CHANNEL;
for (index = 0; index < 8; index++) { for (index = 0; index < 8; index++) {
nca.package = index; nca.package = index;
ret = ncsi_xmit_cmd(&nca); ret = ncsi_xmit_cmd(&nca);
@ -903,7 +903,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
nca.type = NCSI_PKT_CMD_SP; nca.type = NCSI_PKT_CMD_SP;
nca.bytes[0] = 1; nca.bytes[0] = 1;
nca.package = ndp->active_package->id; nca.package = ndp->active_package->id;
nca.channel = 0x1f; nca.channel = NCSI_RESERVED_CHANNEL;
ret = ncsi_xmit_cmd(&nca); ret = ncsi_xmit_cmd(&nca);
if (ret) if (ret)
goto error; goto error;
@ -960,7 +960,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
/* Deselect the active package */ /* Deselect the active package */
nca.type = NCSI_PKT_CMD_DP; nca.type = NCSI_PKT_CMD_DP;
nca.package = ndp->active_package->id; nca.package = ndp->active_package->id;
nca.channel = 0x1f; nca.channel = NCSI_RESERVED_CHANNEL;
ret = ncsi_xmit_cmd(&nca); ret = ncsi_xmit_cmd(&nca);
if (ret) if (ret)
goto error; goto error;