powerpc: New DCR access methods
PATCH 1/1 powerpc: New DCR access methods
This patch adds new dcr_map/dcr_read/dcr_write accessors for DCRs that can be used by drivers to transparently address either native DCRs or memory mapped DCRs. The implementation for memory mapped DCRs is done after the binding being currently worked on for SLOF and the Axon chipset. This patch enables it for the cell native platform
include/asm-powerpc/dcr.h new file +42 -0
@@ -0,0 +1,42 @@ +/* +* (c) Copyright 2006 Benjamin Herrenschmidt, IBM Corp. +* <[email protected]> +* +* 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 of the License, 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. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _ASM_POWERPC_DCR_H +#define _ASM_POWERPC_DCR_H +#ifdef __KERNEL__ + +#ifdef CONFIG_PPC_DCR_NATIVE +#include <asm/dcr-native.h> +#else +#include <asm/dcr-mmio.h> +#endif + +/* +* On CONFIG_PPC_MERGE, we have additional helpers to read the DCR +* base from the device-tree +*/ +#ifdef CONFIG_PPC_MERGE +extern unsigned int dcr_resource_start (struct device_node *np, +unsigned int index); +extern unsigned int dcr_resource_len (struct device_node *np, +unsigned int index); +#endif /* CONFIG_PPC_MERGE */ + +#endif /* __KERNEL__ */ +#endif /* _ASM_POWERPC_DCR_H */
arch/powerpc/Kconfig +16 -0
@@ -160,9 +160,11 @@ config PPC_86xx config 40x bool "AMCC 40x" + select PPC_DCR_NATIVE config 44x bool "AMCC 44x" + select PPC_DCR_NATIVE config 8xx bool "Freescale 8xx"
@@ -208,6 +210,19 @@ config PPC_FPU bool default y if PPC64 +config PPC_DCR_NATIVE + bool + default n + +config PPC_DCR_MMIO + bool + default n + +config PPC_DCR + bool + depends on PPC_DCR_NATIVE || PPC_DCR_MMIO + default y + config BOOKE bool depends on E200 || E500
@@ -445,6 +460,7 @@ config PPC_CELL config PPC_CELL_NATIVE bool select PPC_CELL + select PPC_DCR_MMIO default n config PPC_IBM_CELL_BLADE
include/asm-powerpc/dcr-mmio.h new file +51 -0
51 lines not on this page · raw message
include/asm-powerpc/dcr-native.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* (c) Copyright 2006 Benjamin Herrenschmidt, IBM Corp. +* <[email protected]> +* +* 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 of the License, 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. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _ASM_POWERPC_DCR_NATIVE_H +#define _ASM_POWERPC_DCR_NATIVE_H +#ifdef __KERNEL__ + +#include <asm/reg.h> + +typedef struct {}dcr_host_t ; + +#define DCR_MAP_OK (host) (1) + +#define dcr_map (dev, dcr_n, dcr_c) {} +#define dcr_unmap (host, dcr_n, dcr_c) {} +#define dcr_read (host, dcr_n) mfdcr(dcr_n) +#define dcr_write (host, dcr_n, value) mtdcr(dcr_n, value) + + +#endif /* __KERNEL__ */ +#endif /* _ASM_POWERPC_DCR_NATIVE_H */ + +
arch/ppc/Kconfig +11 -0
@@ -77,9 +77,11 @@ config 6xx config 40x bool "40x" + select PPC_DCR_NATIVE config 44x bool "44x" + select PPC_DCR_NATIVE config 8xx bool "8xx"
@@ -95,6 +97,15 @@ endchoice config PPC_FPU bool +config PPC_DCR_NATIVE + bool + default n + +config PPC_DCR + bool + depends on PPC_DCR_NATIVE + default y + config BOOKE bool depends on E200 || E500
arch/powerpc/kernel/Makefile +1 -0
@@ -60,6 +60,7 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_PPC_UDBG_16550) += legacy_serial.o udbg_16550.o + module-$(CONFIG_PPC64) += module_64.o obj-$(CONFIG_MODULES) += $(module-y)
arch/powerpc/sysdev/Makefile +1 -2
@@ -5,8 +5,7 @@ endif obj-$(CONFIG_MPIC) += mpic.o obj-$(CONFIG_PPC_INDIRECT_PCI) += indirect_pci.o obj-$(CONFIG_PPC_MPC106) += grackle.o -obj-$(CONFIG_BOOKE) += dcr.o -obj-$(CONFIG_40x) += dcr.o +obj-$(CONFIG_PPC_DCR) += dcr.o dcr-low.o obj-$(CONFIG_U3_DART) += dart_iommu.o obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o obj-$(CONFIG_FSL_SOC) += fsl_soc.o
arch/powerpc/sysdev/dcr-low.S new file +39 -0
@@ -0,0 +1,39 @@ +/* + * "Indirect" DCR access + * + * Copyright (c) 2004 Eugene Surovegin <[email protected]> + * + * 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 of the License, or (at your + * option) any later version. + */ + +#include <asm/ppc_asm.h> +#include <asm/processor.h> + +#define DCR_ACCESS_PROLOG(table) \ + rlwinm r3,r3,4,18,27; \ + lis r5,table@h; \ + ori r5,r5,table@l; \ + add r3,r3,r5; \ + mtctr r3; \ + bctr + +_GLOBAL(__mfdcr) + DCR_ACCESS_PROLOG(__mfdcr_table) + +_GLOBAL(__mtdcr) + DCR_ACCESS_PROLOG(__mtdcr_table) + +__mfdcr_table: + mfdcr r3,0; blr +__mtdcr_table: + mtdcr 0,r4; blr + +dcr = 1 + .rept 1023 + mfdcr r3,dcr; blr + mtdcr dcr,r4; blr + dcr = dcr + 1 + .endr
arch/powerpc/sysdev/dcr.c new file +134 -0
134 lines not on this page · raw message
Quoted 31 lines · Benjamin Herrenschmidt
This patch adds new dcr_map/dcr_read/dcr_write accessors for DCRs that can be used by drivers to transparently address either native DCRs or memory mapped DCRs. The implementation for memory mapped DCRs is done after the binding being currently worked on for SLOF and the Axon chipset. This patch enables it for the cell native platform
Signed-off-by Benjamin Herrenschmidt <[email protected]>Index:
linux-cell/include/asm-powerpc/dcr.h
===================================================================include/asm-powerpc/dcr.h new file +18
-0@@ -0,0 +1,42 @@ +/* +* (c) Copyright 2006 Benjamin Herrenschmidt, IBM Corp. +* <[email protected]> +* +* 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 of the License, 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. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/
include/asm-powerpc/dcr.h line 28
Quoted 10 lines
include/asm-powerpc/dcr.h new file +10
-0+ +#ifndef _ASM_POWERPC_DCR_H +#define _ASM_POWERPC_DCR_H +#ifdef __KERNEL__ + +#ifdef CONFIG_PPC_DCR_NATIVE +#include <asm/dcr-native.h> +#else +#include <asm/dcr-mmio.h> +#endif
Having this as a compile-time switch seems broken. I thought the plan was to support all different 64bit kernels with a single kernel binary?
Quoted 9 lines
include/asm-powerpc/dcr.h line 28
Quoted 6 lines
include/asm-powerpc/dcr.h new file +5
-0+#ifdef CONFIG_PPC_DCR_NATIVE +#include <asm/dcr-native.h> +#else +#include <asm/dcr-mmio.h> +#endif Having this as a compile-time switch seems broken. I thought the plan was to support all different 64bit kernels with a single kernel binary?
"native" DCRs only exist in 32 bits 4xx / BookE processors as of today.
Basically, those processors have mtdcr and mfdcr instructions to access those special "registers". They are in fact connected to a bus to control various IOs. On AXON (and possibly other future chips), since the host processor doesn't have those instructions, they are memory mapped.
There is currently no way you can have both in the same kernel. If that ever happens, then the "mmio" version could easily be tweaked to deal with both. However, the "native only" implementation is useful for embedded 4xx etc... as it resolves directly to mfdcr/mtdcr instructions, dcr_map is an empty macro, etc... thus there is 0 overhead of switching 4xx code to the new dcr accessors.
Ben.