luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/pseries/iommu: Remove ddw property when destroying window

Browse Source 
If we destroy the window, we need to remove the property recording that
we setup the window.  Otherwise the next kernel we kexec will be
confused.

Also we should remove the property if even if we don't find the
ibm,ddw-applicable window or if one of the property sizes is unexpected;
presumably these came from a prior kernel via kexec, and we will not be
maintaining the window with respect to memory hotplug.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Milton Miller 2011-05-11 12:24:58 +00:00 committed by Benjamin Herrenschmidt
parent 64ac822fb4
commit 2573f68422
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/platforms/pseries/iommu.c
View File

@ -665,9 +665,12 @@ static void remove_ddw(struct device_node *np)
ddr_avail = of_get_property(np, "ibm,ddw-applicable", &len);
win64 = of_find_property(np, DIRECT64_PROPNAME, NULL);
if (!win64 || !ddr_avail || len < 3 * sizeof(u32))
if (!win64)
return;
if (!ddr_avail || len < 3 * sizeof(u32) || win64->length < sizeof(*dwp))
goto delprop;
dwp = win64->value;
liobn = (u64)be32_to_cpu(dwp->liobn);
@ -690,8 +693,13 @@ static void remove_ddw(struct device_node *np)
pr_debug("%s: successfully removed direct window: rtas returned "
"%d to ibm,remove-pe-dma-window(%x) %llx\n",
np->full_name, ret, ddr_avail[2], liobn);
}
delprop:
ret = of_remove_property(np, win64);
if (ret)
pr_warning("%s: failed to remove direct window property: %d\n"
np->full_name, ret);
}
static u64 dupe_ddw_if_already_created(struct pci_dev *dev, struct device_node *pdn)
{