mirror of
https://github.com/u-boot/u-boot.git
synced 2025-01-24 11:43:35 +08:00
pci: acpi: Drop DM_PCI check from ahci
We don't need these checks anymore since when PCI is enabled, driver model is always used. Drop them. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
b717f2f2d1
commit
d6d504d7ba
@ -170,13 +170,8 @@ int ahci_reset(void __iomem *base)
|
||||
static int ahci_host_init(struct ahci_uc_priv *uc_priv)
|
||||
{
|
||||
#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI)
|
||||
# ifdef CONFIG_DM_PCI
|
||||
struct udevice *dev = uc_priv->dev;
|
||||
struct pci_child_plat *pplat = dev_get_parent_plat(dev);
|
||||
# else
|
||||
pci_dev_t pdev = uc_priv->dev;
|
||||
unsigned short vendor;
|
||||
# endif
|
||||
u16 tmp16;
|
||||
#endif
|
||||
void __iomem *mmio = uc_priv->mmio_base;
|
||||
@ -200,23 +195,12 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
|
||||
writel_with_flush(0xf, mmio + HOST_PORTS_IMPL);
|
||||
|
||||
#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI)
|
||||
# ifdef CONFIG_DM_PCI
|
||||
if (pplat->vendor == PCI_VENDOR_ID_INTEL) {
|
||||
u16 tmp16;
|
||||
|
||||
dm_pci_read_config16(dev, 0x92, &tmp16);
|
||||
dm_pci_write_config16(dev, 0x92, tmp16 | 0xf);
|
||||
}
|
||||
# else
|
||||
pci_read_config_word(pdev, PCI_VENDOR_ID, &vendor);
|
||||
|
||||
if (vendor == PCI_VENDOR_ID_INTEL) {
|
||||
u16 tmp16;
|
||||
pci_read_config_word(pdev, 0x92, &tmp16);
|
||||
tmp16 |= 0xf;
|
||||
pci_write_config_word(pdev, 0x92, tmp16);
|
||||
}
|
||||
# endif
|
||||
#endif
|
||||
uc_priv->cap = readl(mmio + HOST_CAP);
|
||||
uc_priv->port_map = readl(mmio + HOST_PORTS_IMPL);
|
||||
@ -331,15 +315,9 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
|
||||
debug("HOST_CTL 0x%x\n", tmp);
|
||||
#if !defined(CONFIG_DM_SCSI)
|
||||
#ifndef CONFIG_SCSI_AHCI_PLAT
|
||||
# ifdef CONFIG_DM_PCI
|
||||
dm_pci_read_config16(dev, PCI_COMMAND, &tmp16);
|
||||
tmp |= PCI_COMMAND_MASTER;
|
||||
dm_pci_write_config16(dev, PCI_COMMAND, tmp16);
|
||||
# else
|
||||
pci_read_config_word(pdev, PCI_COMMAND, &tmp16);
|
||||
tmp |= PCI_COMMAND_MASTER;
|
||||
pci_write_config_word(pdev, PCI_COMMAND, tmp16);
|
||||
# endif
|
||||
#endif
|
||||
#endif
|
||||
return 0;
|
||||
@ -349,11 +327,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
|
||||
static void ahci_print_info(struct ahci_uc_priv *uc_priv)
|
||||
{
|
||||
#if !defined(CONFIG_SCSI_AHCI_PLAT) && !defined(CONFIG_DM_SCSI)
|
||||
# if defined(CONFIG_DM_PCI)
|
||||
struct udevice *dev = uc_priv->dev;
|
||||
# else
|
||||
pci_dev_t pdev = uc_priv->dev;
|
||||
# endif
|
||||
u16 cc;
|
||||
#endif
|
||||
void __iomem *mmio = uc_priv->mmio_base;
|
||||
@ -379,11 +353,7 @@ static void ahci_print_info(struct ahci_uc_priv *uc_priv)
|
||||
#if defined(CONFIG_SCSI_AHCI_PLAT) || defined(CONFIG_DM_SCSI)
|
||||
scc_s = "SATA";
|
||||
#else
|
||||
# ifdef CONFIG_DM_PCI
|
||||
dm_pci_read_config16(dev, 0x0a, &cc);
|
||||
# else
|
||||
pci_read_config_word(pdev, 0x0a, &cc);
|
||||
# endif
|
||||
if (cc == 0x0101)
|
||||
scc_s = "IDE";
|
||||
else if (cc == 0x0106)
|
||||
@ -428,11 +398,7 @@ static void ahci_print_info(struct ahci_uc_priv *uc_priv)
|
||||
}
|
||||
|
||||
#if defined(CONFIG_DM_SCSI) || !defined(CONFIG_SCSI_AHCI_PLAT)
|
||||
# if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI)
|
||||
static int ahci_init_one(struct ahci_uc_priv *uc_priv, struct udevice *dev)
|
||||
# else
|
||||
static int ahci_init_one(struct ahci_uc_priv *uc_priv, pci_dev_t dev)
|
||||
# endif
|
||||
{
|
||||
#if !defined(CONFIG_DM_SCSI)
|
||||
u16 vendor;
|
||||
@ -450,7 +416,6 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, pci_dev_t dev)
|
||||
uc_priv->udma_mask = 0x7f; /*Fixme,assume to support UDMA6 */
|
||||
|
||||
#if !defined(CONFIG_DM_SCSI)
|
||||
#ifdef CONFIG_DM_PCI
|
||||
uc_priv->mmio_base = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_5,
|
||||
PCI_REGION_MEM);
|
||||
|
||||
@ -461,18 +426,6 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, pci_dev_t dev)
|
||||
dm_pci_read_config16(dev, PCI_VENDOR_ID, &vendor);
|
||||
if (vendor == 0x197b)
|
||||
dm_pci_write_config8(dev, 0x41, 0xa1);
|
||||
#else
|
||||
uc_priv->mmio_base = pci_map_bar(dev, PCI_BASE_ADDRESS_5,
|
||||
PCI_REGION_MEM);
|
||||
|
||||
/* Take from kernel:
|
||||
* JMicron-specific fixup:
|
||||
* make sure we're in AHCI mode
|
||||
*/
|
||||
pci_read_config_word(dev, PCI_VENDOR_ID, &vendor);
|
||||
if (vendor == 0x197b)
|
||||
pci_write_config_byte(dev, 0x41, 0xa1);
|
||||
#endif
|
||||
#else
|
||||
struct scsi_plat *plat = dev_get_uclass_plat(dev);
|
||||
uc_priv->mmio_base = (void *)plat->base;
|
||||
@ -1006,7 +959,6 @@ void scsi_low_level_init(int busdevfunc)
|
||||
return;
|
||||
}
|
||||
uc_priv = probe_ent;
|
||||
# if defined(CONFIG_DM_PCI)
|
||||
struct udevice *dev;
|
||||
int ret;
|
||||
|
||||
@ -1014,9 +966,6 @@ void scsi_low_level_init(int busdevfunc)
|
||||
if (ret)
|
||||
return;
|
||||
ahci_init_one(uc_priv, dev);
|
||||
# else
|
||||
ahci_init_one(uc_priv, busdevfunc);
|
||||
# endif
|
||||
#else
|
||||
uc_priv = probe_ent;
|
||||
#endif
|
||||
@ -1026,7 +975,6 @@ void scsi_low_level_init(int busdevfunc)
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SCSI_AHCI_PLAT
|
||||
# if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI)
|
||||
int ahci_init_one_dm(struct udevice *dev)
|
||||
{
|
||||
struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev);
|
||||
@ -1034,7 +982,6 @@ int ahci_init_one_dm(struct udevice *dev)
|
||||
return ahci_init_one(uc_priv, dev);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
int ahci_start_ports_dm(struct udevice *dev)
|
||||
{
|
||||
@ -1196,7 +1143,6 @@ int ahci_probe_scsi(struct udevice *ahci_dev, ulong base)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DM_PCI
|
||||
int ahci_probe_scsi_pci(struct udevice *ahci_dev)
|
||||
{
|
||||
ulong base;
|
||||
@ -1221,7 +1167,6 @@ int ahci_probe_scsi_pci(struct udevice *ahci_dev)
|
||||
PCI_REGION_MEM);
|
||||
return ahci_probe_scsi(ahci_dev, base);
|
||||
}
|
||||
#endif
|
||||
|
||||
struct scsi_ops scsi_ops = {
|
||||
.exec = ahci_scsi_exec,
|
||||
|
@ -148,16 +148,12 @@ struct ahci_ioports {
|
||||
* where dev is the controller (although at present it sometimes stands alone).
|
||||
*/
|
||||
struct ahci_uc_priv {
|
||||
#if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI)
|
||||
/*
|
||||
* TODO(sjg@chromium.org): Drop this once this structure is only used
|
||||
* in a driver-model context (i.e. attached to a device with
|
||||
* dev_get_uclass_priv()
|
||||
*/
|
||||
struct udevice *dev;
|
||||
#else
|
||||
pci_dev_t dev;
|
||||
#endif
|
||||
struct ahci_ioports port[AHCI_MAX_PORTS];
|
||||
u16 *ataid[AHCI_MAX_PORTS];
|
||||
u32 n_ports;
|
||||
|
Loading…
Reference in New Issue
Block a user