diff options
author | Bryan O'Sullivan <bos@pathscale.com> | 2006-08-25 14:24:29 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2006-09-22 18:22:28 -0400 |
commit | ba11203a11835737df980ef3dd3bd8325b9cc94e (patch) | |
tree | 67c444e4989fcd7e883d0be2d495817b9767e5c6 | |
parent | 8e280d94e29af67035637fb957daba7ae0d23583 (diff) |
IB/ipath: fix handling of kpiobufs
Change comment: no longer imply that user can set ipath_kpiobufs to zero.
Actually set ipath_kpiobufs from parameter. Previously only altered
per-device ipath_lastport_piobuf, which was over-written in chip init.
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_init_chip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c index c63de8f0fa9e..75c372136702 100644 --- a/drivers/infiniband/hw/ipath/ipath_init_chip.c +++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c | |||
@@ -691,7 +691,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) | |||
691 | dd->ipath_pioavregs = ALIGN(val, sizeof(u64) * BITS_PER_BYTE / 2) | 691 | dd->ipath_pioavregs = ALIGN(val, sizeof(u64) * BITS_PER_BYTE / 2) |
692 | / (sizeof(u64) * BITS_PER_BYTE / 2); | 692 | / (sizeof(u64) * BITS_PER_BYTE / 2); |
693 | if (ipath_kpiobufs == 0) { | 693 | if (ipath_kpiobufs == 0) { |
694 | /* not set by user, or set explictly to default */ | 694 | /* not set by user (this is default) */ |
695 | if ((dd->ipath_piobcnt2k + dd->ipath_piobcnt4k) > 128) | 695 | if ((dd->ipath_piobcnt2k + dd->ipath_piobcnt4k) > 128) |
696 | kpiobufs = 32; | 696 | kpiobufs = 32; |
697 | else | 697 | else |
@@ -950,6 +950,7 @@ static int ipath_set_kpiobufs(const char *str, struct kernel_param *kp) | |||
950 | dd->ipath_piobcnt2k + dd->ipath_piobcnt4k - val; | 950 | dd->ipath_piobcnt2k + dd->ipath_piobcnt4k - val; |
951 | } | 951 | } |
952 | 952 | ||
953 | ipath_kpiobufs = val; | ||
953 | ret = 0; | 954 | ret = 0; |
954 | bail: | 955 | bail: |
955 | spin_unlock_irqrestore(&ipath_devs_lock, flags); | 956 | spin_unlock_irqrestore(&ipath_devs_lock, flags); |