Skip to content

L
linux
Commit 3d88e178 authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SPARC64]: Fix iomem warnings in cpwatchdog driver. 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d26bfee3
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 48 deletions
drivers/sbus/char/cpwatchdog.c
View file @ 3d88e178
...@@ -118,32 +118,18 @@ ...@@ -118,32 +118,18 @@
* UNKNOWN, MAGICAL MYSTERY REGISTER * UNKNOWN, MAGICAL MYSTERY REGISTER
* *
*/ */
struct wd_timer_regblk { #define WD_TIMER_REGSZ 16
volatile __u16 dcntr; /* down counter - hw */ #define WD0_OFF 0
volatile __u16 dcntr_pad; #define WD1_OFF (WD_TIMER_REGSZ * 1)
volatile __u16 limit; /* limit register - hw */ #define WD2_OFF (WD_TIMER_REGSZ * 2)
volatile __u16 limit_pad; #define PLD_OFF (WD_TIMER_REGSZ * 3)
volatile __u8 status; /* status register - b */
volatile __u8 status_pad;
volatile __u16 status_pad2;
volatile __u32 pad32; /* yet more padding */
};
struct wd_pld_regblk { #define WD_DCNTR 0x00
volatile __u8 intr_mask; /* interrupt mask - b */ #define WD_LIMIT 0x04
volatile __u8 intr_mask_pad; #define WD_STATUS 0x08
volatile __u16 intr_mask_pad2;
volatile __u8 status; /* device status - b */
volatile __u8 status_pad;
volatile __u16 status_pad2;
};
struct wd_regblk { #define PLD_IMASK (PLD_OFF + 0x00)
volatile struct wd_timer_regblk wd0_regs; #define PLD_STATUS (PLD_OFF + 0x04)
volatile struct wd_timer_regblk wd1_regs;
volatile struct wd_timer_regblk wd2_regs;
volatile struct wd_pld_regblk pld_regs;
};
/* Individual timer structure /* Individual timer structure
*/ */
...@@ -151,7 +137,7 @@ struct wd_timer { ...@@ -151,7 +137,7 @@ struct wd_timer {
__u16 timeout; __u16 timeout;
__u8 intr_mask; __u8 intr_mask;
unsigned char runstatus; unsigned char runstatus;
volatile struct wd_timer_regblk* regs; void __iomem *regs;
}; };
/* Device structure /* Device structure
...@@ -165,7 +151,7 @@ struct wd_device { ...@@ -165,7 +151,7 @@ struct wd_device {
unsigned short opt_timeout; unsigned short opt_timeout;
unsigned char initialized; unsigned char initialized;
struct wd_timer watchdog[WD_NUMDEVS]; struct wd_timer watchdog[WD_NUMDEVS];
volatile struct wd_regblk* regs; void __iomem *regs;
}; };
static struct wd_device wd_dev = { static struct wd_device wd_dev = {
...@@ -495,12 +481,12 @@ static void wd_dumpregs(void) ...@@ -495,12 +481,12 @@ static void wd_dumpregs(void)
i, i,
wd_getstatus(&wd_dev.watchdog[i])); wd_getstatus(&wd_dev.watchdog[i]));
} }
printk("\tintr_mask at 0x%lx: 0x%x\n", printk("\tintr_mask at %p: 0x%x\n",
(unsigned long)(&wd_dev.regs->pld_regs.intr_mask), wd_dev.regs + PLD_IMASK,
readb(&wd_dev.regs->pld_regs.intr_mask)); readb(wd_dev.regs + PLD_IMASK));
printk("\tpld_status at 0x%lx: 0x%x\n", printk("\tpld_status at %p: 0x%x\n",
(unsigned long)(&wd_dev.regs->pld_regs.status), wd_dev.regs + PLD_STATUS,
readb(&wd_dev.regs->pld_regs.status)); readb(wd_dev.regs + PLD_STATUS));
} }
#endif #endif
...@@ -513,7 +499,7 @@ static void wd_dumpregs(void) ...@@ -513,7 +499,7 @@ static void wd_dumpregs(void)
*/ */
static void wd_toggleintr(struct wd_timer* pTimer, int enable) static void wd_toggleintr(struct wd_timer* pTimer, int enable)
{ {
unsigned char curregs = wd_readb(&wd_dev.regs->pld_regs.intr_mask); unsigned char curregs = wd_readb(wd_dev.regs + PLD_IMASK);
unsigned char setregs = unsigned char setregs =
(NULL == pTimer) ? (NULL == pTimer) ?
(WD0_INTR_MASK | WD1_INTR_MASK | WD2_INTR_MASK) : (WD0_INTR_MASK | WD1_INTR_MASK | WD2_INTR_MASK) :
...@@ -523,7 +509,7 @@ static void wd_toggleintr(struct wd_timer* pTimer, int enable) ...@@ -523,7 +509,7 @@ static void wd_toggleintr(struct wd_timer* pTimer, int enable)
(curregs &= ~setregs): (curregs &= ~setregs):
(curregs |= setregs); (curregs |= setregs);
wd_writeb(curregs, &wd_dev.regs->pld_regs.intr_mask); wd_writeb(curregs, wd_dev.regs + PLD_IMASK);
return; return;
} }
...@@ -534,8 +520,8 @@ static void wd_toggleintr(struct wd_timer* pTimer, int enable) ...@@ -534,8 +520,8 @@ static void wd_toggleintr(struct wd_timer* pTimer, int enable)
*/ */
static void wd_pingtimer(struct wd_timer* pTimer) static void wd_pingtimer(struct wd_timer* pTimer)
{ {
if(wd_readb(&pTimer->regs->status) & WD_S_RUNNING) { if (wd_readb(pTimer->regs + WD_STATUS) & WD_S_RUNNING) {
wd_readw(&pTimer->regs->dcntr); wd_readw(pTimer->regs + WD_DCNTR);
} }
} }
...@@ -547,7 +533,7 @@ static void wd_pingtimer(struct wd_timer* pTimer) ...@@ -547,7 +533,7 @@ static void wd_pingtimer(struct wd_timer* pTimer)
*/ */
static void wd_stoptimer(struct wd_timer* pTimer) static void wd_stoptimer(struct wd_timer* pTimer)
{ {
if(wd_readb(&pTimer->regs->status) & WD_S_RUNNING) { if(wd_readb(pTimer->regs + WD_STATUS) & WD_S_RUNNING) {
wd_toggleintr(pTimer, WD_INTR_OFF); wd_toggleintr(pTimer, WD_INTR_OFF);
if(wd_dev.isbaddoggie) { if(wd_dev.isbaddoggie) {
...@@ -574,7 +560,7 @@ static void wd_starttimer(struct wd_timer* pTimer) ...@@ -574,7 +560,7 @@ static void wd_starttimer(struct wd_timer* pTimer)
} }
pTimer->runstatus &= ~WD_STAT_SVCD; pTimer->runstatus &= ~WD_STAT_SVCD;
wd_writew(pTimer->timeout, &pTimer->regs->limit); wd_writew(pTimer->timeout, pTimer->regs + WD_LIMIT);
wd_toggleintr(pTimer, WD_INTR_ON); wd_toggleintr(pTimer, WD_INTR_ON);
} }
...@@ -584,7 +570,7 @@ static void wd_starttimer(struct wd_timer* pTimer) ...@@ -584,7 +570,7 @@ static void wd_starttimer(struct wd_timer* pTimer)
static void wd_resetbrokentimer(struct wd_timer* pTimer) static void wd_resetbrokentimer(struct wd_timer* pTimer)
{ {
wd_toggleintr(pTimer, WD_INTR_ON); wd_toggleintr(pTimer, WD_INTR_ON);
wd_writew(WD_BLIMIT, &pTimer->regs->limit); wd_writew(WD_BLIMIT, pTimer->regs + WD_LIMIT);
} }
/* Timer device initialization helper. /* Timer device initialization helper.
...@@ -593,7 +579,7 @@ static void wd_resetbrokentimer(struct wd_timer* pTimer) ...@@ -593,7 +579,7 @@ static void wd_resetbrokentimer(struct wd_timer* pTimer)
static int wd_inittimer(int whichdog) static int wd_inittimer(int whichdog)
{ {
struct miscdevice *whichmisc; struct miscdevice *whichmisc;
volatile struct wd_timer_regblk *whichregs; void __iomem *whichregs;
char whichident[8]; char whichident[8];
int whichmask; int whichmask;
__u16 whichlimit; __u16 whichlimit;
...@@ -603,7 +589,7 @@ static int wd_inittimer(int whichdog) ...@@ -603,7 +589,7 @@ static int wd_inittimer(int whichdog)
case WD0_ID: case WD0_ID:
whichmisc = &wd0_miscdev; whichmisc = &wd0_miscdev;
strcpy(whichident, "RIC"); strcpy(whichident, "RIC");
whichregs = &wd_dev.regs->wd0_regs; whichregs = wd_dev.regs + WD0_OFF;
whichmask = WD0_INTR_MASK; whichmask = WD0_INTR_MASK;
whichlimit= (0 == wd0_timeout) ? whichlimit= (0 == wd0_timeout) ?
(wd_dev.opt_timeout): (wd_dev.opt_timeout):
...@@ -612,7 +598,7 @@ static int wd_inittimer(int whichdog) ...@@ -612,7 +598,7 @@ static int wd_inittimer(int whichdog)
case WD1_ID: case WD1_ID:
whichmisc = &wd1_miscdev; whichmisc = &wd1_miscdev;
strcpy(whichident, "XIR"); strcpy(whichident, "XIR");
whichregs = &wd_dev.regs->wd1_regs; whichregs = wd_dev.regs + WD1_OFF;
whichmask = WD1_INTR_MASK; whichmask = WD1_INTR_MASK;
whichlimit= (0 == wd1_timeout) ? whichlimit= (0 == wd1_timeout) ?
(wd_dev.opt_timeout): (wd_dev.opt_timeout):
...@@ -621,7 +607,7 @@ static int wd_inittimer(int whichdog) ...@@ -621,7 +607,7 @@ static int wd_inittimer(int whichdog)
case WD2_ID: case WD2_ID:
whichmisc = &wd2_miscdev; whichmisc = &wd2_miscdev;
strcpy(whichident, "POR"); strcpy(whichident, "POR");
whichregs = &wd_dev.regs->wd2_regs; whichregs = wd_dev.regs + WD2_OFF;
whichmask = WD2_INTR_MASK; whichmask = WD2_INTR_MASK;
whichlimit= (0 == wd2_timeout) ? whichlimit= (0 == wd2_timeout) ?
(wd_dev.opt_timeout): (wd_dev.opt_timeout):
...@@ -686,8 +672,8 @@ static void wd_brokentimer(unsigned long data) ...@@ -686,8 +672,8 @@ static void wd_brokentimer(unsigned long data)
static int wd_getstatus(struct wd_timer* pTimer) static int wd_getstatus(struct wd_timer* pTimer)
{ {
unsigned char stat = wd_readb(&pTimer->regs->status); unsigned char stat = wd_readb(pTimer->regs + WD_STATUS);
unsigned char intr = wd_readb(&wd_dev.regs->pld_regs.intr_mask); unsigned char intr = wd_readb(wd_dev.regs + PLD_IMASK);
unsigned char ret = WD_STOPPED; unsigned char ret = WD_STOPPED;
/* determine STOPPED */ /* determine STOPPED */
...@@ -805,7 +791,7 @@ static void __exit wd_cleanup(void) ...@@ -805,7 +791,7 @@ static void __exit wd_cleanup(void)
* also now eventually trip. * also now eventually trip.
*/ */
for(id = WD0_ID; id < WD_NUMDEVS; ++id) { for(id = WD0_ID; id < WD_NUMDEVS; ++id) {
if(WD_S_RUNNING == wd_readb(&wd_dev.watchdog[id].regs->status)) { if(WD_S_RUNNING == wd_readb(wd_dev.watchdog[id].regs + WD_STATUS)) {
if(wd_dev.opt_enable) { if(wd_dev.opt_enable) {
printk(KERN_WARNING "%s%i: timer not stopped at release\n", printk(KERN_WARNING "%s%i: timer not stopped at release\n",
WD_OBPNAME, id); WD_OBPNAME, id);
...@@ -818,7 +804,7 @@ static void __exit wd_cleanup(void) ...@@ -818,7 +804,7 @@ static void __exit wd_cleanup(void)
"%s%i: defect workaround disabled at release, "\ "%s%i: defect workaround disabled at release, "\
"timer expires in ~%01i sec\n", "timer expires in ~%01i sec\n",
WD_OBPNAME, id, WD_OBPNAME, id,
wd_readw(&wd_dev.watchdog[id].regs->limit) / 10); wd_readw(wd_dev.watchdog[id].regs + WD_LIMIT) / 10);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7