2009-10-26 13:44:47

by Stefan Assmann

Subject: [PATCH] PCI hotplug: change PCI nomenclature

Change PCI nomenclature according to
http://www.pcisig.com/developers/procedures/logos/Trademark_and_Logo_Usage_Guidelines_updated_112206.pdf.

Signed-off-by: Stefan Assmann <[email protected]>
---
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 0325d98..38183a5 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -68,26 +68,26 @@ static DEFINE_MUTEX(pci_hp_mutex);
static char *pci_bus_speed_strings[] = {
"33 MHz PCI", /* 0x00 */
"66 MHz PCI", /* 0x01 */
- "66 MHz PCIX", /* 0x02 */
- "100 MHz PCIX", /* 0x03 */
- "133 MHz PCIX", /* 0x04 */
+ "66 MHz PCI-X", /* 0x02 */
+ "100 MHz PCI-X", /* 0x03 */
+ "133 MHz PCI-X", /* 0x04 */
NULL, /* 0x05 */
NULL, /* 0x06 */
NULL, /* 0x07 */
NULL, /* 0x08 */
- "66 MHz PCIX 266", /* 0x09 */
- "100 MHz PCIX 266", /* 0x0a */
- "133 MHz PCIX 266", /* 0x0b */
+ "66 MHz PCI-X 266", /* 0x09 */
+ "100 MHz PCI-X 266", /* 0x0a */
+ "133 MHz PCI-X 266", /* 0x0b */
NULL, /* 0x0c */
NULL, /* 0x0d */
NULL, /* 0x0e */
NULL, /* 0x0f */
NULL, /* 0x10 */
- "66 MHz PCIX 533", /* 0x11 */
- "100 MHz PCIX 533", /* 0x12 */
- "133 MHz PCIX 533", /* 0x13 */
- "2.5 GT/s PCI-E", /* 0x14 */
- "5.0 GT/s PCI-E", /* 0x15 */
+ "66 MHz PCI-X 533", /* 0x11 */
+ "100 MHz PCI-X 533", /* 0x12 */
+ "133 MHz PCI-X 533", /* 0x13 */
+ "2.5 GT/s PCIe", /* 0x14 */
+ "5.0 GT/s PCIe", /* 0x15 */
};

#ifdef CONFIG_HOTPLUG_PCI_CPCI

2009-10-26 17:54:40

by Krzysztof Halasa

Subject: Re: [PATCH] PCI hotplug: change PCI nomenclature

Stefan Assmann <[email protected]> writes:

> +++ b/drivers/pci/hotplug/pci_hotplug_core.c

> - "66 MHz PCIX", /* 0x02 */
> - "100 MHz PCIX", /* 0x03 */
> - "133 MHz PCIX", /* 0x04 */
> + "66 MHz PCI-X", /* 0x02 */
> + "100 MHz PCI-X", /* 0x03 */
> + "133 MHz PCI-X", /* 0x04 */
> NULL, /* 0x05 */
> NULL, /* 0x06 */
> NULL, /* 0x07 */
> NULL, /* 0x08 */
> - "66 MHz PCIX 266", /* 0x09 */
> - "100 MHz PCIX 266", /* 0x0a */
> - "133 MHz PCIX 266", /* 0x0b */
> + "66 MHz PCI-X 266", /* 0x09 */
> + "100 MHz PCI-X 266", /* 0x0a */
> + "133 MHz PCI-X 266", /* 0x0b */
> NULL, /* 0x0c */
> NULL, /* 0x0d */
> NULL, /* 0x0e */
> NULL, /* 0x0f */
> NULL, /* 0x10 */
> - "66 MHz PCIX 533", /* 0x11 */
> - "100 MHz PCIX 533", /* 0x12 */
> - "133 MHz PCIX 533", /* 0x13 */
> - "2.5 GT/s PCI-E", /* 0x14 */
> - "5.0 GT/s PCI-E", /* 0x15 */
> + "66 MHz PCI-X 533", /* 0x11 */
> + "100 MHz PCI-X 533", /* 0x12 */
> + "133 MHz PCI-X 533", /* 0x13 */
> + "2.5 GT/s PCIe", /* 0x14 */
> + "5.0 GT/s PCIe", /* 0x15 */

Seems perfect now.
--
Krzysztof Halasa

2009-10-26 19:47:33

by Donald Dutile

Subject: Re: [PATCH] PCI hotplug: change PCI nomenclature

Stefan Assmann wrote:
> Change PCI nomenclature according to
> http://www.pcisig.com/developers/procedures/logos/Trademark_and_Logo_Usage_Guidelines_updated_112206.pdf.
>
> Signed-off-by: Stefan Assmann <[email protected]>
> ---
> diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
> index 0325d98..38183a5 100644
> --- a/drivers/pci/hotplug/pci_hotplug_core.c
> +++ b/drivers/pci/hotplug/pci_hotplug_core.c
> @@ -68,26 +68,26 @@ static DEFINE_MUTEX(pci_hp_mutex);
> static char *pci_bus_speed_strings[] = {
> "33 MHz PCI", /* 0x00 */
> "66 MHz PCI", /* 0x01 */
> - "66 MHz PCIX", /* 0x02 */
> - "100 MHz PCIX", /* 0x03 */
> - "133 MHz PCIX", /* 0x04 */
> + "66 MHz PCI-X", /* 0x02 */
> + "100 MHz PCI-X", /* 0x03 */
> + "133 MHz PCI-X", /* 0x04 */
> NULL, /* 0x05 */
> NULL, /* 0x06 */
> NULL, /* 0x07 */
> NULL, /* 0x08 */
> - "66 MHz PCIX 266", /* 0x09 */
> - "100 MHz PCIX 266", /* 0x0a */
> - "133 MHz PCIX 266", /* 0x0b */
> + "66 MHz PCI-X 266", /* 0x09 */
> + "100 MHz PCI-X 266", /* 0x0a */
> + "133 MHz PCI-X 266", /* 0x0b */
> NULL, /* 0x0c */
> NULL, /* 0x0d */
> NULL, /* 0x0e */
> NULL, /* 0x0f */
> NULL, /* 0x10 */
> - "66 MHz PCIX 533", /* 0x11 */
> - "100 MHz PCIX 533", /* 0x12 */
> - "133 MHz PCIX 533", /* 0x13 */
> - "2.5 GT/s PCI-E", /* 0x14 */
> - "5.0 GT/s PCI-E", /* 0x15 */
> + "66 MHz PCI-X 533", /* 0x11 */
> + "100 MHz PCI-X 533", /* 0x12 */
> + "133 MHz PCI-X 533", /* 0x13 */
> + "2.5 GT/s PCIe", /* 0x14 */
> + "5.0 GT/s PCIe", /* 0x15 */
> };
>
> #ifdef CONFIG_HOTPLUG_PCI_CPCI

Signed-off-by: Donald Dutile <[email protected]>

2009-10-26 20:40:03

by Jesse Barnes

Subject: Re: [PATCH] PCI hotplug: change PCI nomenclature

On Mon, 26 Oct 2009 14:44:46 +0100
Stefan Assmann <[email protected]> wrote:

> Change PCI nomenclature according to
> http://www.pcisig.com/developers/procedures/logos/Trademark_and_Logo_Usage_Guidelines_updated_112206.pdf.
>
> Signed-off-by: Stefan Assmann <[email protected]>

Applied to my linux-next tree, thanks.

--
Jesse Barnes, Intel Open Source Technology Center