Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c1368fc authored by Daniel Axtens's avatar Daniel Axtens Committed by Michael Ellerman
Browse files

powerpc/cell: Move controller ops from ppc_md to controller_ops 



This moves the Cell platform to use the pci_controller_ops
structure rather than ppc_md for PCI controller operations.

Signed-off-by: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 97884e00

arch/powerpc/platforms/cell/cell.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Cell Platform common data structures

 *

 * Copyright 2015, Daniel Axtens, IBM Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2, or (at your option)

 * any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 */



#ifndef CELL_H

#define CELL_H



#include <asm/pci-bridge.h>



extern struct pci_controller_ops cell_pci_controller_ops;



#endif

arch/powerpc/platforms/cell/iommu.c

+4 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <asm/firmware.h>

#include <asm/cell-regs.h>



#include "cell.h"

#include "interrupt.h"



/* Define CELL_IOMMU_REAL_UNMAP to actually unmap non-used pages
@@ -857,7 +858,7 @@ static int __init cell_iommu_init_disabled(void) 
	cell_dma_direct_offset += base;



	if (cell_dma_direct_offset != 0)

		ppc_md.pci_dma_dev_setup = cell_pci_dma_dev_setup;

		cell_pci_controller_ops.dma_dev_setup = cell_pci_dma_dev_setup;



	printk("iommu: disabled, direct DMA offset is 0x%lx\n",

	       cell_dma_direct_offset);
@@ -1197,8 +1198,8 @@ static int __init cell_iommu_init(void) 
		if (cell_iommu_init_disabled() == 0)

			goto bail;



	/* Setup various ppc_md. callbacks */

	ppc_md.pci_dma_dev_setup = cell_pci_dma_dev_setup;

	/* Setup various callbacks */

	cell_pci_controller_ops.dma_dev_setup = cell_pci_dma_dev_setup;

	ppc_md.dma_get_required_mask = cell_dma_get_required_mask;

	ppc_md.tce_build = tce_build_cell;

	ppc_md.tce_free = tce_free_cell;

arch/powerpc/platforms/cell/setup.c

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <asm/cell-regs.h>

#include <asm/io-workarounds.h>



#include "cell.h"

#include "interrupt.h"

#include "pervasive.h"

#include "ras.h"
@@ -131,6 +132,8 @@ static int cell_setup_phb(struct pci_controller *phb) 
	if (model == NULL || strcmp(np->name, "pci"))

		return 0;



	phb->controller_ops = cell_pci_controller_ops;



	/* Setup workarounds for spider */

	if (strcmp(model, "Spider"))

		return 0;
@@ -279,3 +282,5 @@ define_machine(cell) { 
	.init_IRQ       	= cell_init_irq,

	.pci_setup_phb		= cell_setup_phb,

};



struct pci_controller_ops cell_pci_controller_ops;