diff mbox

[v3,7/8] PCI hotplug: acpiphp: use generic pci_configure_slot()

Message ID 20090902225035.12417.6984.stgit@bob.kio (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Bjorn Helgaas Sept. 2, 2009, 10:50 p.m. UTC 
Use the generic pci_configure_slot() rather than the acpiphp-specific
decode_hpp() and program_hpp().

Unlike the previous acpiphp-specific code, pci_configure_slot() programs
PCIe settings when an _HPX method provides them, so acpiphp-managed PCIe
devices can now be configured.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
 drivers/pci/hotplug/acpi_pcihp.c   |    9 ++--
 drivers/pci/hotplug/acpiphp_glue.c |   81 +-----------------------------------
 include/linux/pci_hotplug.h        |    4 --
 3 files changed, 7 insertions(+), 87 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Kenji Kaneshige Sept. 3, 2009, 12:57 a.m. UTC | #1 
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>


Bjorn Helgaas wrote:
> Use the generic pci_configure_slot() rather than the acpiphp-specific
> decode_hpp() and program_hpp().
> 
> Unlike the previous acpiphp-specific code, pci_configure_slot() programs
> PCIe settings when an _HPX method provides them, so acpiphp-managed PCIe
> devices can now be configured.
> 
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> ---
>  drivers/pci/hotplug/acpi_pcihp.c   |    9 ++--
>  drivers/pci/hotplug/acpiphp_glue.c |   81 +-----------------------------------
>  include/linux/pci_hotplug.h        |    4 --
>  3 files changed, 7 insertions(+), 87 deletions(-)
> 
> diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
> index be3b9be..c53f72b 100644
> --- a/drivers/pci/hotplug/acpi_pcihp.c
> +++ b/drivers/pci/hotplug/acpi_pcihp.c
> @@ -322,13 +322,12 @@ static acpi_status acpi_run_oshp(acpi_handle handle)
>  	return status;
>  }
>  
> -/* acpi_get_hp_params_from_firmware
> +/* pci_get_hp_params
>   *
>   * @dev - the pci_dev for which we want parameters
>   * @hpp - allocated by the caller
>   */
> -int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
> -		struct hotplug_params *hpp)
> +int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp)
>  {
>  	acpi_status status;
>  	acpi_handle handle, phandle;
> @@ -345,7 +344,7 @@ int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
>  	 * _HPP settings apply to all child buses, until another _HPP is
>  	 * encountered. If we don't find an _HPP for the input pci dev,
>  	 * look for it in the parent device scope since that would apply to
> -	 * this pci dev. If we don't find any _HPP, use hardcoded defaults
> +	 * this pci dev.
>  	 */
>  	while (handle) {
>  		status = acpi_run_hpx(handle, hpp);
> @@ -363,7 +362,7 @@ int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
>  	}
>  	return -ENODEV;
>  }
> -EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);
> +EXPORT_SYMBOL_GPL(pci_get_hp_params);
>  
>  /**
>   * acpi_get_hp_hw_control_from_firmware
> diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
> index 3dc45e9..050f1af 100644
> --- a/drivers/pci/hotplug/acpiphp_glue.c
> +++ b/drivers/pci/hotplug/acpiphp_glue.c
> @@ -274,29 +274,6 @@ static int detect_ejectable_slots(struct pci_bus *pbus)
>  	return found;
>  }
>  
> -
> -/* decode ACPI 2.0 _HPP hot plug parameters */
> -static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp)
> -{
> -	int ret;
> -
> -	ret = acpi_get_hp_params_from_firmware(dev, hpp);
> -	if (ret || !hpp->t0 || (hpp->t0->revision > 1)) {
> -		/* use default numbers */
> -		printk(KERN_WARNING
> -		       "%s: Could not get hotplug parameters. Use defaults\n",
> -		       __func__);
> -		hpp->t0 = &hpp->type0_data;
> -		hpp->t0->revision = 0;
> -		hpp->t0->cache_line_size = 0x10;
> -		hpp->t0->latency_timer = 0x40;
> -		hpp->t0->enable_serr = 0;
> -		hpp->t0->enable_perr = 0;
> -	}
> -}
> -
> -
> -
>  /* initialize miscellaneous stuff for both root and PCI-to-PCI bridge */
>  static void init_bridge_misc(struct acpiphp_bridge *bridge)
>  {
> @@ -1290,66 +1267,12 @@ static int acpiphp_check_bridge(struct acpiphp_bridge *bridge)
>  	return retval;
>  }
>  
> -static void program_hpp(struct pci_dev *dev, struct hotplug_params *hpp)
> -{
> -	u16 pci_cmd, pci_bctl;
> -	struct pci_dev *cdev;
> -
> -	/* Program hpp values for this device */
> -	if (!(dev->hdr_type == PCI_HEADER_TYPE_NORMAL ||
> -			(dev->hdr_type == PCI_HEADER_TYPE_BRIDGE &&
> -			(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)))
> -		return;
> -
> -	if ((dev->class >> 8) == PCI_CLASS_BRIDGE_HOST)
> -		return;
> -
> -	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
> -			hpp->t0->cache_line_size);
> -	pci_write_config_byte(dev, PCI_LATENCY_TIMER,
> -			hpp->t0->latency_timer);
> -	pci_read_config_word(dev, PCI_COMMAND, &pci_cmd);
> -	if (hpp->t0->enable_serr)
> -		pci_cmd |= PCI_COMMAND_SERR;
> -	else
> -		pci_cmd &= ~PCI_COMMAND_SERR;
> -	if (hpp->t0->enable_perr)
> -		pci_cmd |= PCI_COMMAND_PARITY;
> -	else
> -		pci_cmd &= ~PCI_COMMAND_PARITY;
> -	pci_write_config_word(dev, PCI_COMMAND, pci_cmd);
> -
> -	/* Program bridge control value and child devices */
> -	if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
> -		pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,
> -				hpp->t0->latency_timer);
> -		pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &pci_bctl);
> -		if (hpp->t0->enable_serr)
> -			pci_bctl |= PCI_BRIDGE_CTL_SERR;
> -		else
> -			pci_bctl &= ~PCI_BRIDGE_CTL_SERR;
> -		if (hpp->t0->enable_perr)
> -			pci_bctl |= PCI_BRIDGE_CTL_PARITY;
> -		else
> -			pci_bctl &= ~PCI_BRIDGE_CTL_PARITY;
> -		pci_write_config_word(dev, PCI_BRIDGE_CONTROL, pci_bctl);
> -		if (dev->subordinate) {
> -			list_for_each_entry(cdev, &dev->subordinate->devices,
> -					bus_list)
> -				program_hpp(cdev, hpp);
> -		}
> -	}
> -}
> -
>  static void acpiphp_set_hpp_values(struct pci_bus *bus)
>  {
>  	struct pci_dev *dev;
> -	struct hotplug_params hpp;
>  
> -	list_for_each_entry(dev, &bus->devices, bus_list) {
> -		decode_hpp(dev, &hpp);
> -		program_hpp(dev, &hpp);
> -	}
> +	list_for_each_entry(dev, &bus->devices, bus_list)
> +		pci_configure_slot(dev);
>  }
>  
>  /*
> diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
> index 95712ec..1b4db3a 100644
> --- a/include/linux/pci_hotplug.h
> +++ b/include/linux/pci_hotplug.h
> @@ -226,12 +226,10 @@ struct hotplug_params {
>  #ifdef CONFIG_ACPI
>  #include <acpi/acpi.h>
>  #include <acpi/acpi_bus.h>
> -int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
> -				struct hotplug_params *hpp);
> +int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp);
>  int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
>  int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);
>  int acpi_pci_detect_ejectable(struct pci_bus *pbus);
> -#define pci_get_hp_params(dev, hpp)  acpi_get_hp_params_from_firmware(dev, hpp)
>  #else
>  static inline int pci_get_hp_params(struct pci_dev *dev,
>  				    struct hotplug_params *hpp)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index be3b9be..c53f72b 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -322,13 +322,12 @@  static acpi_status acpi_run_oshp(acpi_handle handle)
 	return status;
 }
 
-/* acpi_get_hp_params_from_firmware
+/* pci_get_hp_params
  *
  * @dev - the pci_dev for which we want parameters
  * @hpp - allocated by the caller
  */
-int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
-		struct hotplug_params *hpp)
+int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp)
 {
 	acpi_status status;
 	acpi_handle handle, phandle;
@@ -345,7 +344,7 @@  int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
 	 * _HPP settings apply to all child buses, until another _HPP is
 	 * encountered. If we don't find an _HPP for the input pci dev,
 	 * look for it in the parent device scope since that would apply to
-	 * this pci dev. If we don't find any _HPP, use hardcoded defaults
+	 * this pci dev.
 	 */
 	while (handle) {
 		status = acpi_run_hpx(handle, hpp);
@@ -363,7 +362,7 @@  int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
 	}
 	return -ENODEV;
 }
-EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);
+EXPORT_SYMBOL_GPL(pci_get_hp_params);
 
 /**
  * acpi_get_hp_hw_control_from_firmware
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 3dc45e9..050f1af 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -274,29 +274,6 @@  static int detect_ejectable_slots(struct pci_bus *pbus)
 	return found;
 }
 
-
-/* decode ACPI 2.0 _HPP hot plug parameters */
-static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp)
-{
-	int ret;
-
-	ret = acpi_get_hp_params_from_firmware(dev, hpp);
-	if (ret || !hpp->t0 || (hpp->t0->revision > 1)) {
-		/* use default numbers */
-		printk(KERN_WARNING
-		       "%s: Could not get hotplug parameters. Use defaults\n",
-		       __func__);
-		hpp->t0 = &hpp->type0_data;
-		hpp->t0->revision = 0;
-		hpp->t0->cache_line_size = 0x10;
-		hpp->t0->latency_timer = 0x40;
-		hpp->t0->enable_serr = 0;
-		hpp->t0->enable_perr = 0;
-	}
-}
-
-
-
 /* initialize miscellaneous stuff for both root and PCI-to-PCI bridge */
 static void init_bridge_misc(struct acpiphp_bridge *bridge)
 {
@@ -1290,66 +1267,12 @@  static int acpiphp_check_bridge(struct acpiphp_bridge *bridge)
 	return retval;
 }
 
-static void program_hpp(struct pci_dev *dev, struct hotplug_params *hpp)
-{
-	u16 pci_cmd, pci_bctl;
-	struct pci_dev *cdev;
-
-	/* Program hpp values for this device */
-	if (!(dev->hdr_type == PCI_HEADER_TYPE_NORMAL ||
-			(dev->hdr_type == PCI_HEADER_TYPE_BRIDGE &&
-			(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)))
-		return;
-
-	if ((dev->class >> 8) == PCI_CLASS_BRIDGE_HOST)
-		return;
-
-	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
-			hpp->t0->cache_line_size);
-	pci_write_config_byte(dev, PCI_LATENCY_TIMER,
-			hpp->t0->latency_timer);
-	pci_read_config_word(dev, PCI_COMMAND, &pci_cmd);
-	if (hpp->t0->enable_serr)
-		pci_cmd |= PCI_COMMAND_SERR;
-	else
-		pci_cmd &= ~PCI_COMMAND_SERR;
-	if (hpp->t0->enable_perr)
-		pci_cmd |= PCI_COMMAND_PARITY;
-	else
-		pci_cmd &= ~PCI_COMMAND_PARITY;
-	pci_write_config_word(dev, PCI_COMMAND, pci_cmd);
-
-	/* Program bridge control value and child devices */
-	if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
-		pci_write_config_byte(dev, PCI_SEC_LATENCY_TIMER,
-				hpp->t0->latency_timer);
-		pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &pci_bctl);
-		if (hpp->t0->enable_serr)
-			pci_bctl |= PCI_BRIDGE_CTL_SERR;
-		else
-			pci_bctl &= ~PCI_BRIDGE_CTL_SERR;
-		if (hpp->t0->enable_perr)
-			pci_bctl |= PCI_BRIDGE_CTL_PARITY;
-		else
-			pci_bctl &= ~PCI_BRIDGE_CTL_PARITY;
-		pci_write_config_word(dev, PCI_BRIDGE_CONTROL, pci_bctl);
-		if (dev->subordinate) {
-			list_for_each_entry(cdev, &dev->subordinate->devices,
-					bus_list)
-				program_hpp(cdev, hpp);
-		}
-	}
-}
-
 static void acpiphp_set_hpp_values(struct pci_bus *bus)
 {
 	struct pci_dev *dev;
-	struct hotplug_params hpp;
 
-	list_for_each_entry(dev, &bus->devices, bus_list) {
-		decode_hpp(dev, &hpp);
-		program_hpp(dev, &hpp);
-	}
+	list_for_each_entry(dev, &bus->devices, bus_list)
+		pci_configure_slot(dev);
 }
 
 /*
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 95712ec..1b4db3a 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -226,12 +226,10 @@  struct hotplug_params {
 #ifdef CONFIG_ACPI
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
-int acpi_get_hp_params_from_firmware(struct pci_dev *dev,
-				struct hotplug_params *hpp);
+int pci_get_hp_params(struct pci_dev *dev, struct hotplug_params *hpp);
 int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
 int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);
 int acpi_pci_detect_ejectable(struct pci_bus *pbus);
-#define pci_get_hp_params(dev, hpp)  acpi_get_hp_params_from_firmware(dev, hpp)
 #else
 static inline int pci_get_hp_params(struct pci_dev *dev,
 				    struct hotplug_params *hpp)