2014-01-03 00:21:36

by David Miller

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

From: Jeff Kirsher <[email protected]>
Date: Sat, 28 Dec 2013 04:36:13 -0800

> Add missing PCI bus link speed 8.0 GT/s and bus link widths of
> x1, x2, x4 and x8.
>
> CC: <[email protected]>
> Signed-off-by: Jeff Kirsher <[email protected]>

Can a PCI person please ACK this? This is a prerequisite for some
networking driver changes Jeff would like to push to me.

Thanks.

> ---
> include/uapi/linux/pci_regs.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
> index 4a98e85..c870c2a 100644
> --- a/include/uapi/linux/pci_regs.h
> +++ b/include/uapi/linux/pci_regs.h
> @@ -489,7 +489,12 @@
> #define PCI_EXP_LNKSTA_CLS 0x000f /* Current Link Speed */
> #define PCI_EXP_LNKSTA_CLS_2_5GB 0x0001 /* Current Link Speed 2.5GT/s */
> #define PCI_EXP_LNKSTA_CLS_5_0GB 0x0002 /* Current Link Speed 5.0GT/s */
> +#define PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */
> #define PCI_EXP_LNKSTA_NLW 0x03f0 /* Negotiated Link Width */
> +#define PCI_EXP_LNKSTA_NLW_X1 0x0010 /* Current Link Width x1 */
> +#define PCI_EXP_LNKSTA_NLW_X2 0x0020 /* Current Link Width x2 */
> +#define PCI_EXP_LNKSTA_NLW_X4 0x0040 /* Current Link Width x4 */
> +#define PCI_EXP_LNKSTA_NLW_X8 0x0080 /* Current Link Width x8 */
> #define PCI_EXP_LNKSTA_NLW_SHIFT 4 /* start of NLW mask in link status */
> #define PCI_EXP_LNKSTA_LT 0x0800 /* Link Training */
> #define PCI_EXP_LNKSTA_SLC 0x1000 /* Slot Clock Configuration */
> --
> 1.8.3.1
>


2014-01-03 21:53:13

by Jesse Brandeburg

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

+linux-pci

<and see note below>

On Thu, Jan 2, 2014 at 4:21 PM, David Miller <[email protected]> wrote:
> From: Jeff Kirsher <[email protected]>
> Date: Sat, 28 Dec 2013 04:36:13 -0800
>
>> Add missing PCI bus link speed 8.0 GT/s and bus link widths of
>> x1, x2, x4 and x8.
>>
>> CC: <[email protected]>
>> Signed-off-by: Jeff Kirsher <[email protected]>
>
> Can a PCI person please ACK this? This is a prerequisite for some
> networking driver changes Jeff would like to push to me.
>
> Thanks.
>
>> ---
>> include/uapi/linux/pci_regs.h | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
>> index 4a98e85..c870c2a 100644
>> --- a/include/uapi/linux/pci_regs.h
>> +++ b/include/uapi/linux/pci_regs.h
>> @@ -489,7 +489,12 @@
>> #define PCI_EXP_LNKSTA_CLS 0x000f /* Current Link Speed */
>> #define PCI_EXP_LNKSTA_CLS_2_5GB 0x0001 /* Current Link Speed 2.5GT/s */
>> #define PCI_EXP_LNKSTA_CLS_5_0GB 0x0002 /* Current Link Speed 5.0GT/s */
>> +#define PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */
>> #define PCI_EXP_LNKSTA_NLW 0x03f0 /* Negotiated Link Width */
>> +#define PCI_EXP_LNKSTA_NLW_X1 0x0010 /* Current Link Width x1 */
>> +#define PCI_EXP_LNKSTA_NLW_X2 0x0020 /* Current Link Width x2 */
>> +#define PCI_EXP_LNKSTA_NLW_X4 0x0040 /* Current Link Width x4 */
>> +#define PCI_EXP_LNKSTA_NLW_X8 0x0080 /* Current Link Width x8 */
>> #define PCI_EXP_LNKSTA_NLW_SHIFT 4 /* start of NLW mask in link status */
>> #define PCI_EXP_LNKSTA_LT 0x0800 /* Link Training */
>> #define PCI_EXP_LNKSTA_SLC 0x1000 /* Slot Clock Configuration */

also note that these defines from this patch are already partially
defined in drivers/pci/probe.c but likely need to move into a header
file and be consolidated throughout the kernel. That said I don't see
any issue with adding these as a separate set of defines in
uapi/linux/pci_regs.h

2014-01-03 22:16:21

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

On Fri, Jan 3, 2014 at 2:53 PM, Jesse Brandeburg
<[email protected]> wrote:
> +linux-pci

Thanks, Jesse.

> <and see note below>
>
> On Thu, Jan 2, 2014 at 4:21 PM, David Miller <[email protected]> wrote:
>> From: Jeff Kirsher <[email protected]>
>> Date: Sat, 28 Dec 2013 04:36:13 -0800
>>
>>> Add missing PCI bus link speed 8.0 GT/s and bus link widths of
>>> x1, x2, x4 and x8.
>>>
>>> CC: <[email protected]>
>>> Signed-off-by: Jeff Kirsher <[email protected]>
>>
>> Can a PCI person please ACK this? This is a prerequisite for some
>> networking driver changes Jeff would like to push to me.

The additions look correct to me, and I don't object to them per se, so:

Acked-by: Bjorn Helgaas <[email protected]>

However, I do raise my eyebrows a bit at drivers that poke around in
the PCIe capability. I would prefer to have PCI core interfaces that
handle that instead. But I haven't seen Jeff's changes yet.

>>> ---
>>> include/uapi/linux/pci_regs.h | 5 +++++
>>> 1 file changed, 5 insertions(+)
>>>
>>> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
>>> index 4a98e85..c870c2a 100644
>>> --- a/include/uapi/linux/pci_regs.h
>>> +++ b/include/uapi/linux/pci_regs.h
>>> @@ -489,7 +489,12 @@
>>> #define PCI_EXP_LNKSTA_CLS 0x000f /* Current Link Speed */
>>> #define PCI_EXP_LNKSTA_CLS_2_5GB 0x0001 /* Current Link Speed 2.5GT/s */
>>> #define PCI_EXP_LNKSTA_CLS_5_0GB 0x0002 /* Current Link Speed 5.0GT/s */
>>> +#define PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */
>>> #define PCI_EXP_LNKSTA_NLW 0x03f0 /* Negotiated Link Width */
>>> +#define PCI_EXP_LNKSTA_NLW_X1 0x0010 /* Current Link Width x1 */
>>> +#define PCI_EXP_LNKSTA_NLW_X2 0x0020 /* Current Link Width x2 */
>>> +#define PCI_EXP_LNKSTA_NLW_X4 0x0040 /* Current Link Width x4 */
>>> +#define PCI_EXP_LNKSTA_NLW_X8 0x0080 /* Current Link Width x8 */
>>> #define PCI_EXP_LNKSTA_NLW_SHIFT 4 /* start of NLW mask in link status */
>>> #define PCI_EXP_LNKSTA_LT 0x0800 /* Link Training */
>>> #define PCI_EXP_LNKSTA_SLC 0x1000 /* Slot Clock Configuration */
>
> also note that these defines from this patch are already partially
> defined in drivers/pci/probe.c but likely need to move into a header
> file and be consolidated throughout the kernel. That said I don't see
> any issue with adding these as a separate set of defines in
> uapi/linux/pci_regs.h
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2014-01-03 23:56:36

by David Miller

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

From: Bjorn Helgaas <[email protected]>
Date: Fri, 3 Jan 2014 15:15:57 -0700

> However, I do raise my eyebrows a bit at drivers that poke around in
> the PCIe capability. I would prefer to have PCI core interfaces that
> handle that instead. But I haven't seen Jeff's changes yet.

The changes just read the link status to interpret the speed at which
the PCI-E link is running at.

2014-01-04 00:01:07

by Bjorn Helgaas

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

On Fri, Jan 3, 2014 at 4:56 PM, David Miller <[email protected]> wrote:
> From: Bjorn Helgaas <[email protected]>
> Date: Fri, 3 Jan 2014 15:15:57 -0700
>
>> However, I do raise my eyebrows a bit at drivers that poke around in
>> the PCIe capability. I would prefer to have PCI core interfaces that
>> handle that instead. But I haven't seen Jeff's changes yet.
>
> The changes just read the link status to interpret the speed at which
> the PCI-E link is running at.

Several drivers want to do that. It'd be nice if somebody abstracted
that out somehow. Jacob added pcie_get_minimum_link() which is
similar. But maybe Jeff needs something more in this case.

In any case, it's not a blocker for this patch.

Bjorn

2014-01-04 00:30:13

by David Miller

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

From: Bjorn Helgaas <[email protected]>
Date: Fri, 3 Jan 2014 17:00:42 -0700

> On Fri, Jan 3, 2014 at 4:56 PM, David Miller <[email protected]> wrote:
>> From: Bjorn Helgaas <[email protected]>
>> Date: Fri, 3 Jan 2014 15:15:57 -0700
>>
>>> However, I do raise my eyebrows a bit at drivers that poke around in
>>> the PCIe capability. I would prefer to have PCI core interfaces that
>>> handle that instead. But I haven't seen Jeff's changes yet.
>>
>> The changes just read the link status to interpret the speed at which
>> the PCI-E link is running at.
>
> Several drivers want to do that. It'd be nice if somebody abstracted
> that out somehow. Jacob added pcie_get_minimum_link() which is
> similar. But maybe Jeff needs something more in this case.
>
> In any case, it's not a blocker for this patch.

Ok.

Jeff, please merge this via the Intel submission process and don't forget
to add Bjorn's ACK.

Thanks.

2014-01-04 01:27:51

by Jeff Kirsher

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

On Fri, 2014-01-03 at 19:30 -0500, David Miller wrote:
> From: Bjorn Helgaas <[email protected]>
> Date: Fri, 3 Jan 2014 17:00:42 -0700
>
> > On Fri, Jan 3, 2014 at 4:56 PM, David Miller <[email protected]> wrote:
> >> From: Bjorn Helgaas <[email protected]>
> >> Date: Fri, 3 Jan 2014 15:15:57 -0700
> >>
> >>> However, I do raise my eyebrows a bit at drivers that poke around in
> >>> the PCIe capability. I would prefer to have PCI core interfaces that
> >>> handle that instead. But I haven't seen Jeff's changes yet.
> >>
> >> The changes just read the link status to interpret the speed at which
> >> the PCI-E link is running at.
> >
> > Several drivers want to do that. It'd be nice if somebody abstracted
> > that out somehow. Jacob added pcie_get_minimum_link() which is
> > similar. But maybe Jeff needs something more in this case.
> >
> > In any case, it's not a blocker for this patch.
>
> Ok.
>
> Jeff, please merge this via the Intel submission process and don't forget
> to add Bjorn's ACK.
>
> Thanks.

Ok, will do. What do you want to do with the current series of patches
(mainly the ixgbe LER patches) on my tree? I know that there is a
thread going on between Joe Perches and Mark, but it sounded like Mark
is working on a follow-on patch to address Joe's concerns.

Guess I want to know if I leave my tree alone for you to pull or toss
the current pull request series and get the i40e series applied.

Cheers,
Jeff


Attachments:
signature.asc (819.00 B)
This is a digitally signed message part

2014-01-04 01:48:31

by David Miller

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

From: Jeff Kirsher <[email protected]>
Date: Fri, 03 Jan 2014 17:27:39 -0800

> What do you want to do with the current series of patches
> (mainly the ixgbe LER patches) on my tree? I know that there is a
> thread going on between Joe Perches and Mark, but it sounded like Mark
> is working on a follow-on patch to address Joe's concerns.

I want the LER config option removed.

2014-01-04 01:51:33

by Jeff Kirsher

[permalink] [raw]
Subject: Re: [net-next] pci_regs.h: Add PCI bus link speed and width defines

On Fri, 2014-01-03 at 20:48 -0500, David Miller wrote:
> From: Jeff Kirsher <[email protected]>
> Date: Fri, 03 Jan 2014 17:27:39 -0800
>
> > What do you want to do with the current series of patches
> > (mainly the ixgbe LER patches) on my tree? I know that there is a
> > thread going on between Joe Perches and Mark, but it sounded like Mark
> > is working on a follow-on patch to address Joe's concerns.
>
> I want the LER config option removed.

Ok.


Attachments:
signature.asc (819.00 B)
This is a digitally signed message part