From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/11] usb: ehci: generic PCI support
Date: Thu, 13 Dec 2012 18:54:02 +0100 [thread overview]
Message-ID: <201212131854.03058.marex@denx.de> (raw)
In-Reply-To: <CAP_ceTx4hv9qO64_J0pqUtqebANfE8nWWMZ0fzbSfzdFVReJMA@mail.gmail.com>
Dear Vincent Palatin,
> On Thu, Dec 13, 2012 at 9:30 AM, Marek Vasut <marex@denx.de> wrote:
> > Dear Simon Glass,
> >
> >> From: Vincent Palatin <vpalatin@chromium.org>
> >>
> >> Instead of hardcoding the PCI IDs on the USB controller, use the PCI
> >> class to detect them.
> >>
> >> Ensure the busmaster bit is properly set in the PCI configuration.
> >>
> >> Signed-off-by: Simon Glass <sjg@chromium.org>
> >> ---
> >>
> >> drivers/usb/host/ehci-pci.c | 37
> >> +++++++++++++++++++++++++++++++++++++ 1 files changed, 37
> >> insertions(+), 0 deletions(-)
> >>
> >> diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
> >> index 29af02d..0dc0e6e 100644
> >> --- a/drivers/usb/host/ehci-pci.c
> >> +++ b/drivers/usb/host/ehci-pci.c
> >> @@ -32,6 +32,34 @@ static struct pci_device_id ehci_pci_ids[] = {
> >>
> >> {0x12D8, 0x400F}, /* Pericom */
> >> {0, 0}
> >>
> >> };
> >>
> >> +#else
> >> +static pci_dev_t ehci_find_class(void)
> >> +{
> >> + int bus;
> >> + int devnum;
> >> + pci_dev_t bdf;
> >> + uint32_t class;
> >> +
> >> + for (bus = 0; bus < pci_last_busno(); bus++) {
> >> + for (devnum = 0; devnum < PCI_MAX_PCI_DEVICES-1; devnum++)
> >> { + pci_read_config_dword(PCI_BDF(bus, devnum, 0),
> >> + PCI_CLASS_REVISION,
> >> &class); + if (class >> 16 == 0xffff)
> >> + continue;
> >> +
> >> + for (bdf = PCI_BDF(bus, devnum, 0);
> >> + bdf <= PCI_BDF(bus, devnum,
> >> + PCI_MAX_PCI_FUNCTIONS -
> >> 1); + bdf += PCI_BDF(0, 0, 1)) { +
> >> pci_read_config_dword(bdf,
> >> PCI_CLASS_REVISION, +
> >> &class);
> >> + if (class >> 8 == 0x0c0320)
> >
> > Can we at least describe this magic please?
>
> The PCI class word is something like that :
> class = [31:24] class code [23:16] subclass [15:8] Prog if [7:0] Revision
> ID For this use case :
> class code = 0x0C (Serial bus controller)
> subclass = 0x03 (USB controller)
> Program interface = 0x20 (EHCI)
>
> This is available in include/pci_ids.h as "#define
> PCI_CLASS_SERIAL_USB_EHCI 0x0c0320"
> so just replacing the numeric constant by this define should be ok ?
Of course :)
next prev parent reply other threads:[~2012-12-13 17:54 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 1:55 [U-Boot] [PATCH 0/11] Various USB improvements Simon Glass
2012-12-13 1:55 ` [U-Boot] [PATCH 01/11] usb: net: asix: Do a fast init if link already established Simon Glass
2012-12-13 17:26 ` Marek Vasut
2012-12-15 7:28 ` Joe Hershberger
2012-12-13 1:55 ` [U-Boot] [PATCH 02/11] usb: ehci: Add 64-bit controller support Simon Glass
2012-12-13 17:27 ` Marek Vasut
2012-12-13 1:55 ` [U-Boot] [PATCH 03/11] usb: ehci: generic PCI support Simon Glass
2012-12-13 17:30 ` Marek Vasut
2012-12-13 17:49 ` Vincent Palatin
2012-12-13 17:54 ` Marek Vasut [this message]
2012-12-14 1:41 ` Simon Glass
2012-12-14 6:58 ` [U-Boot] [PATCH v3 2/7] " Simon Glass
2012-12-13 1:55 ` [U-Boot] [PATCH 04/11] usb: ehci: Support interrupt transfers via periodic list Simon Glass
2012-12-13 17:32 ` Marek Vasut
2012-12-14 1:46 ` Simon Glass
2012-12-14 2:00 ` Marek Vasut
2012-12-14 2:05 ` Simon Glass
2012-12-13 1:55 ` [U-Boot] [PATCH 05/11] usb: ehci: Fix aliasing issue in EHCI interrupt code Simon Glass
2012-12-13 1:55 ` [U-Boot] [PATCH 06/11] usb: ehci: Add timeout on interrupt endpoint operations Simon Glass
2012-12-13 17:35 ` Marek Vasut
2012-12-14 2:04 ` Simon Glass
2012-12-13 1:55 ` [U-Boot] [PATCH 07/11] usb: usbeth: smsc95xx: remove EEPROM loaded check Simon Glass
2012-12-13 17:35 ` Marek Vasut
2012-12-13 1:55 ` [U-Boot] [PATCH 08/11] usb: Clean up newly allocated device nodes in case of configuration failure Simon Glass
2012-12-13 17:36 ` Marek Vasut
2012-12-13 1:55 ` [U-Boot] [PATCH 09/11] usb: properly detect empty mass storage media reader Simon Glass
2012-12-13 17:37 ` Marek Vasut
2012-12-13 1:55 ` [U-Boot] [PATCH 10/11] usb: Add multiple controllers support for EHCI PCI Simon Glass
2012-12-13 1:55 ` [U-Boot] [PATCH 11/11] x86: Enable USB features for coreboot Simon Glass
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=201212131854.03058.marex@denx.de \
--to=marex@denx.de \
--cc=u-boot@lists.denx.de \
/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