ata: pata_at91.c bugfix for high master clock
Subsystems (2)
PATCH 1/1 ata: pata_at91.c bugfix for high master clock
The AT91SAM9 microcontrollers with master clock higher then 105 MHz and PIO0, have overflow of the NCS_RD_PULSE value in the MSB. This lead to "NCS_RD_PULSE" pulse longer then "NRD_CYCLE" pulse and pata_at91 driver does not detect ATA device.
--- drivers/ata/pata_at91.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
drivers/ata/pata_at91.c +9 -2
@@ -33,12 +33,14 @@#define DRV_NAME "pata_at91" -#define DRV_VERSION "0.1" +#define DRV_VERSION "0.2"#define CF_IDE_OFFSET 0x00c00000#define CF_ALT_IDE_OFFSET 0x00e00000#define CF_IDE_RES_SIZE 0x08 +#define NCS_RD_PULSE_LIMIT 0x3f/* maximal value for pulse bitfields */ +struct at91_ide_info {unsigned long mode;unsigned int cs;
@@ -50,7 +52,7 @@ struct at91_ide_info { };static const struct ata_timing initial_timing = - {XFER_PIO_0 ,70 ,290 ,240 ,600 ,165 ,150 ,600 ,0 }; + {XFER_PIO_0 ,70 ,290 ,240 ,600 ,165 ,150 ,0 ,600 ,0 };static unsigned long calc_mck_cycles (unsigned long ns,unsigned long mck_hz) {
@@ -109,6 +111,11 @@ static void set_smc_timing(struct device *dev,/* (CS0, CS1, DIR, OE) <= (CFCE1, CFCE2, CFRNW, NCSX) timings */ ncs_read_setup =1 ; ncs_read_pulse = read_cycle -2 ; +if (ncs_read_pulse >NCS_RD_PULSE_LIMIT ) { + ncs_read_pulse =NCS_RD_PULSE_LIMIT ; +dev_dbg (dev,"ncs_read_pulse limited to maximal value %lu\n" , + ncs_read_pulse); + }/* Write timings same as read timings */ write_cycle = read_cycle;
Signature · 1 line
1.7.0.4
PATCH 1/1 ata: pata_at91.c bugfix for high master clock
Hello Igor,
Quoted 40 lines · On Sat, 11 Dec 2010 06:37:31 +0300 Igor Plyatov <[email protected]> wrote:
The AT91SAM9 microcontrollers with master clock higher then 105 MHz and PIO0, have overflow of the
NCS_RD_PULSEvalue in the MSB. This lead to "NCS_RD_PULSE" pulse longer then "NRD_CYCLE" pulse andpata_at91driver does not detect ATA device.Signed-off-by Igor Plyatov <[email protected]>--- drivers/ata/pata_at91.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)drivers/ata/pata_at91.c +2
-1@@ -33,12 +33,14 @@#define DRV_NAME "pata_at91" -#define DRV_VERSION "0.1" +#define DRV_VERSION "0.2"#define CF_IDE_OFFSET 0x00c00000#define CF_ALT_IDE_OFFSET 0x00e00000#define CF_IDE_RES_SIZE 0x08 +#define NCS_RD_PULSE_LIMIT 0x3f/* maximal value for pulse bitfields */ +
structat91_ide_info{drivers/ata/pata_at91.c +1
-1unsigned long mode;unsigned int cs;@@ -50,7 +52,7 @@ struct at91_ide_info { };static const struct ata_timing initial_timing = - {XFER_PIO_0 ,70 ,290 ,240 ,600 ,165 ,150 ,600 ,0 }; + {XFER_PIO_0 ,70 ,290 ,240 ,600 ,165 ,150 ,0 ,600 ,0 };static unsigned long calc_mck_cycles (unsigned long ns,unsigned long mck_hz) {
drivers/ata/pata_at91.c static void set_smc_timing(struct device *dev, · line 117
Quoted 7 lines
drivers/ata/pata_at91.c +3
-0@@ -109,6 +111,11 @@ static void set_smc_timing(struct device *dev,/* (CS0, CS1, DIR, OE) <= (CFCE1, CFCE2, CFRNW, NCSX) timings */ ncs_read_setup =1 ; ncs_read_pulse = read_cycle -2 ; + if (ncs_read_pulse > NCS_RD_PULSE_LIMIT) { + ncs_read_pulse = NCS_RD_PULSE_LIMIT; + dev_dbg(dev, "ncs_read_pulse limited to maximal value %lu\n",
arguably 'dev_warn' would be better in this case
Quoted 5 lines
drivers/ata/pata_at91.c +2
-0+ ncs_read_pulse); + }/* Write timings same as read timings */
write_cycle=read_cycle;
Thanks for the fix.
By the way, it was not a good idea to send this patch separately to both lists: linux-ide and linux-arm-kernel. I will ack this patch and add linux-arm-kernel and other recipients in my reply to your email to linux-ide list.
Thanks,
Sergey
PATCH 1/1 ata: pata_at91.c bugfix for high master clock
Dear Sergey,
Quoted 10 lines
Review static void set_smc_timing(struct device *dev, · line 117
Quoted 8 lines
(quoted diff) +3
-0@@ -109,6 +111,11 @@ static void set_smc_timing(struct device *dev, /* (CS0, CS1, DIR, OE) <= (CFCE1, CFCE2, CFRNW, NCSX) timings */ ncs_read_setup = 1; ncs_read_pulse = read_cycle - 2; + if (ncs_read_pulse > NCS_RD_PULSE_LIMIT) { + ncs_read_pulse = NCS_RD_PULSE_LIMIT; + dev_dbg(dev, "ncs_read_pulse limited to maximal value %lu\n",arguably '
dev_warn' would be better in this case
Done as "PATCH v2".
Best regards!
--
Igor Plyatov