powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test
PATCH 1/1 powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test
Some versions pHyp will perform the adjunct partition test before the ANDCOND test. The result of this is that H_RESOURCE can be returned and cause the BUG_ON condition to occur. The HPTE is not removed. So add a check for H_RESOURCE, it is ok if this HPTE is not removed as pSeries_lpar_hpte_remove is looking for an HPTE to remove and not a specific HPTE to remove. So it is ok to just move on to the next slot and try again.
Signed-off-by Michael Wolf <[email protected]>
---
arch/powerpc/platforms/pseries/lpar.c +7 -1
@@ -185,7 +185,13 @@ static long pSeries_lpar_hpte_remove(unsigned long hpte_group) (0x1UL << 4), &dummy1, &dummy2);if (lpar_rc ==H_SUCCESS )return i; -BUG_ON (lpar_rc !=H_NOT_FOUND ); + +/* +* The test for adjunct partition is performed before the +* ANDCOND test. H_RESOURCE may be returned, so we need to +* check for that as well. +*/ +BUG_ON (lpar_rc !=H_NOT_FOUND && lpar_rc !=H_RESOURCE ); slot_offset++; slot_offset &=0x7 ;