Commit 103ad90e authored by David S. Miller's avatar David S. Miller

Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents 391d0d57 a38b483a
...@@ -72,8 +72,6 @@ ...@@ -72,8 +72,6 @@
#include "legacy/pdc4030.h" #include "legacy/pdc4030.h"
static int driver_blocked;
static inline u32 idedisk_read_24 (ide_drive_t *drive) static inline u32 idedisk_read_24 (ide_drive_t *drive)
{ {
u8 hcyl = HWIF(drive)->INB(IDE_HCYL_REG); u8 hcyl = HWIF(drive)->INB(IDE_HCYL_REG);
...@@ -132,8 +130,24 @@ static int lba_capacity_is_ok (struct hd_driveid *id) ...@@ -132,8 +130,24 @@ static int lba_capacity_is_ok (struct hd_driveid *id)
return 0; /* lba_capacity value may be bad */ return 0; /* lba_capacity value may be bad */
} }
static int idedisk_start_tag(ide_drive_t *drive, struct request *rq)
{
unsigned long flags;
int ret = 1;
spin_lock_irqsave(&ide_lock, flags);
if (ata_pending_commands(drive) < drive->queue_depth)
ret = blk_queue_start_tag(&drive->queue, rq);
spin_unlock_irqrestore(&ide_lock, flags);
return ret;
}
#ifndef CONFIG_IDE_TASKFILE_IO #ifndef CONFIG_IDE_TASKFILE_IO
static int driver_blocked;
/* /*
* read_intr() is the handler for disk read/multread interrupts * read_intr() is the handler for disk read/multread interrupts
*/ */
...@@ -344,20 +358,6 @@ static ide_startstop_t multwrite_intr (ide_drive_t *drive) ...@@ -344,20 +358,6 @@ static ide_startstop_t multwrite_intr (ide_drive_t *drive)
return DRIVER(drive)->error(drive, "multwrite_intr", stat); return DRIVER(drive)->error(drive, "multwrite_intr", stat);
} }
static int idedisk_start_tag(ide_drive_t *drive, struct request *rq)
{
unsigned long flags;
int ret = 1;
spin_lock_irqsave(&ide_lock, flags);
if (ata_pending_commands(drive) < drive->queue_depth)
ret = blk_queue_start_tag(&drive->queue, rq);
spin_unlock_irqrestore(&ide_lock, flags);
return ret;
}
/* /*
* do_rw_disk() issues READ and WRITE commands to a disk, * do_rw_disk() issues READ and WRITE commands to a disk,
* using LBA if supported, or CHS otherwise, to address sectors. * using LBA if supported, or CHS otherwise, to address sectors.
...@@ -744,7 +744,7 @@ static ide_startstop_t lba_48_rw_disk (ide_drive_t *drive, struct request *rq, u ...@@ -744,7 +744,7 @@ static ide_startstop_t lba_48_rw_disk (ide_drive_t *drive, struct request *rq, u
args.tfRegister[IDE_FEATURE_OFFSET] = sectors; args.tfRegister[IDE_FEATURE_OFFSET] = sectors;
args.tfRegister[IDE_NSECTOR_OFFSET] = rq->tag << 3; args.tfRegister[IDE_NSECTOR_OFFSET] = rq->tag << 3;
args.hobRegister[IDE_FEATURE_OFFSET_HOB] = sectors >> 8; args.hobRegister[IDE_FEATURE_OFFSET_HOB] = sectors >> 8;
args.hobRegister[IDE_NSECT_OFFSET_HOB] = 0; args.hobRegister[IDE_NSECTOR_OFFSET_HOB] = 0;
} else { } else {
args.tfRegister[IDE_NSECTOR_OFFSET] = sectors; args.tfRegister[IDE_NSECTOR_OFFSET] = sectors;
args.hobRegister[IDE_NSECTOR_OFFSET_HOB] = sectors >> 8; args.hobRegister[IDE_NSECTOR_OFFSET_HOB] = sectors >> 8;
......
...@@ -189,15 +189,15 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task) ...@@ -189,15 +189,15 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
case WIN_WRITEDMA_ONCE: case WIN_WRITEDMA_ONCE:
case WIN_WRITEDMA: case WIN_WRITEDMA:
case WIN_WRITEDMA_EXT: case WIN_WRITEDMA_EXT:
if (hwif->ide_dma_write(drive)) if (!hwif->ide_dma_write(drive))
return ide_stopped; return ide_started;
break; break;
case WIN_READDMA_ONCE: case WIN_READDMA_ONCE:
case WIN_READDMA: case WIN_READDMA:
case WIN_READDMA_EXT: case WIN_READDMA_EXT:
case WIN_IDENTIFY_DMA: case WIN_IDENTIFY_DMA:
if (hwif->ide_dma_read(drive)) if (!hwif->ide_dma_read(drive))
return ide_stopped; return ide_started;
break; break;
case WIN_READDMA_QUEUED: case WIN_READDMA_QUEUED:
case WIN_READDMA_QUEUED_EXT: case WIN_READDMA_QUEUED_EXT:
......
...@@ -63,7 +63,7 @@ static spinlock_t macio_lock = SPIN_LOCK_UNLOCKED; ...@@ -63,7 +63,7 @@ static spinlock_t macio_lock = SPIN_LOCK_UNLOCKED;
static int macio_probe(void); static int macio_probe(void);
static int macio_init(void); static int macio_init(void);
static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs); static irqreturn_t macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs);
static int macio_send_request(struct adb_request *req, int sync); static int macio_send_request(struct adb_request *req, int sync);
static int macio_adb_autopoll(int devs); static int macio_adb_autopoll(int devs);
static void macio_adb_poll(void); static void macio_adb_poll(void);
...@@ -198,7 +198,8 @@ static int macio_send_request(struct adb_request *req, int sync) ...@@ -198,7 +198,8 @@ static int macio_send_request(struct adb_request *req, int sync)
return 0; return 0;
} }
static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs) static irqreturn_t macio_adb_interrupt(int irq, void *arg,
struct pt_regs *regs)
{ {
int i, n, err; int i, n, err;
struct adb_request *req; struct adb_request *req;
...@@ -206,9 +207,11 @@ static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -206,9 +207,11 @@ static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs)
int ibuf_len = 0; int ibuf_len = 0;
int complete = 0; int complete = 0;
int autopoll = 0; int autopoll = 0;
int handled = 0;
spin_lock(&macio_lock); spin_lock(&macio_lock);
if (in_8(&adb->intr.r) & TAG) { if (in_8(&adb->intr.r) & TAG) {
handled = 1;
if ((req = current_req) != 0) { if ((req = current_req) != 0) {
/* put the current request in */ /* put the current request in */
for (i = 0; i < req->nbytes; ++i) for (i = 0; i < req->nbytes; ++i)
...@@ -229,6 +232,7 @@ static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -229,6 +232,7 @@ static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs)
} }
if (in_8(&adb->intr.r) & DFB) { if (in_8(&adb->intr.r) & DFB) {
handled = 1;
err = in_8(&adb->error.r); err = in_8(&adb->error.r);
if (current_req && current_req->sent) { if (current_req && current_req->sent) {
/* this is the response to a command */ /* this is the response to a command */
...@@ -266,6 +270,8 @@ static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -266,6 +270,8 @@ static void macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs)
} }
if (ibuf_len) if (ibuf_len)
adb_input(ibuf, ibuf_len, regs, autopoll); adb_input(ibuf, ibuf_len, regs, autopoll);
return IRQ_RETVAL(handled);
} }
static void macio_adb_poll(void) static void macio_adb_poll(void)
......
...@@ -154,8 +154,8 @@ static int set_scc_power(struct mac_serial * info, int state); ...@@ -154,8 +154,8 @@ static int set_scc_power(struct mac_serial * info, int state);
static int setup_scc(struct mac_serial * info); static int setup_scc(struct mac_serial * info);
static void dbdma_reset(volatile struct dbdma_regs *dma); static void dbdma_reset(volatile struct dbdma_regs *dma);
static void dbdma_flush(volatile struct dbdma_regs *dma); static void dbdma_flush(volatile struct dbdma_regs *dma);
static void rs_txdma_irq(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t rs_txdma_irq(int irq, void *dev_id, struct pt_regs *regs);
static void rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs);
static void dma_init(struct mac_serial * info); static void dma_init(struct mac_serial * info);
static void rxdma_start(struct mac_serial * info, int current); static void rxdma_start(struct mac_serial * info, int current);
static void rxdma_to_tty(struct mac_serial * info); static void rxdma_to_tty(struct mac_serial * info);
...@@ -558,18 +558,19 @@ static _INLINE_ void receive_special_dma(struct mac_serial *info) ...@@ -558,18 +558,19 @@ static _INLINE_ void receive_special_dma(struct mac_serial *info)
/* /*
* This is the serial driver's generic interrupt routine * This is the serial driver's generic interrupt routine
*/ */
static void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs) static irqreturn_t rs_interrupt(int irq, void *dev_id, struct pt_regs * regs)
{ {
struct mac_serial *info = (struct mac_serial *) dev_id; struct mac_serial *info = (struct mac_serial *) dev_id;
unsigned char zs_intreg; unsigned char zs_intreg;
int shift; int shift;
unsigned long flags; unsigned long flags;
int handled = 0;
if (!(info->flags & ZILOG_INITIALIZED)) { if (!(info->flags & ZILOG_INITIALIZED)) {
printk(KERN_WARNING "rs_interrupt: irq %d, port not " printk(KERN_WARNING "rs_interrupt: irq %d, port not "
"initialized\n", irq); "initialized\n", irq);
disable_irq(irq); disable_irq(irq);
return; return IRQ_NONE;
} }
/* NOTE: The read register 3, which holds the irq status, /* NOTE: The read register 3, which holds the irq status,
...@@ -595,6 +596,7 @@ static void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs) ...@@ -595,6 +596,7 @@ static void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs)
if ((zs_intreg & CHAN_IRQMASK) == 0) if ((zs_intreg & CHAN_IRQMASK) == 0)
break; break;
handled = 1;
if (zs_intreg & CHBRxIP) { if (zs_intreg & CHBRxIP) {
/* If we are doing DMA, we only ask for interrupts /* If we are doing DMA, we only ask for interrupts
...@@ -610,30 +612,32 @@ static void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs) ...@@ -610,30 +612,32 @@ static void rs_interrupt(int irq, void *dev_id, struct pt_regs * regs)
status_handle(info); status_handle(info);
} }
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
return IRQ_RETVAL(handled);
} }
/* Transmit DMA interrupt - not used at present */ /* Transmit DMA interrupt - not used at present */
static void rs_txdma_irq(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t rs_txdma_irq(int irq, void *dev_id, struct pt_regs *regs)
{ {
return IRQ_HANDLED;
} }
/* /*
* Receive DMA interrupt. * Receive DMA interrupt.
*/ */
static void rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct mac_serial *info = (struct mac_serial *) dev_id; struct mac_serial *info = (struct mac_serial *) dev_id;
volatile struct dbdma_cmd *cd; volatile struct dbdma_cmd *cd;
if (!info->dma_initted) if (!info->dma_initted)
return; return IRQ_NONE;
spin_lock(&info->rx_dma_lock); spin_lock(&info->rx_dma_lock);
/* First, confirm that this interrupt is, indeed, coming */ /* First, confirm that this interrupt is, indeed, coming */
/* from Rx DMA */ /* from Rx DMA */
cd = info->rx_cmds[info->rx_cbuf] + 2; cd = info->rx_cmds[info->rx_cbuf] + 2;
if ((in_le16(&cd->xfer_status) & (RUN | ACTIVE)) != (RUN | ACTIVE)) { if ((in_le16(&cd->xfer_status) & (RUN | ACTIVE)) != (RUN | ACTIVE)) {
spin_unlock(&info->rx_dma_lock); spin_unlock(&info->rx_dma_lock);
return; return IRQ_NONE;
} }
if (info->rx_fbuf != RX_NO_FBUF) { if (info->rx_fbuf != RX_NO_FBUF) {
info->rx_cbuf = info->rx_fbuf; info->rx_cbuf = info->rx_fbuf;
...@@ -643,6 +647,7 @@ static void rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs) ...@@ -643,6 +647,7 @@ static void rs_rxdma_irq(int irq, void *dev_id, struct pt_regs *regs)
info->rx_fbuf = RX_NO_FBUF; info->rx_fbuf = RX_NO_FBUF;
} }
spin_unlock(&info->rx_dma_lock); spin_unlock(&info->rx_dma_lock);
return IRQ_HANDLED;
} }
/* /*
...@@ -2660,9 +2665,9 @@ int macserial_init(void) ...@@ -2660,9 +2665,9 @@ int macserial_init(void)
callout_driver.proc_entry = 0; callout_driver.proc_entry = 0;
if (tty_register_driver(&serial_driver)) if (tty_register_driver(&serial_driver))
panic("Couldn't register serial driver\n"); printk(KERN_ERR "Error: couldn't register serial driver\n");
if (tty_register_driver(&callout_driver)) if (tty_register_driver(&callout_driver))
panic("Couldn't register callout driver\n"); printk(KERN_ERR "Error: couldn't register callout driver\n");
for (channel = 0; channel < zs_channels_found; ++channel) { for (channel = 0; channel < zs_channels_found; ++channel) {
#ifdef CONFIG_KGDB #ifdef CONFIG_KGDB
......
...@@ -107,7 +107,7 @@ static int cuda_reset_adb_bus(void); ...@@ -107,7 +107,7 @@ static int cuda_reset_adb_bus(void);
static int cuda_init_via(void); static int cuda_init_via(void);
static void cuda_start(void); static void cuda_start(void);
static void cuda_interrupt(int irq, void *arg, struct pt_regs *regs); static irqreturn_t cuda_interrupt(int irq, void *arg, struct pt_regs *regs);
static void cuda_input(unsigned char *buf, int nb, struct pt_regs *regs); static void cuda_input(unsigned char *buf, int nb, struct pt_regs *regs);
void cuda_poll(void); void cuda_poll(void);
static int cuda_write(struct adb_request *req); static int cuda_write(struct adb_request *req);
...@@ -441,7 +441,7 @@ cuda_poll() ...@@ -441,7 +441,7 @@ cuda_poll()
local_irq_restore(flags); local_irq_restore(flags);
} }
static void static irqreturn_t
cuda_interrupt(int irq, void *arg, struct pt_regs *regs) cuda_interrupt(int irq, void *arg, struct pt_regs *regs)
{ {
int status; int status;
...@@ -457,7 +457,7 @@ cuda_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -457,7 +457,7 @@ cuda_interrupt(int irq, void *arg, struct pt_regs *regs)
out_8(&via[IFR], virq); out_8(&via[IFR], virq);
if ((virq & SR_INT) == 0) { if ((virq & SR_INT) == 0) {
spin_unlock(&cuda_lock); spin_unlock(&cuda_lock);
return; return IRQ_NONE;
} }
status = (~in_8(&via[B]) & (TIP|TREQ)) | (in_8(&via[ACR]) & SR_OUT); status = (~in_8(&via[B]) & (TIP|TREQ)) | (in_8(&via[ACR]) & SR_OUT);
...@@ -595,6 +595,7 @@ cuda_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -595,6 +595,7 @@ cuda_interrupt(int irq, void *arg, struct pt_regs *regs)
} }
if (ibuf_len) if (ibuf_len)
cuda_input(ibuf, ibuf_len, regs); cuda_input(ibuf, ibuf_len, regs);
return IRQ_HANDLED;
} }
static void static void
......
...@@ -180,8 +180,8 @@ static int pmu_adb_reset_bus(void); ...@@ -180,8 +180,8 @@ static int pmu_adb_reset_bus(void);
static int init_pmu(void); static int init_pmu(void);
static int pmu_queue_request(struct adb_request *req); static int pmu_queue_request(struct adb_request *req);
static void pmu_start(void); static void pmu_start(void);
static void via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs); static irqreturn_t via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs);
static void gpio1_interrupt(int irq, void *arg, struct pt_regs *regs); static irqreturn_t gpio1_interrupt(int irq, void *arg, struct pt_regs *regs);
static int proc_get_info(char *page, char **start, off_t off, static int proc_get_info(char *page, char **start, off_t off,
int count, int *eof, void *data); int count, int *eof, void *data);
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
...@@ -1393,7 +1393,7 @@ pmu_sr_intr(struct pt_regs *regs) ...@@ -1393,7 +1393,7 @@ pmu_sr_intr(struct pt_regs *regs)
return NULL; return NULL;
} }
static void __pmac static irqreturn_t __pmac
via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs) via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs)
{ {
unsigned long flags; unsigned long flags;
...@@ -1401,7 +1401,8 @@ via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -1401,7 +1401,8 @@ via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs)
int nloop = 0; int nloop = 0;
int int_data = -1; int int_data = -1;
struct adb_request *req = NULL; struct adb_request *req = NULL;
int handled = 0;
/* This is a bit brutal, we can probably do better */ /* This is a bit brutal, we can probably do better */
spin_lock_irqsave(&pmu_lock, flags); spin_lock_irqsave(&pmu_lock, flags);
++disable_poll; ++disable_poll;
...@@ -1410,6 +1411,7 @@ via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -1410,6 +1411,7 @@ via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs)
intr = in_8(&via[IFR]) & (SR_INT | CB1_INT); intr = in_8(&via[IFR]) & (SR_INT | CB1_INT);
if (intr == 0) if (intr == 0)
break; break;
handled = 1;
if (++nloop > 1000) { if (++nloop > 1000) {
printk(KERN_DEBUG "PMU: stuck in intr loop, " printk(KERN_DEBUG "PMU: stuck in intr loop, "
"intr=%x, ier=%x pmu_state=%d\n", "intr=%x, ier=%x pmu_state=%d\n",
...@@ -1473,15 +1475,19 @@ via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs) ...@@ -1473,15 +1475,19 @@ via_pmu_interrupt(int irq, void *arg, struct pt_regs *regs)
int_data = -1; int_data = -1;
goto recheck; goto recheck;
} }
return IRQ_RETVAL(handled);
} }
static void __pmac static irqreturn_t __pmac
gpio1_interrupt(int irq, void *arg, struct pt_regs *regs) gpio1_interrupt(int irq, void *arg, struct pt_regs *regs)
{ {
if ((in_8(gpio_reg + 0x9) & 0x02) == 0) { if ((in_8(gpio_reg + 0x9) & 0x02) == 0) {
adb_int_pending = 1; adb_int_pending = 1;
via_pmu_interrupt(0, 0, 0); via_pmu_interrupt(0, 0, 0);
return IRQ_HANDLED;
} }
return IRQ_NONE;
} }
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
......
...@@ -227,25 +227,6 @@ typedef unsigned char byte; /* used everywhere */ ...@@ -227,25 +227,6 @@ typedef unsigned char byte; /* used everywhere */
#define PRD_BYTES 8 #define PRD_BYTES 8
#define PRD_ENTRIES (PAGE_SIZE / (2 * PRD_BYTES)) #define PRD_ENTRIES (PAGE_SIZE / (2 * PRD_BYTES))
/*
* Our Physical Region Descriptor (PRD) table should be large enough
* to handle the biggest I/O request we are likely to see. Since requests
* can have no more than 256 sectors, and since the typical blocksize is
* two or more sectors, we could get by with a limit of 128 entries here for
* the usual worst case. Most requests seem to include some contiguous blocks,
* further reducing the number of table entries required.
*
* The driver reverts to PIO mode for individual requests that exceed
* this limit (possible with 512 byte blocksizes, eg. MSDOS f/s), so handling
* 100% of all crazy scenarios here is not necessary.
*
* As it turns out though, we must allocate a full 4KB page for this,
* so the two PRD tables (ide0 & ide1) will each get half of that,
* allowing each to have about 256 entries (8 bytes each) from this.
*/
#define PRD_BYTES 8
#define PRD_ENTRIES (PAGE_SIZE / (2 * PRD_BYTES))
/* /*
* Some more useful definitions * Some more useful definitions
*/ */
......
...@@ -174,6 +174,8 @@ static void ipip_err(struct sk_buff *skb, u32 info) ...@@ -174,6 +174,8 @@ static void ipip_err(struct sk_buff *skb, u32 info)
static int ipip_init_state(struct xfrm_state *x, void *args) static int ipip_init_state(struct xfrm_state *x, void *args)
{ {
if (!x->props.mode)
return -EINVAL;
x->props.header_len = sizeof(struct iphdr); x->props.header_len = sizeof(struct iphdr);
return 0; return 0;
......
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