Re: [PATCH 5/5] pata_piccolo: Driver for old Toshiba chipsets

Bartlomiej Zolnierkiewicz
2009-11-27T14:30:18Z

On Tuesday 17 November 2009 03:52:12 pm Alan Cox wrote:
> We were never able to get docs for this out of Toshiba for years. Dave
> Barnes produced a NetBSD driver however and from that we can fill in the
> needed tables
>
> Signed-off-by: Alan Cox <alan@linux.intel.com>
> ---
>
> drivers/ata/Kconfig | 25 +++++---
> drivers/ata/Makefile | 1
> drivers/ata/ata_generic.c | 5 +-
> drivers/ata/pata_piccolo.c | 140 ++++++++++++++++++++++++++++++++++++++++++++
> include/linux/pci_ids.h | 7 +-
> 5 files changed, 166 insertions(+), 12 deletions(-)
> create mode 100644 drivers/ata/pata_piccolo.c

[...]

> --- a/drivers/ata/ata_generic.c
> +++ b/drivers/ata/ata_generic.c
> @@ -168,9 +168,12 @@ static struct pci_device_id ata_generic[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), },
> { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), },
> { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), },
> +#if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)
> { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO), },
> - { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },
> { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), },
> + { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_3), },
> + { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_5), },
> +#endif

[...]

> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1496,9 +1496,10 @@
> #define PCI_DEVICE_ID_SBE_WANXL400 0x0104
>
> #define PCI_VENDOR_ID_TOSHIBA 0x1179
> -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102
> -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103
> -#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105
> +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0101
> +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0102
> +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_3 0x0103
> +#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_5 0x0105
> #define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a
> #define PCI_DEVICE_ID_TOSHIBA_TOPIC97 0x060f
> #define PCI_DEVICE_ID_TOSHIBA_TOPIC100 0x0617

This adds kernel regression and breaks kernel build (it is generally good to
grep kernel tree for the existing users before doing changes like the above):

drivers/ide/ide-pci-generic.c:

{ PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO), 4 },
{ PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), 4 },
{ PCI_VDEVICE(TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), 4 },

Please fix your patch.

--
Bartlomiej Zolnierkiewicz