Skip to contentSkip to conversation

lemote: fixup for FUJITSU disk

PATCH In review yanhua 2 participants 3 messages Apr 9, 2009

Subsystems (2)
lore
Share & tools
lore

yanhua

author
#0 lore raw

PATCH 13/14 lemote: fixup for FUJITSU disk

---
drivers/ide/amd74xx.c | 20 ++++++++++++++++++++

1 files changed, 20 insertions(+), 0 deletions(-)
drivers/ide/amd74xx.c +0 -0
index 77267c8..51b888f 100644
@@ -23,6 +23,11 @@
 

#define DRV_NAME "amd74xx"

+static const char *am74xx_quirk_drives[] = {
+ "FUJITSU MHZ2160BH G2",
+ NULL
+};
+
enum {
AMD_IDE_CONFIG = 0x41,
AMD_CABLE_DETECT = 0x42,
@@ -112,6 +117,20 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio)
amd_set_drive(drive, XFER_PIO_0 + pio);
}

+static void amd_quirkproc(ide_drive_t *drive, const u8 pio) +{
+ const char **list, *m = (char *)&drive->id[ATA_ID_PROD]; +
+ for (list = am74xx_quirk_drives; *list != NULL; list++)
+ if (strstr(m, *list) != NULL) {
+ drive->quirk_list = 2;
+ return;
+ }
+
+ drive->quirk_list = 0;
+
+}
+
static void amd7409_cable_detect(struct pci_dev *dev)
{
/* no host side cable detection */
@@ -194,6 +213,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
static const struct ide_port_ops amd_port_ops = { .set_pio_mode = amd_set_pio_mode,
.set_dma_mode = amd_set_drive,
+ .quirkproc = amd_quirkproc,
.cable_detect = amd_cable_detect,
};

Signature · 1 line
1.5.6.5
#1 lore raw

Hello.

yanhua wrote:

The patch description wouldn't hurt, i.e. why this fixup is needed...

drivers/ide/amd74xx.c

Quoted 4 lines
drivers/ide/amd74xx.c +0 -0
index 77267c8..51b888f 100644

The IDE patches should be posted to linux-ide mail list.

Quoted 13 lines
drivers/ide/amd74xx.c +5 -0
@@ -23,6 +23,11 @@
 
 #define DRV_NAME "amd74xx"
 
+static const char *am74xx_quirk_drives[] = {
+ "FUJITSU MHZ2160BH G2",
+ NULL
+};
+
 enum {
 AMD_IDE_CONFIG = 0x41,
 AMD_CABLE_DETECT = 0x42,

drivers/ide/amd74xx.c static void amd_set_pio_mode(ide_drive_t *drive, · line 118

Quoted 2 lines
drivers/ide/amd74xx.c +0 -0
@@ -112,6 +117,20 @@ static void amd_set_pio_mode(ide_drive_t *drive,
 const u8 pio)
 amd_set_drive(drive, XFER_PIO_0 + pio);

Your patches are seriously whitespace-damaged, i.e. all tabs seem to be
collapsed to a single space. You'll have to find a way to avoid that...

drivers/ide/amd74xx.c static void amd_set_pio_mode(ide_drive_t *drive, · line 121

Quoted 3 lines
drivers/ide/amd74xx.c +1 -0
 }
 
+static void amd_quirkproc(ide_drive_t *drive, const u8 pio)

Have you tried to compile this? The quirkproc() method only has one parameter.

Quoted 18 lines
drivers/ide/amd74xx.c +13 -0
+{
+ const char **list, *m = (char *)&drive->id[ATA_ID_PROD];
+
+ for (list = am74xx_quirk_drives; *list != NULL; list++)
+ if (strstr(m, *list) != NULL) {
+ drive->quirk_list = 2;
+ return;
+ }
+
+ drive->quirk_list = 0;
+
+}
+
 static void amd7409_cable_detect(struct pci_dev *dev)
 {

/* no host side cable detection */

drivers/ide/amd74xx.c static void __devinit init_hwif_amd74xx(ide_hwif_t · line 219

Quoted 7 lines
drivers/ide/amd74xx.c +1 -0
@@ -194,6 +213,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t
 *hwif)
 static const struct ide_port_ops amd_port_ops = {
 .set_pio_mode = amd_set_pio_mode,
 .set_dma_mode = amd_set_drive,
+ .quirkproc = amd_quirkproc,
 .cable_detect = amd_cable_detect,
 };

MBR, Sergei

author
#2 lore raw
Quoted 37 lines · Sergei Shtylyov

Hello.

yanhua wrote:

The patch description wouldn't hurt, i.e. why this fixup is needed...

drivers/ide/amd74xx.c

Quoted 5 lines
drivers/ide/amd74xx.c +0 -0
index 77267c8..51b888f 100644

The IDE patches should be posted to linux-ide mail list.

Quoted 13 lines
drivers/ide/amd74xx.c +5 -0
@@ -23,6 +23,11 @@
 
 #define DRV_NAME "amd74xx"
 
+static const char *am74xx_quirk_drives[] = {
+ "FUJITSU MHZ2160BH G2",
+ NULL
+};
+
 enum {
 AMD_IDE_CONFIG = 0x41,
 AMD_CABLE_DETECT = 0x42,

drivers/ide/amd74xx.c static void amd_set_pio_mode(ide_drive_t *drive, · line 119

Quoted 3 lines
drivers/ide/amd74xx.c +0 -0
@@ -112,6 +117,20 @@ static void amd_set_pio_mode(ide_drive_t *drive,
 const u8 pio)
 amd_set_drive(drive, XFER_PIO_0 + pio);
 

Your patches are seriously whitespace-damaged, i.e. all tabs seem to be
collapsed to a single space. You'll have to find a way to avoid that...

Quoted 6 lines

drivers/ide/amd74xx.c static void amd_set_pio_mode(ide_drive_t *drive, · line 123

Quoted 4 lines
drivers/ide/amd74xx.c +1 -0
 }
 
+static void amd_quirkproc(ide_drive_t *drive, const u8 pio)
 

Have you tried to compile this? The quirkproc() method only has one parameter.

Sorry for my mistake(after check, the compile reports a warning). I have compiled it and test this on Yeeloong machines.

Quoted 31 lines
Quoted 20 lines
drivers/ide/amd74xx.c +13 -0
+{
+ const char **list, *m = (char *)&drive->id[ATA_ID_PROD];
+
+ for (list = am74xx_quirk_drives; *list != NULL; list++)
+ if (strstr(m, *list) != NULL) {
+ drive->quirk_list = 2;
+ return;
+ }
+
+ drive->quirk_list = 0;
+
+}
+

static void amd7409_cable_detect(struct pci_dev *dev) {
/* no host side cable detection */

drivers/ide/amd74xx.c static void __devinit init_hwif_amd74xx(ide_hwif_t · line 219

Quoted 7 lines
drivers/ide/amd74xx.c +1 -0
@@ -194,6 +213,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t
 *hwif)
 static const struct ide_port_ops amd_port_ops = {
 .set_pio_mode = amd_set_pio_mode,
 .set_dma_mode = amd_set_drive,
+ .quirkproc = amd_quirkproc,
 .cable_detect = amd_cable_detect,
 };

MBR, Sergei

Signature · 1 line
晏华