From patchwork Wed Nov 2 02:44:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slark Xiao X-Patchwork-Id: 14001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3353398wru; Tue, 1 Nov 2022 19:47:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5AN10cu80uEh5BlDZSR9ncWuoEzG4bDCc7RLDTQFqedo2lGLhsyWSxdFcqbjefOzSx/gDW X-Received: by 2002:aa7:de0a:0:b0:462:d2a0:93a with SMTP id h10-20020aa7de0a000000b00462d2a0093amr21343727edv.275.1667357236743; Tue, 01 Nov 2022 19:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667357236; cv=none; d=google.com; s=arc-20160816; b=E5JY4OJzmIjPFDA32IJ1JZb2A9H81ODaVWffAbGzZHAZ9F6JSLuEsqEPmIIDY+Q7wR bGvht07N4RK1HehyzXGnbPDOCWY27KrGnG7wKQu7JURQD2gtqHTQiL8LmCSTKCtw7QKE 4p6eM5GcxLoUBSve+u9eIh07b4lbwd+cSSbAYuwNLwmmOODsj0SLvVOso3JsoR4xxRcs 5OmvVN7x5furYGc2wWlycfTxG8xqVgCJN8+dRah8b42OUSYwhgOmmCMQY9JiO+Gx0vQY jgMyEWYbEfxQl+lgu+5w2uQ7xHRg2Uymj81Hbqy6TtISQpZTxr9az3oX78iDFN796NkN V8Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=hKxe7n9CGxb+jXW6mTIrCP7AS5ofdViaMasdKQhrBfI=; b=WOLoDddDu2nhLrpLZQAjQ8dLQpvPN9tnBtMsJHllgnIXP+gTFBR2lOxEePlqWwVtUx RceZsb5pri36IH+vAwaJmUohvjSUb9PnQWGLkggpfNagaAzBiRdr/oLjKr91HGjS1i/c 5E3c1+eSf+MrG4tflRKNaWpkpTTfVkIzkk8UatzoOJqwcXB9svT1x/xWhbFGjXry18XD /MNIqYblaanV+zEJqpjNhitL9RABJD27YpRYOTqQR1lCG2SfRmQzhWTgjh1ycwsetiE8 gh739epJnZHBvmMklAzajvwhbUfuujHLoXozirBZiN9cerXvPb5H0UMTcdmkTwlyLdS9 v+KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=jzh9l9DP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sb4-20020a1709076d8400b007adf388f2dasi4444540ejc.497.2022.11.01.19.46.50; Tue, 01 Nov 2022 19:47:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=jzh9l9DP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230384AbiKBCqX (ORCPT + 99 others); Tue, 1 Nov 2022 22:46:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230305AbiKBCqW (ORCPT ); Tue, 1 Nov 2022 22:46:22 -0400 Received: from mail-m972.mail.163.com (mail-m972.mail.163.com [123.126.97.2]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 226B420F7B; Tue, 1 Nov 2022 19:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=hKxe7n9CGxb+jXW6mT IrCP7AS5ofdViaMasdKQhrBfI=; b=jzh9l9DPAgdUMyshApYODmpJrl+X8+FiZ6 RH3H2/vPHFgB+Y8wJ/jUJyPR3uhva/pFau3UnYvSda5fEWsGXWTpW26nUHYwYqyf HmfkuKl8tHnLw9SoasQEzYoB4TIJa5ontxr35wsAfqJWNaYiHbU5HSekjLXlBTpk Fyn54nOgU= Received: from localhost.localdomain (unknown [43.134.191.38]) by smtp2 (Coremail) with SMTP id GtxpCgC3Utag2WFjidLwqA--.28382S2; Wed, 02 Nov 2022 10:44:50 +0800 (CST) From: Slark Xiao To: mani@kernel.org, gregkh@linuxfoundation.org, loic.poulain@linaro.org Cc: dnlplm@gmail.com, yonglin.tan@outlook.com, fabio.porcedda@gmail.com, mhi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Slark Xiao Subject: [PATCH] bus: mhi: host: pci_generic: Add macro for some vids Date: Wed, 2 Nov 2022 10:44:37 +0800 Message-Id: <20221102024437.15248-1-slark_xiao@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: GtxpCgC3Utag2WFjidLwqA--.28382S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxur1kGry8Zw1DWr17Xr1kKrg_yoW5XFyfpF 4Y9rWvvF4Dtr4UKw1vyayDZF95Aa17Cry3K3Wxtw4F9F4qkF4Fgr92vrySyFyaqa4kXrWa qF1DZFWUKa1qyr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziWrW7UUUUU= X-Originating-IP: [43.134.191.38] X-CM-SenderInfo: xvod2y5b0lt0i6rwjhhfrp/xtbBDQKtZFaELmhrRwAAs+ X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748350781788918971?= X-GMAIL-MSGID: =?utf-8?q?1748350781788918971?= To make code neat and for convenience purpose, using macro for some vids. Refer to previous patch in pci_ids.h side, they are not allowed to add new entries of single driver needed. So we add it in our local file. Signed-off-by: Slark Xiao --- 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..5abc778a5290 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) +#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 }, { } };