Patchwork drm/pci: use PCI_EXP_LNKCAP_SLS_2_5GB/5_0GB instead of hardcoded values

login
register
mail settings
Submitter Jingoo Han
Date Feb. 6, 2013, 5:18 a.m.
Message ID <002b01ce0429$59d7acc0$0d870640$%han@samsung.com>
Download mbox | patch
Permalink /patch/218487/
State Not Applicable
Headers show

Comments

Jingoo Han - Feb. 6, 2013, 5:18 a.m.
Use PCI_EXP_LNKCAP_SLS_2_5GB and PCI_EXP_LNKCAP_SLS_5_0GB instead
of hardcoded values for readability. These bit definitions were
added by commit 130f1b8 ("PCI: Add PCIe Link Capability link speed
and width names")

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/gpu/drm/drm_pci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Alex Deucher - Feb. 6, 2013, 2:27 p.m.
On Wed, Feb 6, 2013 at 12:18 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> Use PCI_EXP_LNKCAP_SLS_2_5GB and PCI_EXP_LNKCAP_SLS_5_0GB instead
> of hardcoded values for readability. These bit definitions were
> added by commit 130f1b8 ("PCI: Add PCIe Link Capability link speed
> and width names")
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/drm_pci.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 754bc96..11c8add 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -504,9 +504,9 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
>                 if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
>                         *mask |= DRM_PCIE_SPEED_80;
>         } else {
> -               if (lnkcap & 1)
> +               if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB)
>                         *mask |= DRM_PCIE_SPEED_25;
> -               if (lnkcap & 2)
> +               if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB)
>                         *mask |= DRM_PCIE_SPEED_50;
>         }
>
> --
> 1.7.2.5
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
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
Bjorn Helgaas - Feb. 6, 2013, 5:08 p.m.
On Wed, Feb 6, 2013 at 7:27 AM, Alex Deucher <alexdeucher@gmail.com> wrote:
> On Wed, Feb 6, 2013 at 12:18 AM, Jingoo Han <jg1.han@samsung.com> wrote:
>> Use PCI_EXP_LNKCAP_SLS_2_5GB and PCI_EXP_LNKCAP_SLS_5_0GB instead
>> of hardcoded values for readability. These bit definitions were
>> added by commit 130f1b8 ("PCI: Add PCIe Link Capability link speed
>> and width names")
>>
>> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>

I posted the same patch last month, along with two other patches that
fix the reporting for pre-r3.0 devices and simplify the code a bit:

    http://marc.info/?l=linux-pci&m=135732663513525&w=2
    http://marc.info/?l=linux-pci&m=135732713413779&w=2
    http://marc.info/?l=linux-pci&m=135732666213542&w=2

I don't know the status of any of these; I'm expecting Dave to do
whatever he thinks is best.

>
>> ---
>>  drivers/gpu/drm/drm_pci.c |    4 ++--
>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
>> index 754bc96..11c8add 100644
>> --- a/drivers/gpu/drm/drm_pci.c
>> +++ b/drivers/gpu/drm/drm_pci.c
>> @@ -504,9 +504,9 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
>>                 if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
>>                         *mask |= DRM_PCIE_SPEED_80;
>>         } else {
>> -               if (lnkcap & 1)
>> +               if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB)
>>                         *mask |= DRM_PCIE_SPEED_25;
>> -               if (lnkcap & 2)
>> +               if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB)
>>                         *mask |= DRM_PCIE_SPEED_50;
>>         }
>>
>> --
>> 1.7.2.5
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
> --
> 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
Jingoo Han - Feb. 6, 2013, 11:59 p.m.
On Thursday, February 07, 2013 2:08 AM, Bjorn Helgaas wrote
> 
> On Wed, Feb 6, 2013 at 7:27 AM, Alex Deucher <alexdeucher@gmail.com> wrote:
> > On Wed, Feb 6, 2013 at 12:18 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> >> Use PCI_EXP_LNKCAP_SLS_2_5GB and PCI_EXP_LNKCAP_SLS_5_0GB instead
> >> of hardcoded values for readability. These bit definitions were
> >> added by commit 130f1b8 ("PCI: Add PCIe Link Capability link speed
> >> and width names")
> >>
> >> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> >
> > Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> 
> Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
> 
> I posted the same patch last month, along with two other patches that
> fix the reporting for pre-r3.0 devices and simplify the code a bit:
> 
>     http://marc.info/?l=linux-pci&m=135732663513525&w=2
>     http://marc.info/?l=linux-pci&m=135732713413779&w=2
>     http://marc.info/?l=linux-pci&m=135732666213542&w=2

Oh, I missed your patch.
I think that my patch will be abandoned.

Best regards,
Jingoo Han

> 
> I don't know the status of any of these; I'm expecting Dave to do
> whatever he thinks is best.
> 
> >
> >> ---
> >>  drivers/gpu/drm/drm_pci.c |    4 ++--
> >>  1 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> >> index 754bc96..11c8add 100644
> >> --- a/drivers/gpu/drm/drm_pci.c
> >> +++ b/drivers/gpu/drm/drm_pci.c
> >> @@ -504,9 +504,9 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
> >>                 if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
> >>                         *mask |= DRM_PCIE_SPEED_80;
> >>         } else {
> >> -               if (lnkcap & 1)
> >> +               if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB)
> >>                         *mask |= DRM_PCIE_SPEED_25;
> >> -               if (lnkcap & 2)
> >> +               if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB)
> >>                         *mask |= DRM_PCIE_SPEED_50;
> >>         }
> >>
> >> --
> >> 1.7.2.5


--
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

Patch

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 754bc96..11c8add 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -504,9 +504,9 @@  int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
 		if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
 			*mask |= DRM_PCIE_SPEED_80;
 	} else {
-		if (lnkcap & 1)
+		if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB)
 			*mask |= DRM_PCIE_SPEED_25;
-		if (lnkcap & 2)
+		if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB)
 			*mask |= DRM_PCIE_SPEED_50;
 	}