| Message ID | 20221107112700.773-1-slark_xiao@163.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v3] bus: mhi: host: pci_generic: Add definition for some VIDs | expand |
Hi Mani, Any update about this patch? At 2022-11-07 19:27:00, "Slark Xiao" <slark_xiao@163.com> wrote: >To make code neat and for convenience purpose, add definition for some >VIDs. Adding it locally until these VIDs are used in multiple places. > >Signed-off-by: Slark Xiao <slark_xiao@163.com> >--- >v3: Update description >v2: Update description and fix format issue >--- > drivers/bus/mhi/host/pci_generic.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > >diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c >index c4259cb2d289..3a789bb2f631 100644 >--- a/drivers/bus/mhi/host/pci_generic.c >+++ b/drivers/bus/mhi/host/pci_generic.c >@@ -24,6 +24,10 @@ > > #define HEALTH_CHECK_PERIOD (HZ * 2) > >+/* PCI VID definitions */ >+#define PCI_VENDOR_ID_THALES 0x1269 >+#define PCI_VENDOR_ID_QUECTEL 0x1eac >+ > /** > * struct mhi_pci_dev_info - MHI PCI device specific information > * @config: MHI controller configuration >@@ -557,11 +561,11 @@ static const struct pci_device_id mhi_pci_id_table[] = { > .driver_data = (kernel_ulong_t) &mhi_telit_fn990_info }, > { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308), > .driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info }, >- { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */ >+ { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1001), /* EM120R-GL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, >- { PCI_DEVICE(0x1eac, 0x1002), /* EM160R-GL (sdx24) */ >+ { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, >- { PCI_DEVICE(0x1eac, 0x2001), /* EM120R-GL for FCCL (sdx24) */ >+ { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x2001), /* EM120R-GL for FCCL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, > /* T99W175 (sdx55), Both for eSIM and Non-eSIM */ > { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab), >@@ -585,16 +589,16 @@ static const struct pci_device_id mhi_pci_id_table[] = { > { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9), > .driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info }, > /* MV31-W (Cinterion) */ >- { PCI_DEVICE(0x1269, 0x00b3), >+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b3), > .driver_data = (kernel_ulong_t) &mhi_mv31_info }, > /* MV31-W (Cinterion), based on new baseline */ >- { PCI_DEVICE(0x1269, 0x00b4), >+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b4), > .driver_data = (kernel_ulong_t) &mhi_mv31_info }, > /* MV32-WA (Cinterion) */ >- { PCI_DEVICE(0x1269, 0x00ba), >+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00ba), > .driver_data = (kernel_ulong_t) &mhi_mv32_info }, > /* MV32-WB (Cinterion) */ >- { PCI_DEVICE(0x1269, 0x00bb), >+ { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00bb), > .driver_data = (kernel_ulong_t) &mhi_mv32_info }, > { } > }; >-- >2.17.1
On Mon, Nov 07, 2022 at 07:27:00PM +0800, Slark Xiao wrote: > To make code neat and for convenience purpose, add definition for some > VIDs. Adding it locally until these VIDs are used in multiple places. > > Signed-off-by: Slark Xiao <slark_xiao@163.com> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Thanks, Mani > --- > v3: Update description > v2: Update description and fix format issue > --- > drivers/bus/mhi/host/pci_generic.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index c4259cb2d289..3a789bb2f631 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -24,6 +24,10 @@ > > #define HEALTH_CHECK_PERIOD (HZ * 2) > > +/* PCI VID definitions */ > +#define PCI_VENDOR_ID_THALES 0x1269 > +#define PCI_VENDOR_ID_QUECTEL 0x1eac > + > /** > * struct mhi_pci_dev_info - MHI PCI device specific information > * @config: MHI controller configuration > @@ -557,11 +561,11 @@ static const struct pci_device_id mhi_pci_id_table[] = { > .driver_data = (kernel_ulong_t) &mhi_telit_fn990_info }, > { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308), > .driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info }, > - { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */ > + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1001), /* EM120R-GL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, > - { PCI_DEVICE(0x1eac, 0x1002), /* EM160R-GL (sdx24) */ > + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, > - { PCI_DEVICE(0x1eac, 0x2001), /* EM120R-GL for FCCL (sdx24) */ > + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x2001), /* EM120R-GL for FCCL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, > /* T99W175 (sdx55), Both for eSIM and Non-eSIM */ > { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab), > @@ -585,16 +589,16 @@ static const struct pci_device_id mhi_pci_id_table[] = { > { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9), > .driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info }, > /* MV31-W (Cinterion) */ > - { PCI_DEVICE(0x1269, 0x00b3), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b3), > .driver_data = (kernel_ulong_t) &mhi_mv31_info }, > /* MV31-W (Cinterion), based on new baseline */ > - { PCI_DEVICE(0x1269, 0x00b4), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b4), > .driver_data = (kernel_ulong_t) &mhi_mv31_info }, > /* MV32-WA (Cinterion) */ > - { PCI_DEVICE(0x1269, 0x00ba), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00ba), > .driver_data = (kernel_ulong_t) &mhi_mv32_info }, > /* MV32-WB (Cinterion) */ > - { PCI_DEVICE(0x1269, 0x00bb), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00bb), > .driver_data = (kernel_ulong_t) &mhi_mv32_info }, > { } > }; > -- > 2.17.1 > >
On Mon, Nov 07, 2022 at 07:27:00PM +0800, Slark Xiao wrote: > To make code neat and for convenience purpose, add definition for some > VIDs. Adding it locally until these VIDs are used in multiple places. > > Signed-off-by: Slark Xiao <slark_xiao@163.com> Applied to mhi-next! Thanks, Mani > --- > v3: Update description > v2: Update description and fix format issue > --- > drivers/bus/mhi/host/pci_generic.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index c4259cb2d289..3a789bb2f631 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -24,6 +24,10 @@ > > #define HEALTH_CHECK_PERIOD (HZ * 2) > > +/* PCI VID definitions */ > +#define PCI_VENDOR_ID_THALES 0x1269 > +#define PCI_VENDOR_ID_QUECTEL 0x1eac > + > /** > * struct mhi_pci_dev_info - MHI PCI device specific information > * @config: MHI controller configuration > @@ -557,11 +561,11 @@ static const struct pci_device_id mhi_pci_id_table[] = { > .driver_data = (kernel_ulong_t) &mhi_telit_fn990_info }, > { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308), > .driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info }, > - { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */ > + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1001), /* EM120R-GL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, > - { PCI_DEVICE(0x1eac, 0x1002), /* EM160R-GL (sdx24) */ > + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, > - { PCI_DEVICE(0x1eac, 0x2001), /* EM120R-GL for FCCL (sdx24) */ > + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x2001), /* EM120R-GL for FCCL (sdx24) */ > .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, > /* T99W175 (sdx55), Both for eSIM and Non-eSIM */ > { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab), > @@ -585,16 +589,16 @@ static const struct pci_device_id mhi_pci_id_table[] = { > { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9), > .driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info }, > /* MV31-W (Cinterion) */ > - { PCI_DEVICE(0x1269, 0x00b3), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b3), > .driver_data = (kernel_ulong_t) &mhi_mv31_info }, > /* MV31-W (Cinterion), based on new baseline */ > - { PCI_DEVICE(0x1269, 0x00b4), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b4), > .driver_data = (kernel_ulong_t) &mhi_mv31_info }, > /* MV32-WA (Cinterion) */ > - { PCI_DEVICE(0x1269, 0x00ba), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00ba), > .driver_data = (kernel_ulong_t) &mhi_mv32_info }, > /* MV32-WB (Cinterion) */ > - { PCI_DEVICE(0x1269, 0x00bb), > + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00bb), > .driver_data = (kernel_ulong_t) &mhi_mv32_info }, > { } > }; > -- > 2.17.1 > >
diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c index c4259cb2d289..3a789bb2f631 100644 --- a/drivers/bus/mhi/host/pci_generic.c +++ b/drivers/bus/mhi/host/pci_generic.c @@ -24,6 +24,10 @@ #define HEALTH_CHECK_PERIOD (HZ * 2) +/* PCI VID definitions */ +#define PCI_VENDOR_ID_THALES 0x1269 +#define PCI_VENDOR_ID_QUECTEL 0x1eac + /** * struct mhi_pci_dev_info - MHI PCI device specific information * @config: MHI controller configuration @@ -557,11 +561,11 @@ static const struct pci_device_id mhi_pci_id_table[] = { .driver_data = (kernel_ulong_t) &mhi_telit_fn990_info }, { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308), .driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info }, - { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */ + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1001), /* EM120R-GL (sdx24) */ .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, - { PCI_DEVICE(0x1eac, 0x1002), /* EM160R-GL (sdx24) */ + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */ .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, - { PCI_DEVICE(0x1eac, 0x2001), /* EM120R-GL for FCCL (sdx24) */ + { PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x2001), /* EM120R-GL for FCCL (sdx24) */ .driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info }, /* T99W175 (sdx55), Both for eSIM and Non-eSIM */ { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab), @@ -585,16 +589,16 @@ static const struct pci_device_id mhi_pci_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9), .driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info }, /* MV31-W (Cinterion) */ - { PCI_DEVICE(0x1269, 0x00b3), + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b3), .driver_data = (kernel_ulong_t) &mhi_mv31_info }, /* MV31-W (Cinterion), based on new baseline */ - { PCI_DEVICE(0x1269, 0x00b4), + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b4), .driver_data = (kernel_ulong_t) &mhi_mv31_info }, /* MV32-WA (Cinterion) */ - { PCI_DEVICE(0x1269, 0x00ba), + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00ba), .driver_data = (kernel_ulong_t) &mhi_mv32_info }, /* MV32-WB (Cinterion) */ - { PCI_DEVICE(0x1269, 0x00bb), + { PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00bb), .driver_data = (kernel_ulong_t) &mhi_mv32_info }, { } };
To make code neat and for convenience purpose, add definition for some VIDs. Adding it locally until these VIDs are used in multiple places. Signed-off-by: Slark Xiao <slark_xiao@163.com> --- v3: Update description v2: Update description and fix format issue --- drivers/bus/mhi/host/pci_generic.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)