| Message ID | 1496123686-3376-1-git-send-email-gwshan@linux.vnet.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2017-05-30 at 15:54 +1000, Gavin Shan wrote: > When powering off the PCI slot, the corresponding bits should > be set to 0bxx00xx00 instead of 0bxx11xx11. Otherwise, the > specified PCI slot can't be put into power-off state. Fortunately, > it didn't introduce any side-effects so far. I am not familiar with the HW bits so assuming that is correct... Ack. > Cc: stable # 5.3.0+ > Fixes: 6884fe63ba1e ("platforms/ibm-fsp: Support PCI slot") > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > --- > platforms/ibm-fsp/firenze-pci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/platforms/ibm-fsp/firenze-pci.c b/platforms/ibm-fsp/firenze-pci.c > index 0a93387..828ab0f 100644 > --- a/platforms/ibm-fsp/firenze-pci.c > +++ b/platforms/ibm-fsp/firenze-pci.c > @@ -836,13 +836,13 @@ static void firenze_pci_setup_power_mgt(struct pci_slot *slot, > plat_slot->power_status = &firenze_pci_slots[buddy].power_status; > plat_slot->power_mask = 0x33; > plat_slot->power_on = 0x22; > - plat_slot->power_off = 0x33; > + plat_slot->power_off = 0; > break; > case 1: > plat_slot->power_status = &firenze_pci_slots[buddy].power_status; > plat_slot->power_mask = 0xcc; > plat_slot->power_on = 0x88; > - plat_slot->power_off = 0xcc; > + plat_slot->power_off = 0; > break; > default: > prlog(PR_DEBUG, "%016llx: Invalid channel %d\n",
Gavin Shan <gwshan@linux.vnet.ibm.com> writes: > When powering off the PCI slot, the corresponding bits should > be set to 0bxx00xx00 instead of 0bxx11xx11. Otherwise, the > specified PCI slot can't be put into power-off state. Fortunately, > it didn't introduce any side-effects so far. > > Cc: stable # 5.3.0+ > Fixes: 6884fe63ba1e ("platforms/ibm-fsp: Support PCI slot") > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > --- > platforms/ibm-fsp/firenze-pci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks! Series merged: master as of 72540af036218373a16c4d15dbb0583c46b0b328 skiboot-5.4.x as of 40f3130aaa221b13546dabf6f3262980105187a6 I just cut the other day a 5.4.6 for an upcoming service pack due very shortly. Is this patch particularly urgent for it? It looks like it could wait until the next one.
On Fri, Jun 16, 2017 at 03:12:30PM +1000, Stewart Smith wrote: >Gavin Shan <gwshan@linux.vnet.ibm.com> writes: >> When powering off the PCI slot, the corresponding bits should >> be set to 0bxx00xx00 instead of 0bxx11xx11. Otherwise, the >> specified PCI slot can't be put into power-off state. Fortunately, >> it didn't introduce any side-effects so far. >> >> Cc: stable # 5.3.0+ >> Fixes: 6884fe63ba1e ("platforms/ibm-fsp: Support PCI slot") >> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >> --- >> platforms/ibm-fsp/firenze-pci.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > >Thanks! Series merged: >master as of 72540af036218373a16c4d15dbb0583c46b0b328 >skiboot-5.4.x as of 40f3130aaa221b13546dabf6f3262980105187a6 > >I just cut the other day a 5.4.6 for an upcoming service pack due very >shortly. Is this patch particularly urgent for it? It looks like it >could wait until the next one. > Nope, it's not urgent. Cheers, Gavin
diff --git a/platforms/ibm-fsp/firenze-pci.c b/platforms/ibm-fsp/firenze-pci.c index 0a93387..828ab0f 100644 --- a/platforms/ibm-fsp/firenze-pci.c +++ b/platforms/ibm-fsp/firenze-pci.c @@ -836,13 +836,13 @@ static void firenze_pci_setup_power_mgt(struct pci_slot *slot, plat_slot->power_status = &firenze_pci_slots[buddy].power_status; plat_slot->power_mask = 0x33; plat_slot->power_on = 0x22; - plat_slot->power_off = 0x33; + plat_slot->power_off = 0; break; case 1: plat_slot->power_status = &firenze_pci_slots[buddy].power_status; plat_slot->power_mask = 0xcc; plat_slot->power_on = 0x88; - plat_slot->power_off = 0xcc; + plat_slot->power_off = 0; break; default: prlog(PR_DEBUG, "%016llx: Invalid channel %d\n",
When powering off the PCI slot, the corresponding bits should be set to 0bxx00xx00 instead of 0bxx11xx11. Otherwise, the specified PCI slot can't be put into power-off state. Fortunately, it didn't introduce any side-effects so far. Cc: stable # 5.3.0+ Fixes: 6884fe63ba1e ("platforms/ibm-fsp: Support PCI slot") Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- platforms/ibm-fsp/firenze-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)