Commit 2573f684 authored by Milton Miller's avatar Milton Miller Committed by Benjamin Herrenschmidt

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

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: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 64ac822f
...@@ -665,9 +665,12 @@ static void remove_ddw(struct device_node *np) ...@@ -665,9 +665,12 @@ static void remove_ddw(struct device_node *np)
ddr_avail = of_get_property(np, "ibm,ddw-applicable", &len); ddr_avail = of_get_property(np, "ibm,ddw-applicable", &len);
win64 = of_find_property(np, DIRECT64_PROPNAME, NULL); win64 = of_find_property(np, DIRECT64_PROPNAME, NULL);
if (!win64 || !ddr_avail || len < 3 * sizeof(u32)) if (!win64)
return; return;
if (!ddr_avail || len < 3 * sizeof(u32) || win64->length < sizeof(*dwp))
goto delprop;
dwp = win64->value; dwp = win64->value;
liobn = (u64)be32_to_cpu(dwp->liobn); liobn = (u64)be32_to_cpu(dwp->liobn);
...@@ -690,8 +693,13 @@ static void remove_ddw(struct device_node *np) ...@@ -690,8 +693,13 @@ static void remove_ddw(struct device_node *np)
pr_debug("%s: successfully removed direct window: rtas returned " pr_debug("%s: successfully removed direct window: rtas returned "
"%d to ibm,remove-pe-dma-window(%x) %llx\n", "%d to ibm,remove-pe-dma-window(%x) %llx\n",
np->full_name, ret, ddr_avail[2], liobn); 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) static u64 dupe_ddw_if_already_created(struct pci_dev *dev, struct device_node *pdn)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment