2020-08-18 09:36:12

by Zhiqiang Hou

Subject: [PATCHv2] PCI: designware-ep: Fix the Header Type check

From: Hou Zhiqiang <[email protected]>

The current check will result in the multiple function device
fails to initialize. So fix the check by masking out the
multiple function bit.

Fixes: 0b24134f7888 ("PCI: dwc: Add validation that PCIe core is set to correct mode")
Signed-off-by: Hou Zhiqiang <[email protected]>
---
V2:
- Add marco PCI_HEADER_TYPE_MASK and print the masked value.

drivers/pci/controller/dwc/pcie-designware-ep.c | 3 ++-
include/uapi/linux/pci_regs.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 4680a51c49c0..0634bd3a0b96 100644
--- a/drivers/pci/controller/dwc/pcie-designware-ep.c
+++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
@@ -653,7 +653,8 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
u32 reg;
int i;

- hdr_type = dw_pcie_readb_dbi(pci, PCI_HEADER_TYPE);
+ hdr_type = dw_pcie_readb_dbi(pci, PCI_HEADER_TYPE) &
+ PCI_HEADER_TYPE_MASK;
if (hdr_type != PCI_HEADER_TYPE_NORMAL) {
dev_err(pci->dev,
"PCIe controller is not set to EP mode (hdr_type:0x%x)!\n",
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index f9701410d3b5..57a222014cd2 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -76,6 +76,7 @@
#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
#define PCI_LATENCY_TIMER 0x0d /* 8 bits */
#define PCI_HEADER_TYPE 0x0e /* 8 bits */
+#define PCI_HEADER_TYPE_MASK 0x7f
#define PCI_HEADER_TYPE_NORMAL 0
#define PCI_HEADER_TYPE_BRIDGE 1
#define PCI_HEADER_TYPE_CARDBUS 2
--
2.17.1

2020-08-18 13:53:46

by Rob Herring (Arm)

Subject: Re: [PATCHv2] PCI: designware-ep: Fix the Header Type check

On Tue, Aug 18, 2020 at 3:35 AM Zhiqiang Hou <[email protected]> wrote:
>
> From: Hou Zhiqiang <[email protected]>
>
> The current check will result in the multiple function device
> fails to initialize. So fix the check by masking out the
> multiple function bit.
>
> Fixes: 0b24134f7888 ("PCI: dwc: Add validation that PCIe core is set to correct mode")
> Signed-off-by: Hou Zhiqiang <[email protected]>
> ---
> V2:
> - Add marco PCI_HEADER_TYPE_MASK and print the masked value.
>
> drivers/pci/controller/dwc/pcie-designware-ep.c | 3 ++-
> include/uapi/linux/pci_regs.h | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Rob Herring <[email protected]>

2020-08-19 04:59:21

by Zhiqiang Hou

Subject: RE: [PATCHv2] PCI: designware-ep: Fix the Header Type check

Hi Rob,

Thanks a lot for your review!

Regards,
Zhiqiang

> -----Original Message-----
> From: Rob Herring <[email protected]>
> Sent: 2020年8月18日 21:52
> To: Z.q. Hou <[email protected]>
> Cc: [email protected]; PCI <[email protected]>; Lorenzo
> Pieralisi <[email protected]>; Bjorn Helgaas
> <[email protected]>; Andrew Murray
> <[email protected]>; Jingoo Han <[email protected]>;
> Gustavo Pimentel <[email protected]>
> Subject: Re: [PATCHv2] PCI: designware-ep: Fix the Header Type check
>
> On Tue, Aug 18, 2020 at 3:35 AM Zhiqiang Hou <[email protected]>
> wrote:
> >
> > From: Hou Zhiqiang <[email protected]>
> >
> > The current check will result in the multiple function device fails to
> > initialize. So fix the check by masking out the multiple function bit.
> >
> > Fixes: 0b24134f7888 ("PCI: dwc: Add validation that PCIe core is set
> > to correct mode")
> > Signed-off-by: Hou Zhiqiang <[email protected]>
> > ---
> > V2:
> > - Add marco PCI_HEADER_TYPE_MASK and print the masked value.
> >
> > drivers/pci/controller/dwc/pcie-designware-ep.c | 3 ++-
> > include/uapi/linux/pci_regs.h | 1 +
> > 2 files changed, 3 insertions(+), 1 deletion(-)
>
> Reviewed-by: Rob Herring <[email protected]>

2020-09-07 09:31:01

by Lorenzo Pieralisi

Subject: Re: [PATCHv2] PCI: designware-ep: Fix the Header Type check

On Tue, Aug 18, 2020 at 05:27:46PM +0800, Zhiqiang Hou wrote:
> From: Hou Zhiqiang <[email protected]>
>
> The current check will result in the multiple function device
> fails to initialize. So fix the check by masking out the
> multiple function bit.
>
> Fixes: 0b24134f7888 ("PCI: dwc: Add validation that PCIe core is set to correct mode")
> Signed-off-by: Hou Zhiqiang <[email protected]>
> ---
> V2:
> - Add marco PCI_HEADER_TYPE_MASK and print the masked value.
>
> drivers/pci/controller/dwc/pcie-designware-ep.c | 3 ++-
> include/uapi/linux/pci_regs.h | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)

Applied to pci/dwc, thanks.

Lorenzo

> diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
> index 4680a51c49c0..0634bd3a0b96 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-ep.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
> @@ -653,7 +653,8 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
> u32 reg;
> int i;
>
> - hdr_type = dw_pcie_readb_dbi(pci, PCI_HEADER_TYPE);
> + hdr_type = dw_pcie_readb_dbi(pci, PCI_HEADER_TYPE) &
> + PCI_HEADER_TYPE_MASK;
> if (hdr_type != PCI_HEADER_TYPE_NORMAL) {
> dev_err(pci->dev,
> "PCIe controller is not set to EP mode (hdr_type:0x%x)!\n",
> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
> index f9701410d3b5..57a222014cd2 100644
> --- a/include/uapi/linux/pci_regs.h
> +++ b/include/uapi/linux/pci_regs.h
> @@ -76,6 +76,7 @@
> #define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */
> #define PCI_LATENCY_TIMER 0x0d /* 8 bits */
> #define PCI_HEADER_TYPE 0x0e /* 8 bits */
> +#define PCI_HEADER_TYPE_MASK 0x7f
> #define PCI_HEADER_TYPE_NORMAL 0
> #define PCI_HEADER_TYPE_BRIDGE 1
> #define PCI_HEADER_TYPE_CARDBUS 2
> --
> 2.17.1
>