From: Kevin Cernekee <cernekee@gmail.com>
To: alan@linux.intel.com, gregkh@linuxfoundation.org, jslaby@suse.cz
Cc: linux-serial@vger.kernel.org, dwmw2@infradead.org, ben@decadent.org.uk
Subject: [PATCH 2/3] tty: rocket: Explicitly list supported PCI IDs
Date: Sat, 29 Dec 2012 23:23:23 -0800 [thread overview]
Message-ID: <8e99cbf1f2bdfacaeaf0a5ac99d99309@localhost> (raw)
In-Reply-To: <bd10fdeead3e321db2bb291c0b722203@localhost>
Matching PCI_ANY_ID causes conflicts with RocketPort 2 adapters, which
are supported by a different driver.
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---
drivers/tty/rocket.c | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index e42009a..c73ca4e 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -1758,8 +1758,32 @@ static void rp_flush_buffer(struct tty_struct *tty)
#ifdef CONFIG_PCI
-static struct pci_device_id __used rocket_pci_ids[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) },
+#define RP_PCI_DEVICE(id) \
+ { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_##id) }
+
+static DEFINE_PCI_DEVICE_TABLE(rocket_pci_ids) = {
+ RP_PCI_DEVICE(RP4QUAD),
+ RP_PCI_DEVICE(RP8OCTA),
+ RP_PCI_DEVICE(URP8OCTA),
+ RP_PCI_DEVICE(RP8INTF),
+ RP_PCI_DEVICE(URP8INTF),
+ RP_PCI_DEVICE(RP8J),
+ RP_PCI_DEVICE(RP4J),
+ RP_PCI_DEVICE(RP8SNI),
+ RP_PCI_DEVICE(RP16SNI),
+ RP_PCI_DEVICE(RP16INTF),
+ RP_PCI_DEVICE(URP16INTF),
+ RP_PCI_DEVICE(CRP16INTF),
+ RP_PCI_DEVICE(RP32INTF),
+ RP_PCI_DEVICE(URP32INTF),
+ RP_PCI_DEVICE(RPP4),
+ RP_PCI_DEVICE(RPP8),
+ RP_PCI_DEVICE(RP2_232),
+ RP_PCI_DEVICE(RP2_422),
+ RP_PCI_DEVICE(RP6M),
+ RP_PCI_DEVICE(RP4M),
+ RP_PCI_DEVICE(UPCI_RM3_8PORT),
+ RP_PCI_DEVICE(UPCI_RM3_4PORT),
{ }
};
MODULE_DEVICE_TABLE(pci, rocket_pci_ids);
@@ -1781,7 +1805,8 @@ static __init int register_PCI(int i, struct pci_dev *dev)
WordIO_t ConfigIO = 0;
ByteIO_t UPCIRingInd = 0;
- if (!dev || pci_enable_device(dev))
+ if (!dev || !pci_match_id(rocket_pci_ids, dev) ||
+ pci_enable_device(dev))
return 0;
rcktpt_io_addr[i] = pci_resource_start(dev, 0);
--
1.7.10.4
next prev parent reply other threads:[~2012-12-30 7:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-30 7:23 [PATCH V2 1/3] serial: rp2: New driver for Comtrol RocketPort 2 cards Kevin Cernekee
2012-12-30 7:23 ` Kevin Cernekee [this message]
2013-01-16 5:26 ` [PATCH 2/3] tty: rocket: Explicitly list supported PCI IDs Greg KH
2012-12-30 7:23 ` [PATCH -firmware 3/3] rp2: Initial commit of Comtrol RocketPort 2 microcode Kevin Cernekee
2012-12-30 12:29 ` Ben Hutchings
2012-12-30 11:59 ` [PATCH V2 1/3] serial: rp2: New driver for Comtrol RocketPort 2 cards Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8e99cbf1f2bdfacaeaf0a5ac99d99309@localhost \
--to=cernekee@gmail.com \
--cc=alan@linux.intel.com \
--cc=ben@decadent.org.uk \
--cc=dwmw2@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).