Mercurial > illumos > illumos-gate
changeset 12622:e018bcda4475
6943052 Unable to configure IB PEM for Jumilla blade
| author | Alan Adamson, SD OSSD <Alan.Adamson@Sun.COM> |
|---|---|
| date | Mon, 14 Jun 2010 15:51:53 -0700 |
| parents | 67c30502d363 |
| children | 1249c549d0f6 |
| files | usr/src/uts/intel/io/hotplug/pcicfg/pcicfg.c usr/src/uts/sun4/io/pcicfg.c |
| diffstat | 2 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/intel/io/hotplug/pcicfg/pcicfg.c Mon Jun 14 12:34:59 2010 -0600 +++ b/usr/src/uts/intel/io/hotplug/pcicfg/pcicfg.c Mon Jun 14 15:51:53 2010 -0700 @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -609,6 +608,15 @@ "[0x%x] slot [0x%x] func [0x%x]\n", bus, trans_device, func &7); + /* + * When walking the list of ARI functions + * we don't expect to see a non-present + * function, so we will stop walking + * the function list. + */ + if (ari_mode == B_TRUE) + break; + if (func) goto next; break;
--- a/usr/src/uts/sun4/io/pcicfg.c Mon Jun 14 12:34:59 2010 -0600 +++ b/usr/src/uts/sun4/io/pcicfg.c Mon Jun 14 15:51:53 2010 -0700 @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -770,6 +769,16 @@ DEBUG3("no device : bus " "[0x%x] slot [0x%x] func [0x%x]\n", bus, trans_device, func & 7); + + /* + * When walking the list of ARI functions + * we don't expect to see a non-present + * function, so we will stop walking + * the function list. + */ + if (ari_mode == B_TRUE) + break; + if (func) goto next; break;