diff mbox

[U-Boot,2/6] pci: Do not skip legacy IDE device configutation

Message ID BLU436-SMTP1720076FF13ABAAA878B6E6BFC70@phx.gbl
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Bin Meng May 15, 2015, 3:40 p.m. UTC
The legacy IDE device has a BAR4 (Bus Master Interface BAR) which
needs to be configured.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/pci/pci_auto.c | 14 --------------
 1 file changed, 14 deletions(-)

Comments

Simon Glass May 18, 2015, 9:39 p.m. UTC | #1
Hi Bin,

On 15 May 2015 at 09:40, Bin Meng <bmeng.cn@gmail.com> wrote:
> The legacy IDE device has a BAR4 (Bus Master Interface BAR) which
> needs to be configured.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  drivers/pci/pci_auto.c | 14 --------------
>  1 file changed, 14 deletions(-)

I don't see how this code change relates to your commit message...

>
> diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
> index 43965d8..7c10983 100644
> --- a/drivers/pci/pci_auto.c
> +++ b/drivers/pci/pci_auto.c
> @@ -20,8 +20,6 @@
>  #define DEBUGF(x...)
>  #endif /* DEBUG */
>
> -#define        PCIAUTO_IDE_MODE_MASK           0x05
> -
>  /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
>  #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
>  #define CONFIG_SYS_PCI_CACHE_LINE_SIZE 8
> @@ -424,7 +422,6 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
>  {
>         unsigned int sub_bus = PCI_BUS(dev);
>         unsigned short class;
> -       unsigned char prg_iface;
>         int n;
>
>         pci_hose_read_config_word(hose, dev, PCI_CLASS_DEVICE, &class);
> @@ -460,17 +457,6 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
>  #endif
>                 break;
>
> -       case PCI_CLASS_STORAGE_IDE:
> -               pci_hose_read_config_byte(hose, dev, PCI_CLASS_PROG, &prg_iface);
> -               if (!(prg_iface & PCIAUTO_IDE_MODE_MASK)) {
> -                       DEBUGF("PCI Autoconfig: Skipping legacy mode IDE controller\n");
> -                       return sub_bus;
> -               }
> -
> -               pciauto_setup_device(hose, dev, 6, hose->pci_mem,
> -                       hose->pci_prefetch, hose->pci_io);
> -               break;
> -
>         case PCI_CLASS_BRIDGE_CARDBUS:
>                 /*
>                  * just do a minimal setup of the bridge,
> --
> 1.8.2.1
>

Regards,
Simon
diff mbox

Patch

diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c
index 43965d8..7c10983 100644
--- a/drivers/pci/pci_auto.c
+++ b/drivers/pci/pci_auto.c
@@ -20,8 +20,6 @@ 
 #define DEBUGF(x...)
 #endif /* DEBUG */
 
-#define	PCIAUTO_IDE_MODE_MASK		0x05
-
 /* the user can define CONFIG_SYS_PCI_CACHE_LINE_SIZE to avoid problems */
 #ifndef CONFIG_SYS_PCI_CACHE_LINE_SIZE
 #define CONFIG_SYS_PCI_CACHE_LINE_SIZE	8
@@ -424,7 +422,6 @@  int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 {
 	unsigned int sub_bus = PCI_BUS(dev);
 	unsigned short class;
-	unsigned char prg_iface;
 	int n;
 
 	pci_hose_read_config_word(hose, dev, PCI_CLASS_DEVICE, &class);
@@ -460,17 +457,6 @@  int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 #endif
 		break;
 
-	case PCI_CLASS_STORAGE_IDE:
-		pci_hose_read_config_byte(hose, dev, PCI_CLASS_PROG, &prg_iface);
-		if (!(prg_iface & PCIAUTO_IDE_MODE_MASK)) {
-			DEBUGF("PCI Autoconfig: Skipping legacy mode IDE controller\n");
-			return sub_bus;
-		}
-
-		pciauto_setup_device(hose, dev, 6, hose->pci_mem,
-			hose->pci_prefetch, hose->pci_io);
-		break;
-
 	case PCI_CLASS_BRIDGE_CARDBUS:
 		/*
 		 * just do a minimal setup of the bridge,