linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* RE: [PATCH 2.6.13-rc6 ] (updated) serverworks: Add support for new southbridge IDE
@ 2005-08-17 19:18 Naren (Narendra) Sankar
  2005-08-17 19:55 ` Bartlomiej Zolnierkiewicz
  0 siblings, 1 reply; 5+ messages in thread
From: Naren (Narendra) Sankar @ 2005-08-17 19:18 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide

It is added to svwks_csb_check -


@@ -109,6 +114,7 @@ static u8 svwks_csb_check (struct pci_de
 		case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
 		case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
 		case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2:
+		case PCI_DEVICE_ID_SERVERWORKS_HT1000IDE:
 			return 1;
 		default:
 			break; 


Thanks

Naren Sankar
System Architect
Chipset Product Line
Broadcom Corporation
2451 Mission College Blvd
Santa Clara, CA 95054
Office:  (408) 922-7143
Email:  nsankar@broadcom.com 

-----Original Message-----
From: linux-ide-owner@vger.kernel.org
[mailto:linux-ide-owner@vger.kernel.org] On Behalf Of Bartlomiej
Zolnierkiewicz
Sent: Wednesday, August 17, 2005 12:14 PM
To: Naren (Narendra) Sankar
Cc: linux-ide@vger.kernel.org
Subject: Re: [PATCH 2.6.13-rc6 ] (updated) serverworks: Add support for new
southbridge IDE

On 8/17/05, Naren (Narendra) Sankar <nsankar@broadcom.com> wrote:
> Hi Everyone

Hi,

> Description -
> 
> BCM5785 (HT1000) is a Opteron Southbridge from Serverworks/Broadcom 
> that Incorporates a single channel ATA100 IDE controller that is 
> functionally Identical to the Serverworks CSB6 IDE controller. This 
> patch adds support For the new PCI device ID and also the support for this
controller.

Patch looks fine but don't you need to also add HT1000 ID to
swvks_csb_check()?

Bartlomiej
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in the
body of a message to majordomo@vger.kernel.org More majordomo info at
http://vger.kernel.org/majordomo-info.html



^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 2.6.13-rc6 ] (updated) serverworks: Add support for new southbridge IDE
@ 2005-08-17 15:01 Naren (Narendra) Sankar
  2005-08-17 17:39 ` Jeff Garzik
  2005-08-17 19:14 ` Bartlomiej Zolnierkiewicz
  0 siblings, 2 replies; 5+ messages in thread
From: Naren (Narendra) Sankar @ 2005-08-17 15:01 UTC (permalink / raw)
  To: bzolnier; +Cc: linux-ide

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

Hi Everyone

Description -

BCM5785 (HT1000) is a Opteron Southbridge from Serverworks/Broadcom that
Incorporates a single channel ATA100 IDE controller that is functionally
Identical to the Serverworks CSB6 IDE controller. This patch adds support For
the new PCI device ID and also the support for this controller.

Update - 
Fixed typo.

Signed-off-by: Narendra Sankar <nsankar@broadcom.com>

 

For your review

Thanks

 
Naren Sankar
System Architect
Chipset Product Line
Broadcom Corporation
2451 Mission College Blvd
Santa Clara, CA 95054
Office:  (408) 922-7143
Email:  nsankar@broadcom.com <mailto:nsankar@broadcom.com>  

[-- Attachment #2: ht1000ide.patch --]
[-- Type: application/octet-stream, Size: 3345 bytes --]

diff -uprN -X linux-2.6.13-rc6/Documentation/dontdiff linux-2.6.13-rc6/drivers/ide/pci/serverworks.c linux-2.6.13-rc6.brcm/drivers/ide/pci/serverworks.c
--- linux-2.6.13-rc6/drivers/ide/pci/serverworks.c	2005-08-07 11:18:56.000000000 -0700
+++ linux-2.6.13-rc6.brcm/drivers/ide/pci/serverworks.c	2005-08-16 11:19:23.635774000 -0700
@@ -21,6 +21,9 @@
  *
  *   CSB6: `Champion South Bridge' IDE Interface (optional: third channel)
  *
+ *   HT1000: AKA BCM5785 - Hypertransport Southbridge for Opteron systems. IDE
+ *   controller same as the CSB6. Single channel ATA100 only.
+ *
  * Documentation:
  *	Available under NDA only. Errata info very hard to get.
  *
@@ -71,6 +74,8 @@ static u8 svwks_ratemask (ide_drive_t *d
 	if (!svwks_revision)
 		pci_read_config_byte(dev, PCI_REVISION_ID, &svwks_revision);
 
+	if (dev->device == PCI_DEVICE_ID_SERVERWORKS_HT1000IDE)
+		return 2;
 	if (dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) {
 		u32 reg = 0;
 		if (isa_dev)
@@ -109,6 +114,7 @@ static u8 svwks_csb_check (struct pci_de
 		case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
 		case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
 		case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2:
+		case PCI_DEVICE_ID_SERVERWORKS_HT1000IDE:
 			return 1;
 		default:
 			break;
@@ -438,6 +444,13 @@ static unsigned int __devinit init_chips
 			btr |= (svwks_revision >= SVWKS_CSB5_REVISION_NEW) ? 0x3 : 0x2;
 		pci_write_config_byte(dev, 0x5A, btr);
 	}
+	/* Setup HT1000 SouthBridge Controller - Single Channel Only */
+	else if (dev->device == PCI_DEVICE_ID_SERVERWORKS_HT1000IDE) {
+		pci_read_config_byte(dev, 0x5A, &btr);
+		btr &= ~0x40;
+		btr |= 0x3;
+		pci_write_config_byte(dev, 0x5A, btr);
+	}
 
 	return (dev->irq) ? dev->irq : 0;
 }
@@ -629,6 +642,15 @@ static ide_pci_device_t serverworks_chip
 		.channels	= 1,	/* 2 */
 		.autodma	= AUTODMA,
 		.bootable	= ON_BOARD,
+	},{	/* 4 */
+		.name		= "SvrWks HT1000",
+		.init_setup	= init_setup_svwks,
+		.init_chipset	= init_chipset_svwks,
+		.init_hwif	= init_hwif_svwks,
+		.init_dma	= init_dma_svwks,
+		.channels	= 1,	/* 2 */
+		.autodma	= AUTODMA,
+		.bootable	= ON_BOARD,
 	}
 };
 
@@ -653,6 +675,7 @@ static struct pci_device_id svwks_pci_tb
 	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
 	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
 	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
+	{ PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
 	{ 0, },
 };
 MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);
diff -uprN -X linux-2.6.13-rc6/Documentation/dontdiff linux-2.6.13-rc6/include/linux/pci_ids.h linux-2.6.13-rc6.brcm/include/linux/pci_ids.h
--- linux-2.6.13-rc6/include/linux/pci_ids.h	2005-08-07 11:18:56.000000000 -0700
+++ linux-2.6.13-rc6.brcm/include/linux/pci_ids.h	2005-08-16 09:58:37.860970000 -0700
@@ -1580,6 +1580,7 @@
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
 #define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213
+#define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214
 #define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
 #define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
 #define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-08-17 19:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-17 19:18 [PATCH 2.6.13-rc6 ] (updated) serverworks: Add support for new southbridge IDE Naren (Narendra) Sankar
2005-08-17 19:55 ` Bartlomiej Zolnierkiewicz
  -- strict thread matches above, loose matches on Subject: below --
2005-08-17 15:01 Naren (Narendra) Sankar
2005-08-17 17:39 ` Jeff Garzik
2005-08-17 19:14 ` Bartlomiej Zolnierkiewicz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).