--- linux/kernel/blk_drv/hd.c 2018/04/24 18:08:09 1.1.1.7 +++ linux/kernel/blk_drv/hd.c 2018/04/24 18:15:22 1.1.1.10 @@ -1,7 +1,7 @@ /* * linux/kernel/hd.c * - * (C) 1991 Linus Torvalds + * Copyright (C) 1991, 1992 Linus Torvalds */ /* @@ -16,14 +16,21 @@ * in the early extended-partition checks and added DM partitions */ -#include - #include +#ifdef CONFIG_BLK_DEV_HD + +#define HD_IRQ 14 + +#include +#include #include #include #include #include #include +#include + +#define REALLY_SLOW_IO #include #include #include @@ -46,7 +53,8 @@ static inline unsigned char CMOS_READ(un static void recal_intr(void); static void bad_rw_intr(void); -static int recalibrate = 0; +static char recalibrate[ MAX_HD ] = { 0, }; + static int reset = 0; #if (HD_DELAY > 0) @@ -67,11 +75,7 @@ struct hd_i_struct hd_info[] = { {0,0,0, static int NR_HD = 0; #endif -static struct hd_struct { - long start_sect; - long nr_sects; -} hd[MAX_HD<<6]={{0,0},}; - +static struct hd_struct hd[MAX_HD<<6]={{0,0},}; static int hd_sizes[MAX_HD<<6] = {0, }; #define port_read(port,buf,nr) \ @@ -80,208 +84,6 @@ __asm__("cld;rep;insw"::"d" (port),"D" ( #define port_write(port,buf,nr) \ __asm__("cld;rep;outsw"::"d" (port),"S" (buf),"c" (nr):"cx","si") -extern void hd_interrupt(void); -extern void rd_load(void); - -static unsigned int current_minor; - -/* - * Create devices for each logical partition in an extended partition. - * The logical partitions form a linked list, with each entry being - * a partition table with two entries. The first entry - * is the real data partition (with a start relative to the partition - * table start). The second is a pointer to the next logical partition - * (with a start relative to the entire extended partition). - * We do not create a Linux partition for the partition tables, but - * only for the actual data partitions. - */ -static void extended_partition(unsigned int dev) -{ - struct buffer_head *bh; - struct partition *p; - unsigned long first_sector, this_sector; - - first_sector = hd[MINOR(dev)].start_sect; - this_sector = first_sector; - - while (1) { - if ((current_minor & 0x3f) >= 60) - return; - if (!(bh = bread(dev,0))) { - printk("Unable to read partition table of device %04x\n",dev); - return; - } - /* - * This block is from a device that we're about to stomp on. - * So make sure nobody thinks this block is usable. - */ - bh->b_dirt=0; - bh->b_uptodate=0; - if (*(unsigned short *) (bh->b_data+510) == 0xAA55) { - p = 0x1BE + (void *)bh->b_data; - /* - * Process the first entry, which should be the real - * data partition. - */ - if (p->sys_ind == EXTENDED_PARTITION || - !(hd[current_minor].nr_sects = p->nr_sects)) - goto done; /* shouldn't happen */ - hd[current_minor].start_sect = this_sector + p->start_sect; - printk(" Logical part %d start %d size %d end %d\n\r", - current_minor, hd[current_minor].start_sect, - hd[current_minor].nr_sects, - hd[current_minor].start_sect + - hd[current_minor].nr_sects - 1); - current_minor++; - p++; - /* - * Process the second entry, which should be a link - * to the next logical partition. Create a minor - * for this just long enough to get the next partition - * table. The minor will be reused for the real - * data partition. - */ - if (p->sys_ind != EXTENDED_PARTITION || - !(hd[current_minor].nr_sects = p->nr_sects)) - goto done; /* no more logicals in this partition */ - hd[current_minor].start_sect = first_sector + p->start_sect; - this_sector = first_sector + p->start_sect; - dev = 0x0300 | current_minor; - brelse(bh); - } else - goto done; - } -done: - brelse(bh); -} - -static void check_partition(unsigned int dev) -{ - int i, minor = current_minor; - struct buffer_head *bh; - struct partition *p; - unsigned long first_sector; - - first_sector = hd[MINOR(dev)].start_sect; - if (!(bh = bread(dev,0))) { - printk("Unable to read partition table of device %04x\n",dev); - return; - } - printk("Drive %d:\n\r",minor >> 6); - current_minor += 4; /* first "extra" minor */ - if (*(unsigned short *) (bh->b_data+510) == 0xAA55) { - p = 0x1BE + (void *)bh->b_data; - for (i=1 ; i<=4 ; minor++,i++,p++) { - if (!(hd[minor].nr_sects = p->nr_sects)) - continue; - hd[minor].start_sect = first_sector + p->start_sect; - printk(" part %d start %d size %d end %d \n\r", i, - hd[minor].start_sect, hd[minor].nr_sects, - hd[minor].start_sect + hd[minor].nr_sects - 1); - if ((current_minor & 0x3f) >= 60) - continue; - if (p->sys_ind == EXTENDED_PARTITION) { - extended_partition(0x0300 | minor); - } - } - /* - * check for Disk Manager partition table - */ - if (*(unsigned short *) (bh->b_data+0xfc) == 0x55AA) { - p = 0x1BE + (void *)bh->b_data; - for (i = 4 ; i < 16 ; i++, current_minor++) { - p--; - if ((current_minor & 0x3f) >= 60) - break; - if (!(p->start_sect && p->nr_sects)) - continue; - hd[current_minor].start_sect = p->start_sect; - hd[current_minor].nr_sects = p->nr_sects; - printk(" DM part %d start %d size %d end %d\n\r", - current_minor, - hd[current_minor].start_sect, - hd[current_minor].nr_sects, - hd[current_minor].start_sect + - hd[current_minor].nr_sects - 1); - } - } - } else - printk("Bad partition table on dev %04x\n",dev); - brelse(bh); -} - -/* This may be used only once, enforced by 'static int callable' */ -int sys_setup(void * BIOS) -{ - static int callable = 1; - int i,drive; - unsigned char cmos_disks; - - if (!callable) - return -1; - callable = 0; -#ifndef HD_TYPE - for (drive=0 ; drive<2 ; drive++) { - hd_info[drive].cyl = *(unsigned short *) BIOS; - hd_info[drive].head = *(unsigned char *) (2+BIOS); - hd_info[drive].wpcom = *(unsigned short *) (5+BIOS); - hd_info[drive].ctl = *(unsigned char *) (8+BIOS); - hd_info[drive].lzone = *(unsigned short *) (12+BIOS); - hd_info[drive].sect = *(unsigned char *) (14+BIOS); - BIOS += 16; - } - - /* - We querry CMOS about hard disks : it could be that - we have a SCSI/ESDI/etc controller that is BIOS - compatable with ST-506, and thus showing up in our - BIOS table, but not register compatable, and therefore - not present in CMOS. - - Furthurmore, we will assume that our ST-506 drives - are the primary drives in the system, and - the ones reflected as drive 1 or 2. - - The first drive is stored in the high nibble of CMOS - byte 0x12, the second in the low nibble. This will be - either a 4 bit drive type or 0xf indicating use byte 0x19 - for an 8 bit type, drive 1, 0x1a for drive 2 in CMOS. - - Needless to say, a non-zero value means we have - an AT controller hard disk for that drive. - - - */ - - if ((cmos_disks = CMOS_READ(0x12)) & 0xf0) - if (cmos_disks & 0x0f) - NR_HD = 2; - else - NR_HD = 1; - else - NR_HD = 0; -#endif - for (i = 0 ; i < (MAX_HD<<6) ; i++) { - hd[i].start_sect = 0; - hd[i].nr_sects = 0; - } - for (i = 0 ; i < NR_HD ; i++) - hd[i<<6].nr_sects = hd_info[i].head* - hd_info[i].sect*hd_info[i].cyl; - for (drive=0 ; drive>1 ; - blk_size[MAJOR_NR] = hd_sizes; - if (NR_HD) - printk("Partition table%s ok.\n\r",(NR_HD>1)?"s":""); - rd_load(); - mount_root(); - return (0); -} - #if (HD_DELAY > 0) unsigned long read_timer(void) { @@ -316,10 +118,13 @@ static int win_result(void) if ((i & (BUSY_STAT | READY_STAT | WRERR_STAT | SEEK_STAT | ERR_STAT)) == (READY_STAT | SEEK_STAT)) - return(0); /* ok */ - if (i&1) + return 0; /* ok */ + printk("HD: win_result: status = 0x%02x\n",i); + if (i&1) { i=inb(HD_ERROR); - return (1); + printk("HD: win_result: error = 0x%02x\n",i); + } + return 1; } static void hd_out(unsigned int drive,unsigned int nsect,unsigned int sect, @@ -361,7 +166,7 @@ static int drive_busy(void) if (c == (READY_STAT | SEEK_STAT)) return 0; } - printk("HD controller times out, c=%02x\n\r",c); + printk("HD controller times out, status = 0x%02x\n\r",c); return(1); } @@ -410,28 +215,34 @@ repeat: */ void unexpected_hd_interrupt(void) { + sti(); printk("Unexpected HD interrupt\n\r"); SET_TIMER; -#if 0 - reset = 1; - do_hd_request(); -#endif } static void bad_rw_intr(void) { + int i; + if (!CURRENT) return; if (++CURRENT->errors >= MAX_ERRORS) - if (CURRENT->bh && CURRENT->nr_sectors > 2) { - CURRENT->nr_sectors &= ~1; - next_buffer(0); - } else - end_request(0); - if (CURRENT->errors > MAX_ERRORS/2) + end_request(0); + else if (CURRENT->errors > MAX_ERRORS/2) reset = 1; else - recalibrate = 1; + for (i=0; i < NR_HD; i++) + recalibrate[i] = 1; +} + +static inline int wait_DRQ(void) +{ + int retries = 100000; + + while (--retries > 0) + if (inb_p(HD_STATUS) & DRQ_STAT) + return 0; + return -1; } #define STAT_MASK (BUSY_STAT | READY_STAT | WRERR_STAT | SEEK_STAT | ERR_STAT) @@ -440,72 +251,90 @@ static void bad_rw_intr(void) static void read_intr(void) { int i; + int retries = 100000; - i = (unsigned) inb_p(HD_STATUS); - if (!(i & DRQ_STAT)) - goto bad_read; - if ((i & STAT_MASK) != STAT_OK) - goto bad_read; - port_read(HD_DATA,CURRENT->buffer,256); - i = (unsigned) inb_p(HD_STATUS); - if (!(i & BUSY_STAT)) + do { + i = (unsigned) inb_p(HD_STATUS); if ((i & STAT_MASK) != STAT_OK) - goto bad_read; + break; + if (i & DRQ_STAT) + goto ok_to_read; + } while (--retries > 0); + sti(); + printk("HD: read_intr: status = 0x%02x\n",i); + if (i & ERR_STAT) { + i = (unsigned) inb(HD_ERROR); + printk("HD: read_intr: error = 0x%02x\n",i); + } + bad_rw_intr(); + cli(); + do_hd_request(); + return; +ok_to_read: + port_read(HD_DATA,CURRENT->buffer,256); CURRENT->errors = 0; - if (CURRENT->bh && (CURRENT->nr_sectors&1) && CURRENT->nr_sectors > 2) - next_buffer(1); - else - CURRENT->buffer += 512; + CURRENT->buffer += 512; CURRENT->sector++; - if (--CURRENT->nr_sectors) { + i = --CURRENT->nr_sectors; + --CURRENT->current_nr_sectors; +#ifdef DEBUG + printk("hd%d : sector = %d, %d remaining to buffer = %08x\n", + MINOR(CURRENT->dev), CURRENT->sector, i, CURRENT-> + buffer); +#endif + if (!i || (CURRENT->bh && !SUBSECTOR(i))) + end_request(1); + if (i > 0) { SET_INTR(&read_intr); + sti(); return; } - end_request(1); #if (HD_DELAY > 0) last_req = read_timer(); #endif do_hd_request(); return; -bad_read: - if (i & ERR_STAT) - i = (unsigned) inb(HD_ERROR); - bad_rw_intr(); - do_hd_request(); - return; } static void write_intr(void) { int i; + int retries = 100000; - i = (unsigned) inb_p(HD_STATUS); - if ((i & STAT_MASK) != STAT_OK) - goto bad_write; - if (CURRENT->nr_sectors < 2) { + do { + i = (unsigned) inb_p(HD_STATUS); + if ((i & STAT_MASK) != STAT_OK) + break; + if ((CURRENT->nr_sectors <= 1) || (i & DRQ_STAT)) + goto ok_to_write; + } while (--retries > 0); + sti(); + printk("HD: write_intr: status = 0x%02x\n",i); + if (i & ERR_STAT) { + i = (unsigned) inb(HD_ERROR); + printk("HD: write_intr: error = 0x%02x\n",i); + } + bad_rw_intr(); + cli(); + do_hd_request(); + return; +ok_to_write: + CURRENT->sector++; + i = --CURRENT->nr_sectors; + --CURRENT->current_nr_sectors; + CURRENT->buffer += 512; + if (!i || (CURRENT->bh && !SUBSECTOR(i))) end_request(1); + if (i > 0) { + SET_INTR(&write_intr); + port_write(HD_DATA,CURRENT->buffer,256); + sti(); + } else { #if (HD_DELAY > 0) last_req = read_timer(); #endif do_hd_request(); - return; } - if (!(i & DRQ_STAT)) - goto bad_write; - CURRENT->sector++; - CURRENT->nr_sectors--; - if (CURRENT->bh && !(CURRENT->nr_sectors & 1)) - next_buffer(1); - else - CURRENT->buffer += 512; - SET_INTR(&write_intr); - port_write(HD_DATA,CURRENT->buffer,256); - return; -bad_write: - if (i & ERR_STAT) - i = (unsigned) inb(HD_ERROR); - bad_rw_intr(); - do_hd_request(); return; } @@ -521,73 +350,103 @@ static void recal_intr(void) * best idea seems to just set reset, and start all over again. */ static void hd_times_out(void) -{ - do_hd = NULL; +{ + DEVICE_INTR = NULL; + sti(); reset = 1; if (!CURRENT) return; printk("HD timeout\n\r"); cli(); - if (++CURRENT->errors >= MAX_ERRORS) - if (CURRENT->bh && CURRENT->nr_sectors > 2) { - CURRENT->nr_sectors &= ~1; - next_buffer(0); - } else - end_request(0); + if (++CURRENT->errors >= MAX_ERRORS) { +#ifdef DEBUG + printk("hd : too many errors.\n"); +#endif + end_request(0); + } + do_hd_request(); } +/* + * The driver has been modified to enable interrupts a bit more: in order to + * do this we first (a) disable the timeout-interrupt and (b) clear the + * device-interrupt. This way the interrupts won't mess with out code (the + * worst that can happen is that an unexpected HD-interrupt comes in and + * sets the "reset" variable and starts the timer) + */ static void do_hd_request(void) { - int i,r; unsigned int block,dev; - unsigned int sec,head,cyl; + unsigned int sec,head,cyl,track; unsigned int nsect; + if (DEVICE_INTR) + return; +repeat: + timer_active &= ~(1<dev); block = CURRENT->sector; nsect = CURRENT->nr_sectors; - if (dev >= (NR_HD<<6) || block+nsect > hd[dev].nr_sects) { + if (dev >= (NR_HD<<6) || block >= hd[dev].nr_sects) { +#ifdef DEBUG + printk("hd%d : attempted read for sector %d past end of device at sector %d.\n", + block, hd[dev].nr_sects); +#endif end_request(0); goto repeat; } block += hd[dev].start_sect; dev >>= 6; - sec = block % hd_info[dev].sect; - block /= hd_info[dev].sect; - head = block % hd_info[dev].head; - cyl = block / hd_info[dev].head; - sec++; + sec = block % hd_info[dev].sect + 1; + track = block / hd_info[dev].sect; + head = track % hd_info[dev].head; + cyl = track / hd_info[dev].head; +#ifdef DEBUG + printk("hd%d : cyl = %d, head = %d, sector = %d, buffer = %08x\n", + dev, cyl, head, sec, CURRENT->buffer); +#endif + cli(); if (reset) { - recalibrate = 1; + int i; + + for (i=0; i < NR_HD; i++) + recalibrate[i] = 1; reset_hd(); + sti(); return; } - if (recalibrate) { - recalibrate = 0; + if (recalibrate[dev]) { + recalibrate[dev] = 0; hd_out(dev,hd_info[dev].sect,0,0,0,WIN_RESTORE,&recal_intr); if (reset) goto repeat; + sti(); return; } if (CURRENT->cmd == WRITE) { hd_out(dev,nsect,sec,head,cyl,WIN_WRITE,&write_intr); if (reset) goto repeat; - for(i=0 ; i<10000 && !(r=inb_p(HD_STATUS)&DRQ_STAT) ; i++) - /* nothing */ ; - if (!r) { + if (wait_DRQ()) { + printk("HD: do_hd_request: no DRQ\n"); bad_rw_intr(); goto repeat; } port_write(HD_DATA,CURRENT->buffer,256); - } else if (CURRENT->cmd == READ) { + sti(); + return; + } + if (CURRENT->cmd == READ) { hd_out(dev,nsect,sec,head,cyl,WIN_READ,&read_intr); if (reset) goto repeat; - } else - panic("unknown hd-command"); + sti(); + return; + } + panic("unknown hd-command"); } static int hd_ioctl(struct inode * inode, struct file * file, @@ -610,7 +469,10 @@ static int hd_ioctl(struct inode * inode (char *) &loc->sectors); put_fs_word(hd_info[dev].cyl, (short *) &loc->cylinders); + put_fs_long(hd[MINOR(inode->i_rdev)].start_sect, + (long *) &loc->start); return 0; + RO_IOCTLS(inode->i_rdev,arg); default: return -EINVAL; } @@ -625,6 +487,78 @@ static void hd_release(struct inode * in sync_dev(inode->i_rdev); } +static void hd_geninit(); + +static struct gendisk hd_gendisk = { + MAJOR_NR, /* Major number */ + "hd", /* Major name */ + 6, /* Bits to shift to get real from partition */ + 1 << 6, /* Number of partitions per real */ + MAX_HD, /* maximum number of real */ + hd_geninit, /* init function */ + hd, /* hd struct */ + hd_sizes, /* block sizes */ + 0, /* number */ + (void *) hd_info, /* internal */ + NULL /* next */ +}; + +static void hd_geninit(void) +{ + int drive, i; +#ifndef HD_TYPE + extern struct drive_info drive_info; + void *BIOS = (void *) &drive_info; + int cmos_disks; + + for (drive=0 ; drive<2 ; drive++) { + hd_info[drive].cyl = *(unsigned short *) BIOS; + hd_info[drive].head = *(unsigned char *) (2+BIOS); + hd_info[drive].wpcom = *(unsigned short *) (5+BIOS); + hd_info[drive].ctl = *(unsigned char *) (8+BIOS); + hd_info[drive].lzone = *(unsigned short *) (12+BIOS); + hd_info[drive].sect = *(unsigned char *) (14+BIOS); + BIOS += 16; + } + + /* + We querry CMOS about hard disks : it could be that + we have a SCSI/ESDI/etc controller that is BIOS + compatable with ST-506, and thus showing up in our + BIOS table, but not register compatable, and therefore + not present in CMOS. + + Furthurmore, we will assume that our ST-506 drives + are the primary drives in the system, and + the ones reflected as drive 1 or 2. + + The first drive is stored in the high nibble of CMOS + byte 0x12, the second in the low nibble. This will be + either a 4 bit drive type or 0xf indicating use byte 0x19 + for an 8 bit type, drive 1, 0x1a for drive 2 in CMOS. + + Needless to say, a non-zero value means we have + an AT controller hard disk for that drive. + + + */ + + if ((cmos_disks = CMOS_READ(0x12)) & 0xf0) + if (cmos_disks & 0x0f) + NR_HD = 2; + else + NR_HD = 1; + else + NR_HD = 0; +#endif + + for (i = 0 ; i < NR_HD ; i++) + hd[i<<6].nr_sects = hd_info[i].head* + hd_info[i].sect*hd_info[i].cyl; + + hd_gendisk.nr_real = NR_HD; +} + static struct file_operations hd_fops = { NULL, /* lseek - default */ block_read, /* read - general block-dev read */ @@ -636,12 +570,44 @@ static struct file_operations hd_fops = hd_release /* release */ }; -void hd_init(void) +static void hd_interrupt(int unused) +{ + void (*handler)(void) = DEVICE_INTR; + + DEVICE_INTR = NULL; + timer_active &= ~(1<