c91ef59861
Getting BenH's new EMAC driver working on 440GP, I found some more
problems in the native mode paths of the new DCR code:
- dcr_map() is supposed to return a dcr_host_t, but the native
version is a macro that doesn't expand to an expression. With native
DCRs, dcr_host_t is an empty structure, so we just use a constructor
expression instead.
- dcr_unmap() uses {} instead of the safer do {} while (0)
idiom to implement a no-op
Here's a fix.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
73 lines
2.1 KiB
C
73 lines
2.1 KiB
C
/*
|
|
* (c) Copyright 2006 Benjamin Herrenschmidt, IBM Corp.
|
|
* <benh@kernel.crashing.org>
|
|
*
|
|
* 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__
|
|
#ifndef __ASSEMBLY__
|
|
|
|
typedef struct {} dcr_host_t;
|
|
|
|
#define DCR_MAP_OK(host) (1)
|
|
|
|
#define dcr_map(dev, dcr_n, dcr_c) ((dcr_host_t){})
|
|
#define dcr_unmap(host, dcr_n, dcr_c) do {} while (0)
|
|
#define dcr_read(host, dcr_n) mfdcr(dcr_n)
|
|
#define dcr_write(host, dcr_n, value) mtdcr(dcr_n, value)
|
|
|
|
/* Device Control Registers */
|
|
void __mtdcr(int reg, unsigned int val);
|
|
unsigned int __mfdcr(int reg);
|
|
#define mfdcr(rn) \
|
|
({unsigned int rval; \
|
|
if (__builtin_constant_p(rn)) \
|
|
asm volatile("mfdcr %0," __stringify(rn) \
|
|
: "=r" (rval)); \
|
|
else \
|
|
rval = __mfdcr(rn); \
|
|
rval;})
|
|
|
|
#define mtdcr(rn, v) \
|
|
do { \
|
|
if (__builtin_constant_p(rn)) \
|
|
asm volatile("mtdcr " __stringify(rn) ",%0" \
|
|
: : "r" (v)); \
|
|
else \
|
|
__mtdcr(rn, v); \
|
|
} while (0)
|
|
|
|
/* R/W of indirect DCRs make use of standard naming conventions for DCRs */
|
|
#define mfdcri(base, reg) \
|
|
({ \
|
|
mtdcr(base ## _CFGADDR, base ## _ ## reg); \
|
|
mfdcr(base ## _CFGDATA); \
|
|
})
|
|
|
|
#define mtdcri(base, reg, data) \
|
|
do { \
|
|
mtdcr(base ## _CFGADDR, base ## _ ## reg); \
|
|
mtdcr(base ## _CFGDATA, data); \
|
|
} while (0)
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_POWERPC_DCR_NATIVE_H */
|
|
|
|
|