forked from luck/tmp_suning_uos_patched
powerpc/pseries: iommu cleanup
No need to initialize per-cpu pointer to NULL, it is the default. Direct dma ops and no setup are the defaults, no need to set for iommu-off. Signed-off-by: Milton Miller <miltonm@bga.com> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Reviewed-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
34c4d01255
commit
a8daac8a51
|
@ -140,7 +140,7 @@ static int tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static DEFINE_PER_CPU(u64 *, tce_page) = NULL;
|
||||
static DEFINE_PER_CPU(u64 *, tce_page);
|
||||
|
||||
static int tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
|
||||
long npages, unsigned long uaddr,
|
||||
|
@ -589,13 +589,8 @@ static struct notifier_block iommu_reconfig_nb = {
|
|||
/* These are called very early. */
|
||||
void iommu_init_early_pSeries(void)
|
||||
{
|
||||
if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL)) {
|
||||
/* Direct I/O, IOMMU off */
|
||||
ppc_md.pci_dma_dev_setup = NULL;
|
||||
ppc_md.pci_dma_bus_setup = NULL;
|
||||
set_pci_dma_ops(&dma_direct_ops);
|
||||
if (of_chosen && of_get_property(of_chosen, "linux,iommu-off", NULL))
|
||||
return;
|
||||
}
|
||||
|
||||
if (firmware_has_feature(FW_FEATURE_LPAR)) {
|
||||
if (firmware_has_feature(FW_FEATURE_MULTITCE)) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user