powerpc: Move CPM command handling into the cpm drivers
Subsystems (2)
This patch moves the CPM command handling into commproc.c for CPM1 and cpm2_common.c. This is yet another preparation to get rid of drivers accessing the CPM via the global cpmp.
---
arch/powerpc/sysdev/commproc.c | 28 ++++++++++++++++++++++++++++ arch/powerpc/sysdev/cpm2_common.c | 25 +++++++++++++++++++++++++ drivers/net/fs_enet/mac-fcc.c | 10 +--------- drivers/net/fs_enet/mac-scc.c | 11 +---------- drivers/serial/cpm_uart/cpm_uart_cpm1.c | 6 +----- drivers/serial/cpm_uart/cpm_uart_cpm2.c | 8 +------- include/asm-powerpc/cpm.h | 1 + 7 files changed, 58 insertions(+), 31 deletions(-)
arch/powerpc/sysdev/commproc.c +0 -0
@@ -240,6 +240,34 @@ void __init cpm_reset(void)
#endif
}
+static DEFINE_SPINLOCK(cmd_lock);
+
+#define MAX_CR_CMD_LOOPS 10000
+
+int cpm_command(u32 command, u8 opcode)
+{
+ int i, ret;
+ unsigned long flags;
+
+ if (command & 0xffffff0f)
+ return -EINVAL;
+
+ spin_lock_irqsave(&cmd_lock, flags);
+
+ ret = 0;
+ out_be16(&cpmp->cp_cpcr, command | CPM_CR_FLG | (opcode << 8));
+ for (i = 0; i < MAX_CR_CMD_LOOPS; i++)
+ if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
+ goto out;
+
+ printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
+ ret = -EIO;
+out:
+ spin_unlock_irqrestore(&cmd_lock, flags);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(cpm_command);
+
/* We used to do this earlier, but have to postpone as long as possible
* to ensure the kernel VM is now running.
*/
arch/powerpc/sysdev/cpm2_common.c +0 -0
@@ -83,6 +83,31 @@ cpm2_reset(void)
cpmp = &cpm2_immr->im_cpm; }
+static DEFINE_SPINLOCK(cmd_lock);
+
+#define MAX_CR_CMD_LOOPS 10000
+
+int cpm_command(u32 command, u8 opcode)
+{
+ int i, ret;
+ unsigned long flags;
+
+ spin_lock_irqsave(&cmd_lock, flags);
+
+ ret = 0;
+ out_be32(&cpmp->cp_cpcr, command | opcode | CPM_CR_FLG);
+ for (i = 0; i < MAX_CR_CMD_LOOPS; i++)
+ if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
+ goto out;
+
+ printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
+ ret = -EIO;
+out:
+ spin_unlock_irqrestore(&cmd_lock, flags);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(cpm_command);
+
/* Set a baud rate generator. This needs lots of work. There are
* eight BRGs, which can be connected to the CPM channels or output
* as clocks. The BRGs are in two different block of internal
drivers/net/fs_enet/mac-fcc.c +0 -0
@@ -81,16 +81,8 @@
static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
{
const struct fs_platform_info *fpi = fep->fpi;- int i;
-
- W32(cpmp, cp_cpcr, fpi->cp_command | op | CPM_CR_FLG);
- for (i = 0; i < MAX_CR_CMD_LOOPS; i++)
- if ((R32(cpmp, cp_cpcr) & CPM_CR_FLG) == 0)
- return 0;
- printk(KERN_ERR "%s(): Not able to issue CPM command\n",
- __FUNCTION__);
- return 1;
+ return cpm_command(fpi->cp_command, op);
}
static int do_pd_setup(struct fs_enet_private *fep)
drivers/net/fs_enet/mac-scc.c +0 -0
@@ -89,21 +89,12 @@* Delay to wait for SCC reset command to complete (in us) */
#define SCC_RESET_DELAY 50
-#define MAX_CR_CMD_LOOPS 10000
static inline int scc_cr_cmd(struct fs_enet_private *fep, u32 op)
{
const struct fs_platform_info *fpi = fep->fpi;- int i;
-
- W16(cpmp, cp_cpcr, fpi->cp_command | CPM_CR_FLG | (op << 8));
- for (i = 0; i < MAX_CR_CMD_LOOPS; i++)
- if ((R16(cpmp, cp_cpcr) & CPM_CR_FLG) == 0)
- return 0;
- printk(KERN_ERR "%s(): Not able to issue CPM command\n",
- __FUNCTION__);
- return 1;
+ return cpm_command(fpi->cp_command, op);
}
static int do_pd_setup(struct fs_enet_private *fep)
drivers/serial/cpm_uart/cpm_uart_cpm1.c +0 -0
@@ -52,11 +52,7 @@
#ifdef CONFIG_PPC_CPM_NEW_BINDING
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd) {
- u16 __iomem *cpcr = &cpmp->cp_cpcr;
-
- out_be16(cpcr, port->command | (cmd << 8) | CPM_CR_FLG);
- while (in_be16(cpcr) & CPM_CR_FLG)
- ;
+ cpm_command(port->command, cmd);
}
#else
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
drivers/serial/cpm_uart/cpm_uart_cpm2.c +0 -0
@@ -52,13 +52,7 @@
#ifdef CONFIG_PPC_CPM_NEW_BINDING
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd) {
- cpm_cpm2_t __iomem *cp = cpm2_map(im_cpm);
-
- out_be32(&cp->cp_cpcr, port->command | cmd | CPM_CR_FLG);
- while (in_be32(&cp->cp_cpcr) & CPM_CR_FLG)
- ;
-
- cpm2_unmap(cp);
+ cpm_command(port->command, cmd);
}
#else
void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
include/asm-powerpc/cpm.h +0 -0
@@ -10,5 +10,6 @@ int cpm_muram_free(unsigned long offset);
unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size); void __iomem *cpm_muram_addr(unsigned long offset);dma_addr_t cpm_muram_dma(void __iomem *addr);
+int cpm_command(u32 command, u8 opcode);
#endif
Signature · 1 line
1.5.3.5
Quoted 11 lines · Jochen Friedrich
arch/powerpc/sysdev/commproc.c +3
-0@@ -240,6 +240,34 @@ void __init cpm_reset(void)#endif } +static DEFINE_SPINLOCK (cmd_lock); + +#define MAX_CR_CMD_LOOPS 10000
arch/powerpc/sysdev/commproc.c void __init cpm_reset(void) · line 255
Quoted 10 lines
arch/powerpc/sysdev/commproc.c +10
-0+ +int cpm_command (u32 command,u8 opcode) +{ +int i, ret; +unsigned long flags; + +if (command &0xffffff0f ) +return -EINVAL ; + +spin_lock_irqsave (&cmd_lock, flags);
I'm a little uneasy about this -- what's the longest it can take for the CPM command to complete (or timeout)? I'd rather use a mutex, if we can make sure that it's never called from atomic context.
Quoted 5 lines
arch/powerpc/sysdev/commproc.c +5
-0+ + ret =0 ; +out_be16 (&cpmp->cp_cpcr, command |CPM_CR_FLG | (opcode <<8 )); +for (i =0 ; i <MAX_CR_CMD_LOOPS ; i++) +if ((in_be16 (&cpmp->cp_cpcr) &CPM_CR_FLG ) ==0 )
arch/powerpc/sysdev/commproc.c void __init cpm_reset(void) · line 270
Quoted 10 lines
arch/powerpc/sysdev/commproc.c +9
-0+ goto out; + +printk (KERN_ERR "%s(): Not able to issue CPM command\n" , __FUNCTION__); + ret = -EIO ; +out: +spin_unlock_irqrestore (&cmd_lock, flags); +return ret; +} +EXPORT_SYMBOL_GPL (cpm_command);
Can we please not play the GPL DRM game here?
Besides, Documentation/DocBook/kernel-hacking.tmpl explicitly says that "It implies that the function is considered an internal implementation issue, and not really an interface."
I don't think this is the case here.
-Scott
Hi Scott,
Quoted 5 lines
Quoted 1 line
+
spin_lock_irqsave(&cmd_lock, flags);I'm a little uneasy about this -- what's the longest it can take for the CPM command to complete (or timeout)? I'd rather use a mutex, if we can make sure that it's never called from atomic context.
Unfortunately, fs_enet may call this from interrupt context.
Quoted 3 lines
Quoted 1 line
+EXPORT_SYMBOL_GPL(cpm_command);
Can we please not play the GPL DRM game here?
Arnd Bergmann proposed to change that, but you're right. This really is part of the CPM API, so i'll revert this.
Thanks,
Jochen