Skip to content

L
linux
Commit 8fe11cd8 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] pc300 portability fixes 

64bit portability fixes - as it is, driver had been broken on all 64bit
platforms except alpha.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 36aed6eb
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 34 deletions
drivers/net/wan/pc300.h
View file @ 8fe11cd8
...@@ -105,14 +105,10 @@ ...@@ -105,14 +105,10 @@
#ifndef CY_TYPES #ifndef CY_TYPES
#define CY_TYPES #define CY_TYPES
#if defined(__alpha__) typedef __u64 ucdouble; /* 64 bits, unsigned */
typedef unsigned long ucdouble; /* 64 bits, unsigned */ typedef __u32 uclong; /* 32 bits, unsigned */
typedef unsigned int uclong; /* 32 bits, unsigned */ typedef __u16 ucshort; /* 16 bits, unsigned */
#else typedef __u8 ucchar; /* 8 bits, unsigned */
typedef unsigned long uclong; /* 32 bits, unsigned */
#endif
typedef unsigned short ucshort; /* 16 bits, unsigned */
typedef unsigned char ucchar; /* 8 bits, unsigned */
#endif /* CY_TYPES */ #endif /* CY_TYPES */
#define PC300_PROTO_MLPPP 1 #define PC300_PROTO_MLPPP 1
......
drivers/net/wan/pc300_drv.c
View file @ 8fe11cd8
...@@ -378,9 +378,9 @@ static void tx_dma_buf_check(pc300_t * card, int ch) ...@@ -378,9 +378,9 @@ static void tx_dma_buf_check(pc300_t * card, int ch)
i != ((next_bd + 1) & (N_DMA_TX_BUF - 1)); i != ((next_bd + 1) & (N_DMA_TX_BUF - 1));
i = (i + 1) & (N_DMA_TX_BUF - 1), i = (i + 1) & (N_DMA_TX_BUF - 1),
ptdescr = (card->hw.rambase + TX_BD_ADDR(ch, i))) { ptdescr = (card->hw.rambase + TX_BD_ADDR(ch, i))) {
printk("\n CH%d TX%d: next=0x%lx, ptbuf=0x%lx, ST=0x%x, len=%d", printk("\n CH%d TX%d: next=0x%x, ptbuf=0x%x, ST=0x%x, len=%d",
ch, i, (uclong) cpc_readl(&ptdescr->next), ch, i, cpc_readl(&ptdescr->next),
(uclong) cpc_readl(&ptdescr->ptbuf), cpc_readl(&ptdescr->ptbuf),
cpc_readb(&ptdescr->status), cpc_readw(&ptdescr->len)); cpc_readb(&ptdescr->status), cpc_readw(&ptdescr->len));
} }
printk("\n"); printk("\n");
...@@ -400,14 +400,14 @@ static void tx1_dma_buf_check(pc300_t * card, int ch) ...@@ -400,14 +400,14 @@ static void tx1_dma_buf_check(pc300_t * card, int ch)
printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch, printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch,
first_bd, TX_BD_ADDR(ch, first_bd), first_bd, TX_BD_ADDR(ch, first_bd),
next_bd, TX_BD_ADDR(ch, next_bd)); next_bd, TX_BD_ADDR(ch, next_bd));
printk("TX_CDA=0x%08lx, TX_EDA=0x%08lx\n", printk("TX_CDA=0x%08x, TX_EDA=0x%08x\n",
(uclong) cpc_readl(scabase + DTX_REG(CDAL, ch)), cpc_readl(scabase + DTX_REG(CDAL, ch)),
(uclong) cpc_readl(scabase + DTX_REG(EDAL, ch))); cpc_readl(scabase + DTX_REG(EDAL, ch)));
for (i = 0; i < N_DMA_TX_BUF; i++) { for (i = 0; i < N_DMA_TX_BUF; i++) {
ptdescr = (card->hw.rambase + TX_BD_ADDR(ch, i)); ptdescr = (card->hw.rambase + TX_BD_ADDR(ch, i));
printk("\n CH%d TX%d: next=0x%lx, ptbuf=0x%lx, ST=0x%x, len=%d", printk("\n CH%d TX%d: next=0x%x, ptbuf=0x%x, ST=0x%x, len=%d",
ch, i, (uclong) cpc_readl(&ptdescr->next), ch, i, cpc_readl(&ptdescr->next),
(uclong) cpc_readl(&ptdescr->ptbuf), cpc_readl(&ptdescr->ptbuf),
cpc_readb(&ptdescr->status), cpc_readw(&ptdescr->len)); cpc_readb(&ptdescr->status), cpc_readw(&ptdescr->len));
} }
printk("\n"); printk("\n");
...@@ -428,9 +428,9 @@ static void rx_dma_buf_check(pc300_t * card, int ch) ...@@ -428,9 +428,9 @@ static void rx_dma_buf_check(pc300_t * card, int ch)
DMA_RX_BD_BASE + ch_factor * sizeof(pcsca_bd_t)); DMA_RX_BD_BASE + ch_factor * sizeof(pcsca_bd_t));
i < N_DMA_RX_BUF; i++, ptdescr++) { i < N_DMA_RX_BUF; i++, ptdescr++) {
if (cpc_readb(&ptdescr->status) & DST_OSB) if (cpc_readb(&ptdescr->status) & DST_OSB)
printk ("\n CH%d RX%d: next=0x%lx, ptbuf=0x%lx, ST=0x%x, len=%d", printk ("\n CH%d RX%d: next=0x%x, ptbuf=0x%x, ST=0x%x, len=%d",
ch, i, (uclong) cpc_readl(&ptdescr->next), ch, i, cpc_readl(&ptdescr->next),
(uclong) cpc_readl(&ptdescr->ptbuf), cpc_readl(&ptdescr->ptbuf),
cpc_readb(&ptdescr->status), cpc_readb(&ptdescr->status),
cpc_readw(&ptdescr->len)); cpc_readw(&ptdescr->len));
} }
...@@ -2415,12 +2415,12 @@ void cpc_sca_status(pc300_t * card, int ch) ...@@ -2415,12 +2415,12 @@ void cpc_sca_status(pc300_t * card, int ch)
printk ("ILAR=0x%02x, WCRL=0x%02x, PCR=0x%02x, BTCR=0x%02x, BOLR=0x%02x\n", printk ("ILAR=0x%02x, WCRL=0x%02x, PCR=0x%02x, BTCR=0x%02x, BOLR=0x%02x\n",
ilar, cpc_readb(scabase + WCRL), cpc_readb(scabase + PCR), ilar, cpc_readb(scabase + WCRL), cpc_readb(scabase + PCR),
cpc_readb(scabase + BTCR), cpc_readb(scabase + BOLR)); cpc_readb(scabase + BTCR), cpc_readb(scabase + BOLR));
printk("TX_CDA=0x%08lx, TX_EDA=0x%08lx\n", printk("TX_CDA=0x%08x, TX_EDA=0x%08x\n",
(uclong) cpc_readl(scabase + DTX_REG(CDAL, ch)), cpc_readl(scabase + DTX_REG(CDAL, ch)),
(uclong) cpc_readl(scabase + DTX_REG(EDAL, ch))); cpc_readl(scabase + DTX_REG(EDAL, ch)));
printk("RX_CDA=0x%08lx, RX_EDA=0x%08lx, BFL=0x%04x\n", printk("RX_CDA=0x%08x, RX_EDA=0x%08x, BFL=0x%04x\n",
(uclong) cpc_readl(scabase + DRX_REG(CDAL, ch)), cpc_readl(scabase + DRX_REG(CDAL, ch)),
(uclong) cpc_readl(scabase + DRX_REG(EDAL, ch)), cpc_readl(scabase + DRX_REG(EDAL, ch)),
cpc_readw(scabase + DRX_REG(BFLL, ch))); cpc_readw(scabase + DRX_REG(BFLL, ch)));
printk("DMER=0x%02x, DSR_TX=0x%02x, DSR_RX=0x%02x\n", printk("DMER=0x%02x, DSR_TX=0x%02x, DSR_RX=0x%02x\n",
cpc_readb(scabase + DMER), cpc_readb(scabase + DSR_TX(ch)), cpc_readb(scabase + DMER), cpc_readb(scabase + DSR_TX(ch)),
...@@ -2485,7 +2485,7 @@ void cpc_sca_status(pc300_t * card, int ch) ...@@ -2485,7 +2485,7 @@ void cpc_sca_status(pc300_t * card, int ch)
cpc_readb(scabase + M_REG(IE2, ch)), cpc_readb(scabase + M_REG(IE2, ch)),
cpc_readb(scabase + M_REG(IE4, ch)), cpc_readb(scabase + M_REG(IE4, ch)),
cpc_readb(scabase + M_REG(FIE, ch))); cpc_readb(scabase + M_REG(FIE, ch)));
printk("IER0=0x%08lx\n", (uclong) cpc_readl(scabase + IER0)); printk("IER0=0x%08x\n", cpc_readl(scabase + IER0));
if (ilar != 0) { if (ilar != 0) {
CPC_LOCK(card, flags); CPC_LOCK(card, flags);
...@@ -3406,12 +3406,12 @@ static void cpc_init_card(pc300_t * card) ...@@ -3406,12 +3406,12 @@ static void cpc_init_card(pc300_t * card)
printk("RSV "); printk("RSV ");
break; break;
} }
printk (" #%d, %ldKB of RAM at 0x%08lx, IRQ%d, channel %d.\n", printk (" #%d, %dKB of RAM at 0x%08x, IRQ%d, channel %d.\n",
board_nbr, card->hw.ramsize / 1024, board_nbr, card->hw.ramsize / 1024,
card->hw.ramphys, card->hw.irq, i + 1); card->hw.ramphys, card->hw.irq, i + 1);
devcount++; devcount++;
} else { } else {
printk ("Dev%d on card(0x%08lx): unable to allocate i/f name.\n", printk ("Dev%d on card(0x%08x): unable to allocate i/f name.\n",
i + 1, card->hw.ramphys); i + 1, card->hw.ramphys);
free_netdev(dev); free_netdev(dev);
continue; continue;
...@@ -3491,7 +3491,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3491,7 +3491,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!request_region(card->hw.iophys, card->hw.iosize, "PLX Registers")) { if (!request_region(card->hw.iophys, card->hw.iosize, "PLX Registers")) {
/* In case we can't allocate it, warn user */ /* In case we can't allocate it, warn user */
printk("WARNING: couldn't allocate I/O region for PC300 board " printk("WARNING: couldn't allocate I/O region for PC300 board "
"at 0x%08lx!\n", card->hw.ramphys); "at 0x%08x!\n", card->hw.ramphys);
} }
if (card->hw.plxphys) { if (card->hw.plxphys) {
...@@ -3504,7 +3504,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3504,7 +3504,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!request_mem_region(card->hw.plxphys, card->hw.plxsize, if (!request_mem_region(card->hw.plxphys, card->hw.plxsize,
"PLX Registers")) { "PLX Registers")) {
printk("PC300 found at RAM 0x%08lx, " printk("PC300 found at RAM 0x%08x, "
"but could not allocate PLX mem region.\n", "but could not allocate PLX mem region.\n",
card->hw.ramphys); card->hw.ramphys);
err = -ENODEV; err = -ENODEV;
...@@ -3512,7 +3512,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3512,7 +3512,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
if (!request_mem_region(card->hw.ramphys, card->hw.alloc_ramsize, if (!request_mem_region(card->hw.ramphys, card->hw.alloc_ramsize,
"On-board RAM")) { "On-board RAM")) {
printk("PC300 found at RAM 0x%08lx, " printk("PC300 found at RAM 0x%08x, "
"but could not allocate RAM mem region.\n", "but could not allocate RAM mem region.\n",
card->hw.ramphys); card->hw.ramphys);
err = -ENODEV; err = -ENODEV;
...@@ -3520,7 +3520,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3520,7 +3520,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
if (!request_mem_region(card->hw.scaphys, card->hw.scasize, if (!request_mem_region(card->hw.scaphys, card->hw.scasize,
"SCA-II Registers")) { "SCA-II Registers")) {
printk("PC300 found at RAM 0x%08lx, " printk("PC300 found at RAM 0x%08x, "
"but could not allocate SCA mem region.\n", "but could not allocate SCA mem region.\n",
card->hw.ramphys); card->hw.ramphys);
err = -ENODEV; err = -ENODEV;
...@@ -3600,7 +3600,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3600,7 +3600,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Allocate IRQ */ /* Allocate IRQ */
if (request_irq(card->hw.irq, cpc_intr, SA_SHIRQ, "Cyclades-PC300", card)) { if (request_irq(card->hw.irq, cpc_intr, SA_SHIRQ, "Cyclades-PC300", card)) {
printk ("PC300 found at RAM 0x%08lx, but could not allocate IRQ%d.\n", printk ("PC300 found at RAM 0x%08x, but could not allocate IRQ%d.\n",
card->hw.ramphys, card->hw.irq); card->hw.ramphys, card->hw.irq);
goto err_io_unmap; goto err_io_unmap;
} }
......
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