Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106095
b: refs/heads/master
c: 7886250
h: refs/heads/master
i:
  106093: 90a1438
  106091: 2006058
  106087: 6ac6b5b
  106079: 20a7612
v: v3
  • Loading branch information
Mark Nelson authored and Benjamin Herrenschmidt committed Jul 25, 2008
1 parent 508c6a0 commit 58318a9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d6a61bfc06d6f2248f3e75f208d64e794082013c
refs/heads/master: 7886250e9d71b24d0205ac6798ee855fb3836318
13 changes: 12 additions & 1 deletion trunk/arch/powerpc/platforms/cell/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1150,12 +1150,23 @@ static int iommu_fixed_disabled;

static int __init setup_iommu_fixed(char *str)
{
struct device_node *pciep;

if (strcmp(str, "off") == 0)
iommu_fixed_disabled = 1;

else if (strcmp(str, "weak") == 0)
/* If we can find a pcie-endpoint in the device tree assume that
* we're on a triblade or a CAB so by default the fixed mapping
* should be set to be weakly ordered; but only if the boot
* option WASN'T set for strong ordering
*/
pciep = of_find_node_by_type(NULL, "pcie-endpoint");

if (strcmp(str, "weak") == 0 || (pciep && strcmp(str, "strong") != 0))
iommu_fixed_is_weak = 1;

of_node_put(pciep);

return 1;
}
__setup("iommu_fixed=", setup_iommu_fixed);
Expand Down

0 comments on commit 58318a9

Please sign in to comment.