--- linux/kernel/blk_drv/hd.c 2018/04/24 18:03:22 1.1.1.3 +++ linux/kernel/blk_drv/hd.c 2018/04/24 18:05:37 1.1.1.5 @@ -11,10 +11,14 @@ * sleep. Special care is recommended. * * modified by Drew Eckhardt to check nr of hd's from the CMOS. + * + * Thanks to Branko Lankester, lankeste@fwi.uva.nl, who found a bug + * in the early extended-partition checks and added DM partitions */ #include #include +#include #include #include #include @@ -25,10 +29,11 @@ #define MAJOR_NR 3 #include "blk.h" -#define CMOS_READ(addr) ({ \ -outb_p(0x80|addr,0x70); \ -inb_p(0x71); \ -}) +static inline unsigned char CMOS_READ(unsigned char addr) +{ + outb_p(0x80|addr,0x70); + return inb_p(0x71); +} /* Max read/write errors/sector */ #define MAX_ERRORS 7 @@ -38,13 +43,13 @@ static void recal_intr(void); static void bad_rw_intr(void); static int recalibrate = 0; -static int reset = 0; +static int reset = 1; /* * This struct defines the HD's and their types. */ struct hd_i_struct { - int head,sect,cyl,wpcom,lzone,ctl; + unsigned int head,sect,cyl,wpcom,lzone,ctl; }; #ifdef HD_TYPE struct hd_i_struct hd_info[] = { HD_TYPE }; @@ -57,9 +62,9 @@ static int NR_HD = 0; static struct hd_struct { long start_sect; long nr_sects; -} hd[5*MAX_HD]={{0,0},}; +} hd[MAX_HD<<6]={{0,0},}; -static int hd_sizes[5*MAX_HD] = {0, }; +static int hd_sizes[MAX_HD<<6] = {0, }; #define port_read(port,buf,nr) \ __asm__("cld;rep;insw"::"d" (port),"D" (buf),"c" (nr):"cx","di") @@ -70,14 +75,58 @@ __asm__("cld;rep;outsw"::"d" (port),"S" extern void hd_interrupt(void); extern void rd_load(void); +static unsigned int current_minor; + +static void check_partition(unsigned int dev) +{ + int minor, i; + struct buffer_head *bh; + struct partition *p; + + if (!(bh = bread(dev,0))) { + printk("Unable to read partition table of device %04x\n",dev); + return; + } + minor = current_minor; + if (*(unsigned short *) (bh->b_data+510) == 0xAA55) { + p = 0x1BE + (void *)bh->b_data; + for (i=0 ; i<4 ; i++,p++) { + if (!(hd[i+minor].nr_sects = p->nr_sects)) + continue; + hd[i+minor].start_sect = p->start_sect; + if ((current_minor & 0x3f) >= 60) + continue; + if (p->sys_ind == EXTENDED_PARTITION) { + current_minor += 4; + check_partition(0x0300 | (i+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++) { + p--; + if ((current_minor & 0x3f) >= 60) + break; + if (!(hd[current_minor+4].start_sect = p->start_sect)) + continue; + hd[current_minor+4].nr_sects = p->nr_sects; + current_minor++; + } + } + } 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; - struct partition *p; - struct buffer_head * bh; if (!callable) return -1; @@ -98,8 +147,8 @@ int sys_setup(void * BIOS) NR_HD=1; #endif for (i=0 ; ib_data[510] != 0x55 || (unsigned char) - bh->b_data[511] != 0xAA) { - printk("Bad partition table on drive %d\n\r",drive); - panic(""); - } - p = 0x1BE + (void *)bh->b_data; - for (i=1;i<5;i++,p++) { - hd[i+5*drive].start_sect = p->start_sect; - hd[i+5*drive].nr_sects = p->nr_sects; - } - brelse(bh); + current_minor = 1+(drive<<6); + check_partition(0x0300+(drive<<6)); } - for (i=0 ; i<5*MAX_HD ; i++) + for (i=0 ; i<(MAX_HD<<6) ; i++) hd_sizes[i] = hd[i].nr_sects>>1 ; blk_size[MAJOR_NR] = hd_sizes; if (NR_HD) printk("Partition table%s ok.\n\r",(NR_HD>1)?"s":""); rd_load(); - init_swapping(); mount_root(); return (0); } @@ -169,7 +203,11 @@ static int controller_ready(void) { int retries = 100000; - while (--retries && (inb_p(HD_STATUS)&0xc0)!=0x40); + while (--retries && (inb_p(HD_STATUS)&0x80)) + /* nothing */; + if (!retries) + printk("controller_ready: status = %02x\n\r", + (unsigned char) inb_p(HD_STATUS)); return (retries); } @@ -180,7 +218,8 @@ 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) i=inb(HD_ERROR); + if (i&1) + i=inb(HD_ERROR); return (1); } @@ -188,12 +227,14 @@ static void hd_out(unsigned int drive,un unsigned int head,unsigned int cyl,unsigned int cmd, void (*intr_addr)(void)) { - register int port asm("dx"); + unsigned short port; if (drive>1 || head>15) panic("Trying to write bad sector"); - if (!controller_ready()) - panic("HD controller not ready"); + if (reset || !controller_ready()) { + reset = 1; + return; + } SET_INTR(intr_addr); outb_p(hd_info[drive].ctl,HD_CMD); port=HD_DATA; @@ -217,7 +258,7 @@ static int drive_busy(void) if (c == (READY_STAT | SEEK_STAT)) return 0; } - printk("HD controller times out\n\r"); + printk("HD controller times out, c=%02x\n\r",c); return(1); } @@ -252,6 +293,8 @@ repeat: if (i < NR_HD) { hd_out(i,hd_info[i].sect,hd_info[i].sect,hd_info[i].head-1, hd_info[i].cyl,WIN_SPECIFY,&reset_hd); + if (reset) + goto repeat; } else do_hd_request(); } @@ -269,11 +312,15 @@ static void bad_rw_intr(void) end_request(0); if (CURRENT->errors > MAX_ERRORS/2) reset = 1; + else + recalibrate = 1; } static void read_intr(void) { + SET_INTR(&read_intr); if (win_result()) { + SET_INTR(NULL); bad_rw_intr(); do_hd_request(); return; @@ -282,10 +329,9 @@ static void read_intr(void) CURRENT->errors = 0; CURRENT->buffer += 512; CURRENT->sector++; - if (--CURRENT->nr_sectors) { - SET_INTR(&read_intr); + if (--CURRENT->nr_sectors) return; - } + SET_INTR(NULL); end_request(1); do_hd_request(); } @@ -315,15 +361,15 @@ static void recal_intr(void) do_hd_request(); } -void hd_times_out(void) -{ +static void hd_times_out(void) +{ + do_hd = NULL; + reset = 1; if (!CURRENT) return; printk("HD timeout"); if (++CURRENT->errors >= MAX_ERRORS) end_request(0); - SET_INTR(NULL); - reset = 1; do_hd_request(); } @@ -337,18 +383,18 @@ void do_hd_request(void) INIT_REQUEST; dev = MINOR(CURRENT->dev); block = CURRENT->sector; - if (dev >= 5*NR_HD || block+2 > hd[dev].nr_sects) { + nsect = CURRENT->nr_sectors; + if (dev >= (NR_HD<<6) || block+nsect > hd[dev].nr_sects) { end_request(0); goto repeat; } block += hd[dev].start_sect; - dev /= 5; - __asm__("divl %4":"=a" (block),"=d" (sec):"0" (block),"1" (0), - "r" (hd_info[dev].sect)); - __asm__("divl %4":"=a" (cyl),"=d" (head):"0" (block),"1" (0), - "r" (hd_info[dev].head)); + 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++; - nsect = CURRENT->nr_sectors; if (reset) { recalibrate = 1; reset_hd(); @@ -356,12 +402,16 @@ void do_hd_request(void) } if (recalibrate) { recalibrate = 0; - hd_out(dev,hd_info[CURRENT_DEV].sect,0,0,0, + hd_out(dev,hd_info[dev].sect,0,0,0, WIN_RESTORE,&recal_intr); + if (reset) + goto repeat; 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) { @@ -371,6 +421,8 @@ void do_hd_request(void) port_write(HD_DATA,CURRENT->buffer,256); } else if (CURRENT->cmd == READ) { hd_out(dev,nsect,sec,head,cyl,WIN_READ,&read_intr); + if (reset) + goto repeat; } else panic("unknown hd-command"); } @@ -381,4 +433,5 @@ void hd_init(void) set_intr_gate(0x2E,&hd_interrupt); outb_p(inb_p(0x21)&0xfb,0x21); outb(inb_p(0xA1)&0xbf,0xA1); + timer_table[HD_TIMER].fn = hd_times_out; }