From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEA20C433ED for ; Thu, 8 Apr 2021 09:22:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C164D61157 for ; Thu, 8 Apr 2021 09:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229603AbhDHJWS (ORCPT ); Thu, 8 Apr 2021 05:22:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:38344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbhDHJWR (ORCPT ); Thu, 8 Apr 2021 05:22:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AACB361166; Thu, 8 Apr 2021 09:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617873726; bh=Ldyy5p8qNIJW45yhEXFnxF+Ibo1nV8mgcf3vOVeJ8Io=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UZ+wDG5V1dUmoTX/eISyd+EqMNqmrYpq+lxlFTWpFMZYS6s1Zds0c8Oj81iIqC7ML cjF+Ya2xo6Pd0/74cXzJZRgosuB5ToTtGerN9Ik1tvXeH7VFBnYV8OHnnm/cnvCqMJ AzKjVAR8wqd1urDCnR1BB4x+62iIDE84bBVU1tbI= Date: Thu, 8 Apr 2021 11:22:03 +0200 From: Greg KH To: Longfang Liu Cc: mathias.nyman@intel.com, stern@rowland.harvard.edu, liudongdong3@huawei.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kong.kongxinwei@hisilicon.com, yisen.zhuang@huawei.com Subject: Re: [PATCH 1/2] USB:ehci:Add a whitelist for EHCI controllers Message-ID: References: <1617873073-37371-1-git-send-email-liulongfang@huawei.com> <1617873073-37371-2-git-send-email-liulongfang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1617873073-37371-2-git-send-email-liulongfang@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 08, 2021 at 05:11:12PM +0800, Longfang Liu wrote: > Some types of EHCI controllers do not have SBRN registers. > By comparing the white list, the operation of reading the SBRN > registers is skipped. > > Subsequent EHCI controller types without SBRN registers can be > directly added to the white list. > > The current patch does not affect the drive function. > > Signed-off-by: Longfang Liu > --- > drivers/usb/host/ehci-pci.c | 27 +++++++++++++++++++++++---- > 1 file changed, 23 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c > index 3c3820a..6a30afa 100644 > --- a/drivers/usb/host/ehci-pci.c > +++ b/drivers/usb/host/ehci-pci.c > @@ -47,6 +47,28 @@ static inline bool is_bypassed_id(struct pci_dev *pdev) > return !!pci_match_id(bypass_pci_id_table, pdev); > } > > +static const struct usb_nosbrn_whitelist_entry { > + unsigned short vendor; > + unsigned short device; u16 here please. > +} usb_nosbrn_whitelist[] = { > + /* STMICRO ConneXT has no sbrn register */ > + {PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST}, > + {} trailing , please. > +}; > + > +static bool usb_nosbrn_whitelist_check(struct pci_dev *pdev) > +{ > + const struct usb_nosbrn_whitelist_entry *entry; > + > + for (entry = usb_nosbrn_whitelist; entry->vendor; entry++) { > + if (pdev->vendor == entry->vendor && > + pdev->device == entry->device) > + return true; > + } > + > + return false; > +} > + > /* > * 0x84 is the offset of in/out threshold register, > * and it is the same offset as the register of 'hostpc'. > @@ -288,10 +310,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) > } > > /* Serial Bus Release Number is at PCI 0x60 offset */ > - if (pdev->vendor == PCI_VENDOR_ID_STMICRO > - && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST) > - ; /* ConneXT has no sbrn register */ > - else > + if (!usb_nosbrn_whitelist_check(pdev)) Doing this as a "negative" is hard to understand. Should this just be: forbid_sbrn_read() or something like that? The term "whitelist" is not a good thing to use as it does not really explain anything here. thanks, greg k-h