mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-05 20:54:31 +00:00
2cb7b900f4
We used to have opencoded ehci_readl()/writel() which required no
external functions to be called.
Now with attempt to switch to generic readl()/writel() accessors
we see a missing declaration of those accessors in ehci-ppc4xx.
Something like that happens if applied
http://patchwork.ozlabs.org/patch/726714/:
--------------------------------->8---------------------------
CC drivers/usb/host/ehci-pci.o
In file included from drivers/usb/host/ehci-pci.c:14:0:
drivers/usb/host/ehci-pci.c: In function 'ehci_pci_init':
drivers/usb/host/ehci.h:108:36: warning: implicit declaration of function 'readl' [-Wimplicit-function-declaration]
#define ehci_readl(x) cpu_to_le32(readl(x))
^
drivers/usb/host/ehci.h:23:26: note: in definition of macro 'HC_LENGTH'
#define HC_LENGTH(p) (((p) >> 0) & 0x00ff)
^
include/linux/byteorder/generic.h:89:21: note: in expansion of macro '__cpu_to_le32'
#define cpu_to_le32 __cpu_to_le32
^~~~~~~~~~~~~
drivers/usb/host/ehci-pci.c:33:14: note: in expansion of macro 'ehci_readl'
HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
^~~~~~~~~~
--------------------------------->8---------------------------
This the same fix as we have for "ehci-ppc4xx" in
83cb46c286 "ehci-ppc4xx: Prepare for usage of readl()/writel() accessors".
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
154 lines
3.5 KiB
C
154 lines
3.5 KiB
C
/*-
|
|
* Copyright (c) 2007-2008, Juniper Networks, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <errno.h>
|
|
#include <pci.h>
|
|
#include <usb.h>
|
|
#include <asm/io.h>
|
|
|
|
#include "ehci.h"
|
|
|
|
/* Information about a USB port */
|
|
struct ehci_pci_priv {
|
|
struct ehci_ctrl ehci;
|
|
};
|
|
|
|
#ifdef CONFIG_DM_USB
|
|
|
|
static void ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr,
|
|
struct ehci_hcor **ret_hcor)
|
|
{
|
|
struct ehci_hccr *hccr;
|
|
struct ehci_hcor *hcor;
|
|
u32 cmd;
|
|
|
|
hccr = (struct ehci_hccr *)dm_pci_map_bar(dev,
|
|
PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
|
|
hcor = (struct ehci_hcor *)((uintptr_t) hccr +
|
|
HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
|
|
|
|
debug("EHCI-PCI init hccr %#lx and hcor %#lx hc_length %d\n",
|
|
(ulong)hccr, (ulong)hcor,
|
|
(u32)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
|
|
|
|
*ret_hccr = hccr;
|
|
*ret_hcor = hcor;
|
|
|
|
/* enable busmaster */
|
|
dm_pci_read_config32(dev, PCI_COMMAND, &cmd);
|
|
cmd |= PCI_COMMAND_MASTER;
|
|
dm_pci_write_config32(dev, PCI_COMMAND, cmd);
|
|
}
|
|
|
|
#else
|
|
|
|
#ifdef CONFIG_PCI_EHCI_DEVICE
|
|
static struct pci_device_id ehci_pci_ids[] = {
|
|
/* Please add supported PCI EHCI controller ids here */
|
|
{0x1033, 0x00E0}, /* NEC */
|
|
{0x10B9, 0x5239}, /* ULI1575 PCI EHCI module ids */
|
|
{0x12D8, 0x400F}, /* Pericom */
|
|
{0, 0}
|
|
};
|
|
#endif
|
|
|
|
static void ehci_pci_legacy_init(pci_dev_t pdev, struct ehci_hccr **ret_hccr,
|
|
struct ehci_hcor **ret_hcor)
|
|
{
|
|
struct ehci_hccr *hccr;
|
|
struct ehci_hcor *hcor;
|
|
u32 cmd;
|
|
|
|
hccr = (struct ehci_hccr *)pci_map_bar(pdev,
|
|
PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
|
|
hcor = (struct ehci_hcor *)((uintptr_t) hccr +
|
|
HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
|
|
|
|
debug("EHCI-PCI init hccr 0x%x and hcor 0x%x hc_length %d\n",
|
|
(u32)hccr, (u32)hcor,
|
|
(u32)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
|
|
|
|
*ret_hccr = hccr;
|
|
*ret_hcor = hcor;
|
|
|
|
/* enable busmaster */
|
|
pci_read_config_dword(pdev, PCI_COMMAND, &cmd);
|
|
cmd |= PCI_COMMAND_MASTER;
|
|
pci_write_config_dword(pdev, PCI_COMMAND, cmd);
|
|
}
|
|
|
|
/*
|
|
* Create the appropriate control structures to manage
|
|
* a new EHCI host controller.
|
|
*/
|
|
int ehci_hcd_init(int index, enum usb_init_type init,
|
|
struct ehci_hccr **ret_hccr, struct ehci_hcor **ret_hcor)
|
|
{
|
|
pci_dev_t pdev;
|
|
|
|
#ifdef CONFIG_PCI_EHCI_DEVICE
|
|
pdev = pci_find_devices(ehci_pci_ids, CONFIG_PCI_EHCI_DEVICE);
|
|
#else
|
|
pdev = pci_find_class(PCI_CLASS_SERIAL_USB_EHCI, index);
|
|
#endif
|
|
if (pdev < 0) {
|
|
printf("EHCI host controller not found\n");
|
|
return -1;
|
|
}
|
|
ehci_pci_legacy_init(pdev, ret_hccr, ret_hcor);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Destroy the appropriate control structures corresponding
|
|
* the the EHCI host controller.
|
|
*/
|
|
int ehci_hcd_stop(int index)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* nCONFIG_DM_USB */
|
|
|
|
#ifdef CONFIG_DM_USB
|
|
static int ehci_pci_probe(struct udevice *dev)
|
|
{
|
|
struct ehci_hccr *hccr;
|
|
struct ehci_hcor *hcor;
|
|
|
|
ehci_pci_init(dev, &hccr, &hcor);
|
|
|
|
return ehci_register(dev, hccr, hcor, NULL, 0, USB_INIT_HOST);
|
|
}
|
|
|
|
static const struct udevice_id ehci_pci_ids[] = {
|
|
{ .compatible = "ehci-pci" },
|
|
{ }
|
|
};
|
|
|
|
U_BOOT_DRIVER(ehci_pci) = {
|
|
.name = "ehci_pci",
|
|
.id = UCLASS_USB,
|
|
.probe = ehci_pci_probe,
|
|
.remove = ehci_deregister,
|
|
.of_match = ehci_pci_ids,
|
|
.ops = &ehci_usb_ops,
|
|
.platdata_auto_alloc_size = sizeof(struct usb_platdata),
|
|
.priv_auto_alloc_size = sizeof(struct ehci_pci_priv),
|
|
.flags = DM_FLAG_ALLOC_PRIV_DMA,
|
|
};
|
|
|
|
static struct pci_device_id ehci_pci_supported[] = {
|
|
{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0) },
|
|
{},
|
|
};
|
|
|
|
U_BOOT_PCI_DEVICE(ehci_pci, ehci_pci_supported);
|
|
|
|
#endif /* CONFIG_DM_USB */
|