[PATCH 1/3] pci: add "fundamental reset" quirk

[PATCH 1/3] pci: add "fundamental reset" quirk

[Alexey Kardashevskiy]

From: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
---
 drivers/pci/quirks.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index f6c31fa..f3eedbf 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3271,6 +3271,19 @@ static int reset_chelsio_generic_dev(struct pci_dev *dev, int probe)
 	return 0;
 }
 
+static int reset_fundamental(struct pci_dev *dev, int probe)
+{
+	if (probe)
+		return 0;
+
+	pci_set_pcie_reset_state(dev, pcie_hot_reset);
+	msleep(250);
+	pci_set_pcie_reset_state(dev, pcie_deassert_reset);
+	msleep(1800);
+
+	return 0;
+}
+
 #define PCI_DEVICE_ID_INTEL_82599_SFP_VF   0x10ed
 #define PCI_DEVICE_ID_INTEL_IVB_M_VGA      0x0156
 #define PCI_DEVICE_ID_INTEL_IVB_M2_VGA     0x0166
@@ -3286,6 +3299,14 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
 		reset_intel_generic_dev },
 	{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
 		reset_chelsio_generic_dev },
+
+	{ PCI_VENDOR_ID_IBM, PCI_ANY_ID,
+		reset_fundamental },
+	{ PCI_VENDOR_ID_MELLANOX, PCI_ANY_ID,
+		reset_fundamental },
+	{ PCI_VENDOR_ID_TI, PCI_ANY_ID,
+		reset_fundamental },
+
 	{ 0 }
 };
 
-- 
1.8.4.rc4

[PATCH 2/3] PPC: KVM: fix to compile without VFIO

[Alexey Kardashevskiy]

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 arch/powerpc/kvm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index cb6e84a..88cffb8 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -65,7 +65,7 @@ config KVM_BOOK3S_64
 	select KVM
 	select SPAPR_TCE_IOMMU if IOMMU_SUPPORT
 	select KVM_BOOK3S_PR_POSSIBLE if !KVM_BOOK3S_HV_POSSIBLE
-	select KVM_VFIO
+	select KVM_VFIO if VFIO
 	---help---
 	  Support running unmodified book3s_64 and book3s_32 guest kernels
 	  in virtual machines on book3s_64 host processors.
-- 
1.8.4.rc4

Re: [PATCH 1/3] pci: add "fundamental reset" quirk

[Alexey Kardashevskiy]

Rats. Please ignore this patchset.


On 01/17/2014 04:08 PM, Alexey Kardashevskiy wrote:
> From: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
> ---
>  drivers/pci/quirks.c | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index f6c31fa..f3eedbf 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -3271,6 +3271,19 @@ static int reset_chelsio_generic_dev(struct pci_dev *dev, int probe)
>  	return 0;
>  }
>  
> +static int reset_fundamental(struct pci_dev *dev, int probe)
> +{
> +	if (probe)
> +		return 0;
> +
> +	pci_set_pcie_reset_state(dev, pcie_hot_reset);
> +	msleep(250);
> +	pci_set_pcie_reset_state(dev, pcie_deassert_reset);
> +	msleep(1800);
> +
> +	return 0;
> +}
> +
>  #define PCI_DEVICE_ID_INTEL_82599_SFP_VF   0x10ed
>  #define PCI_DEVICE_ID_INTEL_IVB_M_VGA      0x0156
>  #define PCI_DEVICE_ID_INTEL_IVB_M2_VGA     0x0166
> @@ -3286,6 +3299,14 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
>  		reset_intel_generic_dev },
>  	{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
>  		reset_chelsio_generic_dev },
> +
> +	{ PCI_VENDOR_ID_IBM, PCI_ANY_ID,
> +		reset_fundamental },
> +	{ PCI_VENDOR_ID_MELLANOX, PCI_ANY_ID,
> +		reset_fundamental },
> +	{ PCI_VENDOR_ID_TI, PCI_ANY_ID,
> +		reset_fundamental },
> +
>  	{ 0 }
>  };
>  
> 


-- 
Alexey