[{focal, groovy}:linux-azure] LP:#1911205 - Revert or drop obsolete patches for PCI

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1911205

As bug description. Tested by Microsoft.

---
Marcelo Henrique Cerri (2):
  Revert "UBUNTU: SAUCE: pci-hyperv: Use only 16 bit integer for PCI
    domain"
  Revert "Revert "PCI: hv: Make sure the bus domain is really unique""

 drivers/pci/controller/pci-hyperv.c | 13 -------------
 1 file changed, 13 deletions(-)

--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1911205

As bug description. Tested by Microsoft.

---
Marcelo Henrique Cerri (2):
  Revert "UBUNTU: SAUCE: pci-hyperv: Use only 16 bit integer for PCI
    domain"
  Revert "Revert "PCI: hv: Make sure the bus domain is really unique""

 drivers/pci/controller/pci-hyperv.c | 13 -------------
 1 file changed, 13 deletions(-)

--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1911205

This reverts commit bead01e2f4746061492fb8e823855c7175327301.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 drivers/pci/controller/pci-hyperv.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 09dc3e67f188..77dcb196fa84 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -1986,11 +1986,9 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus,
  * can have shorter names than based on the bus instance UUID.
  * Only the first device serial number is used for domain, so the
  * domain number will not change after the first device is added.
- * The lower 16 bits of the serial number is used, otherwise some
- * drivers may not be able to handle it.
  */
  if (list_empty(&hbus->children))
- hbus->sysdata.domain = desc->ser & 0xFFFF;
+ hbus->sysdata.domain = desc->ser;
  list_add_tail(&hpdev->list_entry, &hbus->children);
  spin_unlock_irqrestore(&hbus->device_list_lock, flags);
  return hpdev;
--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1911205

This reverts commit ef098f8f66e5831bdd642d7156399863120eed25.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 drivers/pci/controller/pci-hyperv.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 77dcb196fa84..95c04b0ffeb1 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -1978,17 +1978,6 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus,
  get_pcichild(hpdev);
  spin_lock_irqsave(&hbus->device_list_lock, flags);
 
- /*
- * When a device is being added to the bus, we set the PCI domain
- * number to be the device serial number, which is non-zero and
- * unique on the same VM.  The serial numbers start with 1, and
- * increase by 1 for each device.  So device names including this
- * can have shorter names than based on the bus instance UUID.
- * Only the first device serial number is used for domain, so the
- * domain number will not change after the first device is added.
- */
- if (list_empty(&hbus->children))
- hbus->sysdata.domain = desc->ser;
  list_add_tail(&hpdev->list_entry, &hbus->children);
  spin_unlock_irqrestore(&hbus->device_list_lock, flags);
  return hpdev;
--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1911205

As bug description. Tested by Microsoft.

---
Marcelo Henrique Cerri (2):
  Revert "UBUNTU: SAUCE: pci-hyperv: Use only 16 bit integer for PCI
    domain"
  Revert "Revert "PCI: hv: Make sure the bus domain is really unique""

 drivers/pci/controller/pci-hyperv.c | 13 -------------
 1 file changed, 13 deletions(-)

--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1911205

This reverts commit bead01e2f4746061492fb8e823855c7175327301.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 drivers/pci/controller/pci-hyperv.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 09dc3e67f188..77dcb196fa84 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -1986,11 +1986,9 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus,
  * can have shorter names than based on the bus instance UUID.
  * Only the first device serial number is used for domain, so the
  * domain number will not change after the first device is added.
- * The lower 16 bits of the serial number is used, otherwise some
- * drivers may not be able to handle it.
  */
  if (list_empty(&hbus->children))
- hbus->sysdata.domain = desc->ser & 0xFFFF;
+ hbus->sysdata.domain = desc->ser;
  list_add_tail(&hpdev->list_entry, &hbus->children);
  spin_unlock_irqrestore(&hbus->device_list_lock, flags);
  return hpdev;
--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Marcelo Henrique Cerri]

BugLink: https://bugs.launchpad.net/bugs/1911205

This reverts commit ef098f8f66e5831bdd642d7156399863120eed25.

Signed-off-by: Marcelo Henrique Cerri <[hidden email]>
---
 drivers/pci/controller/pci-hyperv.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
index 77dcb196fa84..95c04b0ffeb1 100644
--- a/drivers/pci/controller/pci-hyperv.c
+++ b/drivers/pci/controller/pci-hyperv.c
@@ -1978,17 +1978,6 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus,
  get_pcichild(hpdev);
  spin_lock_irqsave(&hbus->device_list_lock, flags);
 
- /*
- * When a device is being added to the bus, we set the PCI domain
- * number to be the device serial number, which is non-zero and
- * unique on the same VM.  The serial numbers start with 1, and
- * increase by 1 for each device.  So device names including this
- * can have shorter names than based on the bus instance UUID.
- * Only the first device serial number is used for domain, so the
- * domain number will not change after the first device is added.
- */
- if (list_empty(&hbus->children))
- hbus->sysdata.domain = desc->ser;
  list_add_tail(&hpdev->list_entry, &hbus->children);
  spin_unlock_irqrestore(&hbus->device_list_lock, flags);
  return hpdev;
--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[William Breathitt Gray]

On Tue, Jan 12, 2021 at 12:10:22PM -0300, Marcelo Henrique Cerri wrote:

> BugLink: https://bugs.launchpad.net/bugs/1911205
>
> As bug description. Tested by Microsoft.
>
> ---
> Marcelo Henrique Cerri (2):
>   Revert "UBUNTU: SAUCE: pci-hyperv: Use only 16 bit integer for PCI
>     domain"
>   Revert "Revert "PCI: hv: Make sure the bus domain is really unique""
>
>  drivers/pci/controller/pci-hyperv.c | 13 -------------
>  1 file changed, 13 deletions(-)
>
> --
> 2.25.1
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Acked-by: William Breathitt Gray <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Stefan Bader-2]

On 12.01.21 16:10, Marcelo Henrique Cerri wrote:

> BugLink: https://bugs.launchpad.net/bugs/1911205
>
> As bug description. Tested by Microsoft.
>
> ---
> Marcelo Henrique Cerri (2):
>   Revert "UBUNTU: SAUCE: pci-hyperv: Use only 16 bit integer for PCI
>     domain"
>   Revert "Revert "PCI: hv: Make sure the bus domain is really unique""
>
>  drivers/pci/controller/pci-hyperv.c | 13 -------------
>  1 file changed, 13 deletions(-)
>

Acked-by: Stefan Bader <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Kelsey Skunberg]

Applied to {F/G}-azure/master-next. thank you!

-Kelsey

On 2021-01-12 12:10:22 , Marcelo Henrique Cerri wrote:

> BugLink: https://bugs.launchpad.net/bugs/1911205
>
> As bug description. Tested by Microsoft.
>
> ---
> Marcelo Henrique Cerri (2):
>   Revert "UBUNTU: SAUCE: pci-hyperv: Use only 16 bit integer for PCI
>     domain"
>   Revert "Revert "PCI: hv: Make sure the bus domain is really unique""
>
>  drivers/pci/controller/pci-hyperv.c | 13 -------------
>  1 file changed, 13 deletions(-)
>
> --
> 2.25.1
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team