| Message ID | 1475030915-9525-2-git-send-email-gwshan@linux.vnet.ibm.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Wed, 2016-09-28 at 12:48 +1000, Gavin Shan wrote: > 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> > --- > net/ncsi/internal.h | 1 + > net/ncsi/ncsi-manage.c | 14 +++++++------- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h > index 549846b..0a5c580 100644 > --- a/net/ncsi/internal.h > +++ b/net/ncsi/internal.h > @@ -170,6 +170,7 @@ struct ncsi_package; > > #define NCSI_PACKAGE_SHIFT 5 > #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_TO_CHANNEL(p, c) (((p) << NCSI_PACKAGE_SHIFT) | > (c)) > > diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c > index b325c1d..b03d1df 100644 > --- a/net/ncsi/ncsi-manage.c > +++ b/net/ncsi/ncsi-manage.c > @@ -529,7 +529,7 @@ static void ncsi_suspend_channel(struct > ncsi_dev_priv *ndp) > nca.package = np->id; > if (nd->state == ncsi_dev_state_suspend_select) { > nca.type = NCSI_PKT_CMD_SP; > - nca.channel = 0x1f; > + nca.channel = NCSI_RESERVED_CHANNEL; > if (ndp->flags & NCSI_DEV_HWA) > nca.bytes[0] = 0; > else > @@ -546,7 +546,7 @@ static void ncsi_suspend_channel(struct > ncsi_dev_priv *ndp) > nd->state = ncsi_dev_state_suspend_deselect; > } else if (nd->state == > ncsi_dev_state_suspend_deselect) { > nca.type = NCSI_PKT_CMD_DP; > - nca.channel = 0x1f; > + nca.channel = NCSI_RESERVED_CHANNEL; > nd->state = ncsi_dev_state_suspend_done; > } > > @@ -592,7 +592,7 @@ static void ncsi_configure_channel(struct > ncsi_dev_priv *ndp) > else > nca.bytes[0] = 1; > nca.package = np->id; > - nca.channel = 0x1f; > + nca.channel = NCSI_RESERVED_CHANNEL; > ret = ncsi_xmit_cmd(&nca); > if (ret) > goto error; > @@ -810,7 +810,7 @@ static void ncsi_probe_channel(struct > ncsi_dev_priv *ndp) > > /* Deselect all possible packages */ > nca.type = NCSI_PKT_CMD_DP; > - nca.channel = 0x1f; > + nca.channel = NCSI_RESERVED_CHANNEL; > for (index = 0; index < 8; index++) { > nca.package = index; > ret = ncsi_xmit_cmd(&nca); > @@ -826,7 +826,7 @@ static void ncsi_probe_channel(struct > ncsi_dev_priv *ndp) > /* Select all possible packages */ > nca.type = NCSI_PKT_CMD_SP; > nca.bytes[0] = 1; > - nca.channel = 0x1f; > + nca.channel = NCSI_RESERVED_CHANNEL; > for (index = 0; index < 8; index++) { > nca.package = index; > ret = ncsi_xmit_cmd(&nca); > @@ -879,7 +879,7 @@ static void ncsi_probe_channel(struct > ncsi_dev_priv *ndp) > nca.type = NCSI_PKT_CMD_SP; > nca.bytes[0] = 1; > nca.package = ndp->active_package->id; > - nca.channel = 0x1f; > + nca.channel = NCSI_RESERVED_CHANNEL; > ret = ncsi_xmit_cmd(&nca); > if (ret) > goto error; > @@ -936,7 +936,7 @@ static void ncsi_probe_channel(struct > ncsi_dev_priv *ndp) > /* Deselect the active package */ > nca.type = NCSI_PKT_CMD_DP; > nca.package = ndp->active_package->id; > - nca.channel = 0x1f; > + nca.channel = NCSI_RESERVED_CHANNEL; > ret = ncsi_xmit_cmd(&nca); > if (ret) > goto error; >
diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h index 549846b..0a5c580 100644 --- a/net/ncsi/internal.h +++ b/net/ncsi/internal.h @@ -170,6 +170,7 @@ struct ncsi_package; #define NCSI_PACKAGE_SHIFT 5 #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_TO_CHANNEL(p, c) (((p) << NCSI_PACKAGE_SHIFT) | (c)) diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index b325c1d..b03d1df 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -529,7 +529,7 @@ static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp) nca.package = np->id; if (nd->state == ncsi_dev_state_suspend_select) { nca.type = NCSI_PKT_CMD_SP; - nca.channel = 0x1f; + nca.channel = NCSI_RESERVED_CHANNEL; if (ndp->flags & NCSI_DEV_HWA) nca.bytes[0] = 0; else @@ -546,7 +546,7 @@ static void ncsi_suspend_channel(struct ncsi_dev_priv *ndp) nd->state = ncsi_dev_state_suspend_deselect; } else if (nd->state == ncsi_dev_state_suspend_deselect) { nca.type = NCSI_PKT_CMD_DP; - nca.channel = 0x1f; + nca.channel = NCSI_RESERVED_CHANNEL; nd->state = ncsi_dev_state_suspend_done; } @@ -592,7 +592,7 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) else nca.bytes[0] = 1; nca.package = np->id; - nca.channel = 0x1f; + nca.channel = NCSI_RESERVED_CHANNEL; ret = ncsi_xmit_cmd(&nca); if (ret) goto error; @@ -810,7 +810,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp) /* Deselect all possible packages */ nca.type = NCSI_PKT_CMD_DP; - nca.channel = 0x1f; + nca.channel = NCSI_RESERVED_CHANNEL; for (index = 0; index < 8; index++) { nca.package = index; ret = ncsi_xmit_cmd(&nca); @@ -826,7 +826,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp) /* Select all possible packages */ nca.type = NCSI_PKT_CMD_SP; nca.bytes[0] = 1; - nca.channel = 0x1f; + nca.channel = NCSI_RESERVED_CHANNEL; for (index = 0; index < 8; index++) { nca.package = index; ret = ncsi_xmit_cmd(&nca); @@ -879,7 +879,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp) nca.type = NCSI_PKT_CMD_SP; nca.bytes[0] = 1; nca.package = ndp->active_package->id; - nca.channel = 0x1f; + nca.channel = NCSI_RESERVED_CHANNEL; ret = ncsi_xmit_cmd(&nca); if (ret) goto error; @@ -936,7 +936,7 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp) /* Deselect the active package */ nca.type = NCSI_PKT_CMD_DP; nca.package = ndp->active_package->id; - nca.channel = 0x1f; + nca.channel = NCSI_RESERVED_CHANNEL; ret = ncsi_xmit_cmd(&nca); if (ret) goto error;
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> --- net/ncsi/internal.h | 1 + net/ncsi/ncsi-manage.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-)