* [PATCH] trivial 2.4/2.6 PCI name change/addition
@ 2003-08-06 19:54 Alex Williamson
2003-08-06 22:13 ` Bjorn Helgaas
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Alex Williamson @ 2003-08-06 19:54 UTC (permalink / raw)
To: linux-ia64
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
This patch renames the PCI-X adapter found in HP zx1 and sx1000
ia64 systems to something more generic and descriptive. It also
adds an ID for the PCI adapter used in sx1000. Patches against
2.4.21+ia64 and 2.6.0-test2+ia64 attached. Thanks,
Alex
--
Alex Williamson HP Linux & Open Source Lab
[-- Attachment #2: 2.4-lba-names.diff --]
[-- Type: text/plain, Size: 1772 bytes --]
--- linux-2.4.21/include/linux/pci_ids.h~ 2003-08-06 13:18:56.000000000 -0600
+++ linux-2.4.21/include/linux/pci_ids.h 2003-08-06 13:19:07.000000000 -0600
@@ -539,11 +539,12 @@
#define PCI_DEVICE_ID_HP_DIVA1 0x1049
#define PCI_DEVICE_ID_HP_DIVA2 0x104A
#define PCI_DEVICE_ID_HP_SP2_0 0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA 0x1054
#define PCI_DEVICE_ID_HP_REO_SBA 0x10f0
#define PCI_DEVICE_ID_HP_REO_IOC 0x10f1
#define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229
#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a
-#define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e
+#define PCI_DEVICE_ID_HP_PCIX_LBA 0x122e
#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c
#define PCI_VENDOR_ID_PCTECH 0x1042
--- linux-2.4.21/drivers/pci/pci.ids~ 2003-08-06 13:18:30.000000000 -0600
+++ linux-2.4.21/drivers/pci/pci.ids 2003-08-06 13:19:07.000000000 -0600
@@ -1212,6 +1212,7 @@
103c 1226 Keystone SP2
103c 1227 Powerbar SP2
103c 1282 Everest SP2
+ 1054 PCI Local Bus Adapter
1064 79C970 PCnet Ethernet Controller
108b Visualize FXe
10c1 NetServer Smart IRQ Router
@@ -1223,7 +1224,7 @@
121c NetServer PCI COM Port Decoder
1229 zx1 System Bus Adapter
122a zx1 I/O Controller
- 122e zx1 Local Bus Adapter
+ 122e PCI-X/AGP Local Bus Adapter
1290 Auxiliary Diva Serial Port
2910 E2910A PCIBus Exerciser
2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
--- linux-2.4.21/drivers/char/agp/agpgart_be.c~ 2003-08-06 13:18:20.000000000 -0600
+++ linux-2.4.21/drivers/char/agp/agpgart_be.c 2003-08-06 13:19:07.000000000 -0600
@@ -4853,7 +4853,7 @@
agp_bridge.type = HP_ZX1;
fake_bridge_dev.vendor = PCI_VENDOR_ID_HP;
- fake_bridge_dev.device = PCI_DEVICE_ID_HP_ZX1_LBA;
+ fake_bridge_dev.device = PCI_DEVICE_ID_HP_PCIX_LBA;
return hp_zx1_ioc_init(ioc_hpa, lba_hpa);
}
[-- Attachment #3: 2.6-lba-names.diff --]
[-- Type: text/plain, Size: 1995 bytes --]
--- linux-2.6.0-test2/include/linux/pci_ids.h~ 2003-08-06 13:32:28.000000000 -0600
+++ linux-2.6.0-test2/include/linux/pci_ids.h 2003-08-06 13:34:53.000000000 -0600
@@ -608,6 +608,7 @@
#define PCI_DEVICE_ID_HP_DIVA_TOSCA1 0x1049
#define PCI_DEVICE_ID_HP_DIVA_TOSCA2 0x104A
#define PCI_DEVICE_ID_HP_DIVA_MAESTRO 0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA 0x1054
#define PCI_DEVICE_ID_HP_REO_SBA 0x10f0
#define PCI_DEVICE_ID_HP_REO_IOC 0x10f1
#define PCI_DEVICE_ID_HP_VISUALIZE_FXE 0x108b
@@ -616,7 +617,7 @@
#define PCI_DEVICE_ID_HP_DIVA_POWERBAR 0x1227
#define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229
#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a
-#define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e
+#define PCI_DEVICE_ID_HP_PCIX_LBA 0x122e
#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c
#define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282
#define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290
--- linux-2.6.0-test2/drivers/pci/pci.ids~ 2003-08-06 13:32:08.000000000 -0600
+++ linux-2.6.0-test2/drivers/pci/pci.ids 2003-08-06 13:32:59.000000000 -0600
@@ -1286,6 +1286,7 @@
103c 1226 Keystone SP2
103c 1227 Powerbar SP2
103c 1282 Everest SP2
+ 1054 PCI Local Bus Adapter
1064 79C970 PCnet Ethernet Controller
108b Visualize FXe
10c1 NetServer Smart IRQ Router
@@ -1297,7 +1298,7 @@
121c NetServer PCI COM Port Decoder
1229 zx1 System Bus Adapter
122a zx1 I/O Controller
- 122e zx1 Local Bus Adapter
+ 122e PCI-X/AGP Local Bus Adapter
1290 Auxiliary Diva Serial Port
2910 E2910A PCIBus Exerciser
2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
--- linux-2.6.0-test2/drivers/char/agp/hp-agp.c~ 2003-08-06 13:32:54.000000000 -0600
+++ linux-2.6.0-test2/drivers/char/agp/hp-agp.c 2003-08-06 13:33:56.000000000 -0600
@@ -398,7 +398,7 @@
bridge->driver = &hp_zx1_driver;
fake_bridge_dev.vendor = PCI_VENDOR_ID_HP;
- fake_bridge_dev.device = PCI_DEVICE_ID_HP_ZX1_LBA;
+ fake_bridge_dev.device = PCI_DEVICE_ID_HP_PCIX_LBA;
bridge->dev = &fake_bridge_dev;
return agp_add_bridge(bridge);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] trivial 2.4/2.6 PCI name change/addition
2003-08-06 19:54 [PATCH] trivial 2.4/2.6 PCI name change/addition Alex Williamson
@ 2003-08-06 22:13 ` Bjorn Helgaas
2003-08-06 23:09 ` Greg KH
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Bjorn Helgaas @ 2003-08-06 22:13 UTC (permalink / raw)
To: linux-ia64
On Wednesday 06 August 2003 1:54 pm, Alex Williamson wrote:
> This patch renames the PCI-X adapter found in HP zx1 and sx1000
> ia64 systems to something more generic and descriptive. It also
> adds an ID for the PCI adapter used in sx1000. Patches against
> 2.4.21+ia64 and 2.6.0-test2+ia64 attached. Thanks,
I applied this for the 2.4 ia64 patch.
Marcelo, do we need to do anything else to get this in your tree?
--- linux-2.4.21/include/linux/pci_ids.h~ 2003-08-06 13:18:56.000000000 -0600
+++ linux-2.4.21/include/linux/pci_ids.h 2003-08-06 13:19:07.000000000 -0600
@@ -539,11 +539,12 @@
#define PCI_DEVICE_ID_HP_DIVA1 0x1049
#define PCI_DEVICE_ID_HP_DIVA2 0x104A
#define PCI_DEVICE_ID_HP_SP2_0 0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA 0x1054
#define PCI_DEVICE_ID_HP_REO_SBA 0x10f0
#define PCI_DEVICE_ID_HP_REO_IOC 0x10f1
#define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229
#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a
-#define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e
+#define PCI_DEVICE_ID_HP_PCIX_LBA 0x122e
#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c
#define PCI_VENDOR_ID_PCTECH 0x1042
--- linux-2.4.21/drivers/pci/pci.ids~ 2003-08-06 13:18:30.000000000 -0600
+++ linux-2.4.21/drivers/pci/pci.ids 2003-08-06 13:19:07.000000000 -0600
@@ -1212,6 +1212,7 @@
103c 1226 Keystone SP2
103c 1227 Powerbar SP2
103c 1282 Everest SP2
+ 1054 PCI Local Bus Adapter
1064 79C970 PCnet Ethernet Controller
108b Visualize FXe
10c1 NetServer Smart IRQ Router
@@ -1223,7 +1224,7 @@
121c NetServer PCI COM Port Decoder
1229 zx1 System Bus Adapter
122a zx1 I/O Controller
- 122e zx1 Local Bus Adapter
+ 122e PCI-X/AGP Local Bus Adapter
1290 Auxiliary Diva Serial Port
2910 E2910A PCIBus Exerciser
2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
--- linux-2.4.21/drivers/char/agp/agpgart_be.c~ 2003-08-06 13:18:20.000000000 -0600
+++ linux-2.4.21/drivers/char/agp/agpgart_be.c 2003-08-06 13:19:07.000000000 -0600
@@ -4853,7 +4853,7 @@
agp_bridge.type = HP_ZX1;
fake_bridge_dev.vendor = PCI_VENDOR_ID_HP;
- fake_bridge_dev.device = PCI_DEVICE_ID_HP_ZX1_LBA;
+ fake_bridge_dev.device = PCI_DEVICE_ID_HP_PCIX_LBA;
return hp_zx1_ioc_init(ioc_hpa, lba_hpa);
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] trivial 2.4/2.6 PCI name change/addition
2003-08-06 19:54 [PATCH] trivial 2.4/2.6 PCI name change/addition Alex Williamson
2003-08-06 22:13 ` Bjorn Helgaas
@ 2003-08-06 23:09 ` Greg KH
2003-08-07 12:05 ` Marcelo Tosatti
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2003-08-06 23:09 UTC (permalink / raw)
To: linux-ia64
On Wed, Aug 06, 2003 at 01:54:05PM -0600, Alex Williamson wrote:
>
> This patch renames the PCI-X adapter found in HP zx1 and sx1000
> ia64 systems to something more generic and descriptive. It also
> adds an ID for the PCI adapter used in sx1000. Patches against
> 2.4.21+ia64 and 2.6.0-test2+ia64 attached. Thanks,
I've applied the 2.6 patch to my trees and will send it on to Linus in a
few days, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] trivial 2.4/2.6 PCI name change/addition
2003-08-06 19:54 [PATCH] trivial 2.4/2.6 PCI name change/addition Alex Williamson
2003-08-06 22:13 ` Bjorn Helgaas
2003-08-06 23:09 ` Greg KH
@ 2003-08-07 12:05 ` Marcelo Tosatti
2003-08-07 12:32 ` Marcelo Tosatti
2003-08-07 15:52 ` Bjorn Helgaas
4 siblings, 0 replies; 6+ messages in thread
From: Marcelo Tosatti @ 2003-08-07 12:05 UTC (permalink / raw)
To: linux-ia64
On Wed, 6 Aug 2003, Bjorn Helgaas wrote:
> On Wednesday 06 August 2003 1:54 pm, Alex Williamson wrote:
> > This patch renames the PCI-X adapter found in HP zx1 and sx1000
> > ia64 systems to something more generic and descriptive. It also
> > adds an ID for the PCI adapter used in sx1000. Patches against
> > 2.4.21+ia64 and 2.6.0-test2+ia64 attached. Thanks,
>
> I applied this for the 2.4 ia64 patch.
>
> Marcelo, do we need to do anything else to get this in your tree?
Nope. Its in.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] trivial 2.4/2.6 PCI name change/addition
2003-08-06 19:54 [PATCH] trivial 2.4/2.6 PCI name change/addition Alex Williamson
` (2 preceding siblings ...)
2003-08-07 12:05 ` Marcelo Tosatti
@ 2003-08-07 12:32 ` Marcelo Tosatti
2003-08-07 15:52 ` Bjorn Helgaas
4 siblings, 0 replies; 6+ messages in thread
From: Marcelo Tosatti @ 2003-08-07 12:32 UTC (permalink / raw)
To: linux-ia64
On Wed, 6 Aug 2003, Bjorn Helgaas wrote:
> On Wednesday 06 August 2003 1:54 pm, Alex Williamson wrote:
> > This patch renames the PCI-X adapter found in HP zx1 and sx1000
> > ia64 systems to something more generic and descriptive. It also
> > adds an ID for the PCI adapter used in sx1000. Patches against
> > 2.4.21+ia64 and 2.6.0-test2+ia64 attached. Thanks,
>
> I applied this for the 2.4 ia64 patch.
>
> Marcelo, do we need to do anything else to get this in your tree?
Actually this doesnt apply cleanly to my tree Bjorn.
Can you please send me an updated patch?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] trivial 2.4/2.6 PCI name change/addition
2003-08-06 19:54 [PATCH] trivial 2.4/2.6 PCI name change/addition Alex Williamson
` (3 preceding siblings ...)
2003-08-07 12:32 ` Marcelo Tosatti
@ 2003-08-07 15:52 ` Bjorn Helgaas
4 siblings, 0 replies; 6+ messages in thread
From: Bjorn Helgaas @ 2003-08-07 15:52 UTC (permalink / raw)
To: linux-ia64
On Thursday 07 August 2003 6:32 am, Marcelo Tosatti wrote:
> On Wed, 6 Aug 2003, Bjorn Helgaas wrote:
> > On Wednesday 06 August 2003 1:54 pm, Alex Williamson wrote:
> > > This patch renames the PCI-X adapter found in HP zx1 and sx1000
> > > ia64 systems to something more generic and descriptive. It also
> > > adds an ID for the PCI adapter used in sx1000. Patches against
> > > 2.4.21+ia64 and 2.6.0-test2+ia64 attached. Thanks,
> >
> > I applied this for the 2.4 ia64 patch.
> >
> > Marcelo, do we need to do anything else to get this in your tree?
>
>
> Actually this doesnt apply cleanly to my tree Bjorn.
>
> Can you please send me an updated patch?
Oops, sorry about that. Here's an updated one. It doesn't include
the agpgart bit because you don't have the latest HP ZX1 gart
code. I'll try to get that merged up soon.
=== drivers/pci/pci.ids 1.37 vs edited ==--- 1.37/drivers/pci/pci.ids Sun Jun 29 09:10:14 2003
+++ edited/drivers/pci/pci.ids Thu Aug 7 10:43:57 2003
@@ -1348,6 +1348,7 @@
103c 1226 Keystone SP2
103c 1227 Powerbar SP2
103c 1282 Everest SP2
+ 1054 PCI Local Bus Adapter
1064 79C970 PCnet Ethernet Controller
108b Visualize FXe
10c1 NetServer Smart IRQ Router
@@ -1359,7 +1360,8 @@
121c NetServer PCI COM Port Decoder
1229 zx1 System Bus Adapter
122a zx1 I/O Controller
- 122e zx1 Local Bus Adapter
+ 122e PCI-X/AGP Local Bus Adapter
+ 127c sx1000 I/O Controller
1290 Auxiliary Diva Serial Port
2910 E2910A PCIBus Exerciser
2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
=== include/linux/pci_ids.h 1.67 vs edited ==--- 1.67/include/linux/pci_ids.h Tue Aug 5 09:37:33 2003
+++ edited/include/linux/pci_ids.h Thu Aug 7 10:38:29 2003
@@ -589,11 +589,13 @@
#define PCI_DEVICE_ID_HP_DIVA1 0x1049
#define PCI_DEVICE_ID_HP_DIVA2 0x104A
#define PCI_DEVICE_ID_HP_SP2_0 0x104B
+#define PCI_DEVICE_ID_HP_PCI_LBA 0x1054
#define PCI_DEVICE_ID_HP_REO_SBA 0x10f0
#define PCI_DEVICE_ID_HP_REO_IOC 0x10f1
#define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229
#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a
-#define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e
+#define PCI_DEVICE_ID_HP_PCIX_LBA 0x122e
+#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c
#define PCI_VENDOR_ID_PCTECH 0x1042
#define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-08-07 15:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-08-06 19:54 [PATCH] trivial 2.4/2.6 PCI name change/addition Alex Williamson
2003-08-06 22:13 ` Bjorn Helgaas
2003-08-06 23:09 ` Greg KH
2003-08-07 12:05 ` Marcelo Tosatti
2003-08-07 12:32 ` Marcelo Tosatti
2003-08-07 15:52 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox