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=-17.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 32475C4338F for ; Wed, 18 Aug 2021 13:57:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E553160238 for ; Wed, 18 Aug 2021 13:57:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E553160238 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=ti.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:CC:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=eX9z01QuPF1ZOVJX9lZRZ16fTDNp6OavCer5GaZnXBI=; b=r8UHlSAcZUjogfF6vEG59YQFhv aCEQTxZwBPFGr8oP7TvUlu8IlXcp2ihXPHvFXAT6M7nhWHGVM9Pici59P35R4+YowtzcyPUY/OcXU k3b+oWXHqFblH/NDS5yC7HHWD5lmMfX3DbmBehaRzsrhAZG14l0iIVik268Z1ts6erE9PVwsrKjHu WKk5k4GNdFEyH3afeCsahnsni/rxa/JaimLEjFmS5GDvJRf4cRLV+2bktYC5R8mean7N+ZtXAjo7L 2dESD63pokI0BqIjBNT4b4TMwTpENal5J6O2hndjZiGaYZ9RtJ2HVxm+DOesWT451SnSuxFWnT9tH WhFjRTRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGM2p-005mO5-U9; Wed, 18 Aug 2021 13:55:52 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGM2i-005mLv-CV; Wed, 18 Aug 2021 13:55:48 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 17IDtUbX104904; Wed, 18 Aug 2021 08:55:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1629294930; bh=/SM7hS5s/+pWFzi30GOYLIjoFM9YcVwy3bRzaQGqTvo=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=ghTl1mD69mVfxcDyDXbA11WBlA0PvG3TwRD4Lj544RjjKOkst9FqCPvdpP2lpf4uz K5+8MwEElG/B4NPLRfTzovEBVKee7w0+G5wrG3f6BVaFxzwovH4JD9ak6DG0ryVDrY SwOBE1LDTWYJrJX2PMbbTx2o6OP15YhLcpvUd6kM= Received: from DFLE104.ent.ti.com (dfle104.ent.ti.com [10.64.6.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 17IDtUGN116309 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 18 Aug 2021 08:55:30 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Wed, 18 Aug 2021 08:55:30 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2 via Frontend Transport; Wed, 18 Aug 2021 08:55:30 -0500 Received: from [10.250.232.133] (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 17IDtK7Q105937; Wed, 18 Aug 2021 08:55:22 -0500 Subject: Re: [PATCH v8 6/8] PCI: cadence: Add support to configure virtual functions To: Bjorn Helgaas CC: Lorenzo Pieralisi , Bjorn Helgaas , Rob Herring , Tom Joseph , Jingoo Han , Gustavo Pimentel , Marek Vasut , Yoshihiro Shimoda , Shawn Lin , Heiko Stuebner , Jonathan Corbet , Arnd Bergmann , Greg Kroah-Hartman , , , , , , , , Lokesh Vutla References: <20210817153852.GA3016660@bjorn-Precision-5520> From: Kishon Vijay Abraham I Message-ID: Date: Wed, 18 Aug 2021 19:25:09 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210817153852.GA3016660@bjorn-Precision-5520> Content-Language: en-US X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210818_065544_561770_04353DE2 X-CRM114-Status: GOOD ( 24.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Bjorn, On 17/08/21 9:08 pm, Bjorn Helgaas wrote: > On Wed, Aug 11, 2021 at 12:16:54PM +0530, Kishon Vijay Abraham I wrote: >> Now that support for SR-IOV is added in PCIe endpoint core, add support >> to configure virtual functions in the Cadence PCIe EP driver. >> >> Signed-off-by: Kishon Vijay Abraham I >> --- >> .../pci/controller/cadence/pcie-cadence-ep.c | 136 +++++++++++++++--- >> drivers/pci/controller/cadence/pcie-cadence.h | 9 ++ >> 2 files changed, 125 insertions(+), 20 deletions(-) > >> @@ -92,21 +118,29 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, u8 vfn, >> >> addr0 = lower_32_bits(bar_phys); >> addr1 = upper_32_bits(bar_phys); >> - cdns_pcie_writel(pcie, CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0(fn, bar), >> - addr0); >> - cdns_pcie_writel(pcie, CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1(fn, bar), >> - addr1); >> >> reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn); >> + if (vfn == 1) >> + reg = CDNS_PCIE_LM_EP_VFUNC_BAR_CFG(bar, fn); > > Seems sort of weird to compute "reg", then sometimes overwrite it, as > opposed to: > > if (vfn == 1) > reg = CDNS_PCIE_LM_EP_VFUNC_BAR_CFG(bar, fn); > else > reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn); I tried to write it without "else". But I can change it back. > > Also slightly weird that "vfn" is basically used as a boolean, but > it's actually a u8 virtual function number. I guess VF 1 is special > and not like the other VFs? VF1 is special in that it's enough for configuring the SR-IOV capability but below the "vfn" is used for configuring inbound window. Thanks Kishon > >> b = (bar < BAR_4) ? bar : bar - BAR_4; >> >> - cfg = cdns_pcie_readl(pcie, reg); >> - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK(b) | >> - CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)); >> - cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE(b, aperture) | >> - CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL(b, ctrl)); >> - cdns_pcie_writel(pcie, reg, cfg); >> + if (vfn == 0 || vfn == 1) { >> + cfg = cdns_pcie_readl(pcie, reg); >> + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK(b) | >> + CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)); >> + cfg |= (CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE(b, aperture) | >> + CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL(b, ctrl)); >> + cdns_pcie_writel(pcie, reg, cfg); >> + } >> >> + fn = cdns_pcie_get_fn_from_vfn(pcie, fn, vfn); >> + cdns_pcie_writel(pcie, CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR0(fn, bar), >> + addr0); >> + cdns_pcie_writel(pcie, CDNS_PCIE_AT_IB_EP_FUNC_BAR_ADDR1(fn, bar), >> + addr1); >> + >> + if (vfn > 0) >> + epf = &epf->epf[vfn - 1]; >> epf->epf_bar[bar] = epf_bar; >> >> return 0; >> @@ -122,18 +156,25 @@ static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, u8 vfn, >> u32 reg, cfg, b, ctrl; >> >> reg = CDNS_PCIE_LM_EP_FUNC_BAR_CFG(bar, fn); >> + if (vfn == 1) >> + reg = CDNS_PCIE_LM_EP_VFUNC_BAR_CFG(bar, fn); > > Similar recomputation of "reg". > >> b = (bar < BAR_4) ? bar : bar - BAR_4; >> >> - ctrl = CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED; >> - cfg = cdns_pcie_readl(pcie, reg); >> - cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK(b) | >> - CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)); >> - cfg |= CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL(b, ctrl); >> - cdns_pcie_writel(pcie, reg, cfg); >> + if (vfn == 0 || vfn == 1) { >> + ctrl = CDNS_PCIE_LM_BAR_CFG_CTRL_DISABLED; >> + cfg = cdns_pcie_readl(pcie, reg); >> + cfg &= ~(CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_APERTURE_MASK(b) | >> + CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL_MASK(b)); >> + cfg |= CDNS_PCIE_LM_EP_FUNC_BAR_CFG_BAR_CTRL(b, ctrl); >> + cdns_pcie_writel(pcie, reg, cfg); >> + } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel