2018-02-28 08:47:47

by Johannes Thumshirn

Subject: [PATCH v2 0/2] MCB Update for v4.17

Hi Greg or Bjorn,

here's a small mcb update for the 4.17 window. The first patch makes
the PCI Vendor ID of Altera generally available in pci_ids.h and
removes it from the two private implementations before I would have to
add a 3rd one.

The 2nd patch adds the Altera's PCI vendor ID to the mcb pci driver
which enables at least one carrier board. This was reported and tested
by Ben Turner.

Bjorn asked me to Cc linux-pci@ in his response, so I'm not sure if he want's
to merge these two patches. I'm fine either way.

Thanks,
Johannes

Changes to v1:
* Removed redundant pci_ids.h include

Johannes Thumshirn (2):
PCI: add vendor id for Altera
mcb: add Altera PCI ID to mcb-pci

drivers/char/xillybus/xillybus_pcie.c | 1 -
drivers/fpga/altera-cvp.c | 2 --
drivers/mcb/mcb-pci.c | 1 +
include/linux/pci_ids.h | 2 ++
4 files changed, 3 insertions(+), 3 deletions(-)

--
2.13.6

2018-02-28 08:46:04

by Johannes Thumshirn

Subject: [PATCH v2 2/2] mcb: add Altera PCI ID to mcb-pci

Some older PCI attached MEN FPGAs use an Altera PCI Vendor ID instead
of the MEN one. Add it to the PCI ID table so the driver automatically
attaches to it.

Signed-off-by: Johannes Thumshirn <[email protected]>
Reported-by: Ben Turner <[email protected]>
Tested-by: Ben Turner <[email protected]>
Cc: Andreas Geißler <[email protected]>

---
Changes to v1:
- Removed redundant include of pci_ids.h
---
drivers/mcb/mcb-pci.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/mcb/mcb-pci.c b/drivers/mcb/mcb-pci.c
index af4d2f26f1c6..c2d69e33bf2b 100644
--- a/drivers/mcb/mcb-pci.c
+++ b/drivers/mcb/mcb-pci.c
@@ -117,6 +117,7 @@ static void mcb_pci_remove(struct pci_dev *pdev)

static const struct pci_device_id mcb_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_MEN, PCI_DEVICE_ID_MEN_CHAMELEON) },
+ { PCI_DEVICE(PCI_VENDOR_ID_ALTERA, PCI_DEVICE_ID_MEN_CHAMELEON) },
{ 0 },
};
MODULE_DEVICE_TABLE(pci, mcb_pci_tbl);
--
2.13.6

2018-02-28 08:46:28

by Johannes Thumshirn

Subject: [PATCH v2 1/2] PCI: add vendor id for Altera

Add the Altera PCI Vendor id to pci_ids.h and remove the private
definitions from xillybus_pcie.c and altera-cvp.c.

Signed-off-by: Johannes Thumshirn <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Eli Billauer <[email protected]>
Cc: Anatolij Gustschin <[email protected]>

---
Changes to v1:
- Remove redundant pci_ids.h include (Andy)
---
drivers/char/xillybus/xillybus_pcie.c | 1 -
drivers/fpga/altera-cvp.c | 2 --
include/linux/pci_ids.h | 2 ++
3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/char/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c
index dff2d1538164..05e5324f60bd 100644
--- a/drivers/char/xillybus/xillybus_pcie.c
+++ b/drivers/char/xillybus/xillybus_pcie.c
@@ -24,7 +24,6 @@ MODULE_LICENSE("GPL v2");

#define PCI_DEVICE_ID_XILLYBUS 0xebeb

-#define PCI_VENDOR_ID_ALTERA 0x1172
#define PCI_VENDOR_ID_ACTEL 0x11aa
#define PCI_VENDOR_ID_LATTICE 0x1204

diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
index 00e73d28077c..77b04e4b3254 100644
--- a/drivers/fpga/altera-cvp.c
+++ b/drivers/fpga/altera-cvp.c
@@ -384,8 +384,6 @@ static int altera_cvp_probe(struct pci_dev *pdev,
const struct pci_device_id *dev_id);
static void altera_cvp_remove(struct pci_dev *pdev);

-#define PCI_VENDOR_ID_ALTERA 0x1172
-
static struct pci_device_id altera_cvp_id_tbl[] = {
{ PCI_VDEVICE(ALTERA, PCI_ANY_ID) },
{ }
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a6b30667a331..6a96a70fb462 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1561,6 +1561,8 @@
#define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227
#define PCI_DEVICE_ID_SERVERWORKS_HT1100LD 0x0408

+#define PCI_VENDOR_ID_ALTERA 0x1172
+
#define PCI_VENDOR_ID_SBE 0x1176
#define PCI_DEVICE_ID_SBE_WANXL100 0x0301
#define PCI_DEVICE_ID_SBE_WANXL200 0x0302
--
2.13.6

2018-02-28 12:01:44

by Eli Billauer

Subject: Re: [PATCH v2 1/2] PCI: add vendor id for Altera

Thanks.

Acked-by: Eli Billauer <[email protected]>

On 28/02/18 10:44, Johannes Thumshirn wrote:
> Add the Altera PCI Vendor id to pci_ids.h and remove the private
> definitions from xillybus_pcie.c and altera-cvp.c.
>
> Signed-off-by: Johannes Thumshirn<[email protected]>
> Cc: Bjorn Helgaas<[email protected]>
> Cc: Eli Billauer<[email protected]>
> Cc: Anatolij Gustschin<[email protected]>
>
> ---
> Changes to v1:
> - Remove redundant pci_ids.h include (Andy)
> ---
> drivers/char/xillybus/xillybus_pcie.c | 1 -
> drivers/fpga/altera-cvp.c | 2 --
> include/linux/pci_ids.h | 2 ++
> 3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c
> index dff2d1538164..05e5324f60bd 100644
> --- a/drivers/char/xillybus/xillybus_pcie.c
> +++ b/drivers/char/xillybus/xillybus_pcie.c
> @@ -24,7 +24,6 @@ MODULE_LICENSE("GPL v2");
>
> #define PCI_DEVICE_ID_XILLYBUS 0xebeb
>
> -#define PCI_VENDOR_ID_ALTERA 0x1172
> #define PCI_VENDOR_ID_ACTEL 0x11aa
> #define PCI_VENDOR_ID_LATTICE 0x1204
>
> diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
> index 00e73d28077c..77b04e4b3254 100644
> --- a/drivers/fpga/altera-cvp.c
> +++ b/drivers/fpga/altera-cvp.c
> @@ -384,8 +384,6 @@ static int altera_cvp_probe(struct pci_dev *pdev,
> const struct pci_device_id *dev_id);
> static void altera_cvp_remove(struct pci_dev *pdev);
>
> -#define PCI_VENDOR_ID_ALTERA 0x1172
> -
> static struct pci_device_id altera_cvp_id_tbl[] = {
> { PCI_VDEVICE(ALTERA, PCI_ANY_ID) },
> { }
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index a6b30667a331..6a96a70fb462 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1561,6 +1561,8 @@
> #define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227
> #define PCI_DEVICE_ID_SERVERWORKS_HT1100LD 0x0408
>
> +#define PCI_VENDOR_ID_ALTERA 0x1172
> +
> #define PCI_VENDOR_ID_SBE 0x1176
> #define PCI_DEVICE_ID_SBE_WANXL100 0x0301
> #define PCI_DEVICE_ID_SBE_WANXL200 0x0302
>

2018-02-28 14:45:06

by Andy Shevchenko

Subject: Re: [PATCH v2 0/2] MCB Update for v4.17

On Wed, Feb 28, 2018 at 10:44 AM, Johannes Thumshirn <[email protected]> wrote:
> Hi Greg or Bjorn,
>
> here's a small mcb update for the 4.17 window. The first patch makes
> the PCI Vendor ID of Altera generally available in pci_ids.h and
> removes it from the two private implementations before I would have to
> add a 3rd one.
>
> The 2nd patch adds the Altera's PCI vendor ID to the mcb pci driver
> which enables at least one carrier board. This was reported and tested
> by Ben Turner.
>
> Bjorn asked me to Cc linux-pci@ in his response, so I'm not sure if he want's
> to merge these two patches. I'm fine either way.
>

FWIW,
Reviewed-by: Andy Shevchenko <[email protected]>

> Thanks,
> Johannes
>
> Changes to v1:
> * Removed redundant pci_ids.h include
>
> Johannes Thumshirn (2):
> PCI: add vendor id for Altera
> mcb: add Altera PCI ID to mcb-pci
>
> drivers/char/xillybus/xillybus_pcie.c | 1 -
> drivers/fpga/altera-cvp.c | 2 --
> drivers/mcb/mcb-pci.c | 1 +
> include/linux/pci_ids.h | 2 ++
> 4 files changed, 3 insertions(+), 3 deletions(-)
>
> --
> 2.13.6
>



--
With Best Regards,
Andy Shevchenko

2018-02-28 19:55:07

by Bjorn Helgaas

Subject: Re: [PATCH v2 1/2] PCI: add vendor id for Altera

s/PCI: add vendor id for Altera/PCI: Add Altera vendor ID/

On Wed, Feb 28, 2018 at 09:44:17AM +0100, Johannes Thumshirn wrote:
> Add the Altera PCI Vendor id to pci_ids.h and remove the private
> definitions from xillybus_pcie.c and altera-cvp.c.
>
> Signed-off-by: Johannes Thumshirn <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Eli Billauer <[email protected]>
> Cc: Anatolij Gustschin <[email protected]>

Acked-by: Bjorn Helgaas <[email protected]>

Feel free to merge this along with the other. If you'd like me to
take them, just let me know.

> ---
> Changes to v1:
> - Remove redundant pci_ids.h include (Andy)
> ---
> drivers/char/xillybus/xillybus_pcie.c | 1 -
> drivers/fpga/altera-cvp.c | 2 --
> include/linux/pci_ids.h | 2 ++
> 3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/xillybus/xillybus_pcie.c b/drivers/char/xillybus/xillybus_pcie.c
> index dff2d1538164..05e5324f60bd 100644
> --- a/drivers/char/xillybus/xillybus_pcie.c
> +++ b/drivers/char/xillybus/xillybus_pcie.c
> @@ -24,7 +24,6 @@ MODULE_LICENSE("GPL v2");
>
> #define PCI_DEVICE_ID_XILLYBUS 0xebeb
>
> -#define PCI_VENDOR_ID_ALTERA 0x1172
> #define PCI_VENDOR_ID_ACTEL 0x11aa
> #define PCI_VENDOR_ID_LATTICE 0x1204
>
> diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
> index 00e73d28077c..77b04e4b3254 100644
> --- a/drivers/fpga/altera-cvp.c
> +++ b/drivers/fpga/altera-cvp.c
> @@ -384,8 +384,6 @@ static int altera_cvp_probe(struct pci_dev *pdev,
> const struct pci_device_id *dev_id);
> static void altera_cvp_remove(struct pci_dev *pdev);
>
> -#define PCI_VENDOR_ID_ALTERA 0x1172
> -
> static struct pci_device_id altera_cvp_id_tbl[] = {
> { PCI_VDEVICE(ALTERA, PCI_ANY_ID) },
> { }
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index a6b30667a331..6a96a70fb462 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1561,6 +1561,8 @@
> #define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227
> #define PCI_DEVICE_ID_SERVERWORKS_HT1100LD 0x0408
>
> +#define PCI_VENDOR_ID_ALTERA 0x1172
> +
> #define PCI_VENDOR_ID_SBE 0x1176
> #define PCI_DEVICE_ID_SBE_WANXL100 0x0301
> #define PCI_DEVICE_ID_SBE_WANXL200 0x0302
> --
> 2.13.6
>