On Thu, Dec 17, 2015 at 01:43:12PM +1100, Alistair Popple wrote:
> Move __raw_rw_writeq() from platforms/powernv/pci-ioda.c to
^
Typo?
(not a big deal)
Gabriel
> include/asm/io.h so that it can be used by other code.
>
> Signed-off-by: Alistair Popple <alist...@popple.id.au>
> ---
> arch/powerpc/include/asm/io.h | 11 +++++++++++
> arch/powerpc/platforms/powernv/pci-ioda.c | 10 ----------
> 2 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
> index 5879fde..6c1297e 100644
> --- a/arch/powerpc/include/asm/io.h
> +++ b/arch/powerpc/include/asm/io.h
> @@ -385,6 +385,17 @@ static inline void __raw_writeq(unsigned long v,
> volatile void __iomem *addr)
> {
> *(volatile unsigned long __force *)PCI_FIX_ADDR(addr) = v;
> }
> +
> +/*
> + * Real mode version of the above. stdcix is only supposed to be used
> + * in hypervisor real mode as per the architecture spec.
> + */
> +static inline void __raw_rm_writeq(u64 val, volatile void __iomem *paddr)
> +{
> + __asm__ __volatile__("stdcix %0,0,%1"
> + : : "r" (val), "r" (paddr) : "memory");
> +}
> +
> #endif /* __powerpc64__ */
>
> /*
> diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c
> b/arch/powerpc/platforms/powernv/pci-ioda.c
> index 42b4bb2..cb04642 100644
> --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> @@ -116,16 +116,6 @@ static int __init iommu_setup(char *str)
> }
> early_param("iommu", iommu_setup);
>
> -/*
> - * stdcix is only supposed to be used in hypervisor real mode as per
> - * the architecture spec
> - */
> -static inline void __raw_rm_writeq(u64 val, volatile void __iomem *paddr)
> -{
> - __asm__ __volatile__("stdcix %0,0,%1"
> - : : "r" (val), "r" (paddr) : "memory");
> -}
> -
> static inline bool pnv_pci_is_mem_pref_64(unsigned long flags)
> {
> return ((flags & (IORESOURCE_MEM_64 | IORESOURCE_PREFETCH)) ==
> --
> 2.1.4
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
