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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4602AC6FD1C for ; Wed, 22 Mar 2023 23:24:10 +0000 (UTC) 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:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Oj+daSOjxNNZa3V/h3aOCGfvutxDJfojsWzAaE8F+AE=; b=VDtjxTgDYBnZiT 7MszQeXXpUmHtLL9BkdrNvakmzVAe5yXQOaebpuS/T1pe3UMrxinthExky6nkl0m5lHEMXcdA08hK 04q1ifMWu7jigis1O8Yjd4TI55VvvPdTsyQQBGiN5/ScFLBDQ+KFZFtaa04Z/d9CcDYsy+dqE6BgH gb5oIXrwTapddUxT15gR7ZaqjmnWe36sIKRg2j5JsfSpTvOUHxNnRINlS4wwOFDsHNcrvwcLOU1Qs e6w1o4czAfyyMPICwCa+RYoFovOWgVVtY0frsGvyMhpWp8alYOkQ7vIVRPPeFcXozCeoF+7EV8Cxf gjLPINv/ChgGQVSsvYnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pf7nd-0007JW-2u; Wed, 22 Mar 2023 23:23:21 +0000 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pf7na-0007Hx-1D for linux-arm-kernel@lists.infradead.org; Wed, 22 Mar 2023 23:23:19 +0000 Received: by mail-lf1-x12e.google.com with SMTP id t11so25522402lfr.1 for ; Wed, 22 Mar 2023 16:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679527396; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=dMy1FNiyNC7nH9b0uj1+Mx7vs2yZ0RgzNddRt7P+HAU=; b=Fs7ZHdJsCAajCOduLTKLgiTzmLUvOiKW1QSuUnxK3JiXTbVV9p2Ahwv6D6dDsTwkZR MXAcqVv3XTXIqkz3Xn60tbrHrfMSZIhLoG9keX7qXwgG+bIxPiLitBiCw/PK78bap56D Te4L+hH0a5Sz5L/24uUJpxaKA7o97Pj/GvV/fmUzaajGx1Q02cXxKbC0jclph7Xc2vXe dM10B8zHDniYXfD5fCABpAleuYFytyUm1Mm6AlLXoOGgPJcqfD2eaprW819gTV64v2HY OgZakG+BXrsHfveOjveIEH+uRz9XtSi7AyWJfOgYVEXyZ66zeLTZ7/wrYqsMVcanRX9e 3uSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679527396; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dMy1FNiyNC7nH9b0uj1+Mx7vs2yZ0RgzNddRt7P+HAU=; b=FTUgVJFSfytmUyIY8eqcFT7umoNJi0/Bw6DorFm0WBEO2KJE3bsdn4kFZK4f6XqUQw wxHj9ieY33eijhLUQio73HXStVGxAQya4C6effi/rh4Nb6njhdtt1jJffU81W754CQDI g7cEpBVDKei/2jAvMz5PfHZ0AMyrsz1SfglYrp2VX1beMi3qSSAP2d09KQQA/cFFnr9i DviQ9/VOH4Asa8NSLvNc5JeKBldOUB3treCWth6joM4w9mem2S/1zjL7Bpve5H4dMmhY HzU24chN3bikh93zfIFu8mL8VPjJn+kjqX7yzibB2H0PslSEWMoJzh8+H7a6Tyz50mod m7Zw== X-Gm-Message-State: AO0yUKUNXygSdKlC19ufJZC+4reP20nv9wcqdYXPxJ62OuxJ9kNWa7lc J44GQrrOkgHn5Yg/Oi5kxLU0H2XgxhQ= X-Google-Smtp-Source: AK7set8irtP6Ap/MgUUkGWgx7DnC3q4LagvB2NKtgQ2zF4+eNyRMRgU2fKL5luAycwxi1gLEiL2DcA== X-Received: by 2002:ac2:554d:0:b0:4b6:fddc:1fcd with SMTP id l13-20020ac2554d000000b004b6fddc1fcdmr1127317lfk.23.1679527395939; Wed, 22 Mar 2023 16:23:15 -0700 (PDT) Received: from mobilestation ([95.79.133.202]) by smtp.gmail.com with ESMTPSA id f17-20020a056512093100b004db0d26adb4sm2696553lft.182.2023.03.22.16.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 16:23:15 -0700 (PDT) Date: Thu, 23 Mar 2023 02:23:13 +0300 From: Serge Semin To: Elad Nachman Cc: thomas.petazzoni@bootlin.com, bhelgaas@google.com, lpieralisi@kernel.org, robh@kernel.org, kw@linux.com, krzysztof.kozlowski+dt@linaro.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yuval Shaia Subject: Re: [PATCH v4 3/8] PCI: armada8k: Add AC5 MSI support Message-ID: <20230322232313.zbxhodgfqeoyclbg@mobilestation> References: <20230313124016.17102-1-enachman@marvell.com> <20230313124016.17102-4-enachman@marvell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230313124016.17102-4-enachman@marvell.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230322_162318_437523_E3531128 X-CRM114-Status: GOOD ( 25.87 ) 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 On Mon, Mar 13, 2023 at 02:40:11PM +0200, Elad Nachman wrote: > From: Yuval Shaia > > AC5 requires different handling for MSI as with armada8k. > Fix it by: > > 1. Enabling the relevant bits in init phase > 2. Dispatch virtual IRQ handlers when MSI interrupts are received > > Also enable/disable PCIE_APP_LTSSM for AC5. > > Signed-off-by: Yuval Shaia > Signed-off-by: Vadym Kochan > --- > v4: > Fix commit subject to be aligned with previous patch in series > > v2: > 1) fix W1 warnings which caused by unused leftover code > > 2) fix type in "requieres" word in the description > > drivers/pci/controller/dwc/pcie-armada8k.c | 22 +++++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pcie-armada8k.c b/drivers/pci/controller/dwc/pcie-armada8k.c > index b9fb1375dc58..02481ecadd25 100644 > --- a/drivers/pci/controller/dwc/pcie-armada8k.c > +++ b/drivers/pci/controller/dwc/pcie-armada8k.c > @@ -50,6 +50,7 @@ struct armada8k_pcie_of_data { > > #define PCIE_GLOBAL_CONTROL_REG (PCIE_VENDOR_REGS_OFFSET + 0x0) > #define PCIE_APP_LTSSM_EN BIT(2) > +#define PCIE_APP_LTSSM_EN_AC5 BIT(24) > #define PCIE_DEVICE_TYPE_SHIFT 4 > #define PCIE_DEVICE_TYPE_MASK 0xF > #define PCIE_DEVICE_TYPE_RC 0x4 /* Root complex */ > @@ -69,6 +70,7 @@ struct armada8k_pcie_of_data { > #define PCIE_INT_B_ASSERT_MASK_AC5 BIT(13) > #define PCIE_INT_C_ASSERT_MASK_AC5 BIT(14) > #define PCIE_INT_D_ASSERT_MASK_AC5 BIT(15) > +#define PCIE_MSI_MASK_AC5 BIT(11) > > #define PCIE_ATU_ACCESS_MASK_AC5 GENMASK(21, 20) > > @@ -184,6 +186,16 @@ static int armada8k_pcie_start_link(struct dw_pcie *pci) > return 0; > } > > +static void ac5_pcie_msi_init(struct dw_pcie *pci) > +{ > + u32 val; > + > + /* Set MSI bit in interrupt mask */ > + val = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_INT_MASK1_REG); > + val |= PCIE_MSI_MASK_AC5; > + dw_pcie_writel_dbi(pci, PCIE_GLOBAL_INT_MASK1_REG, val); > +} > + > static int armada8k_pcie_host_init(struct dw_pcie_rp *pp) > { > u32 reg; > @@ -193,7 +205,10 @@ static int armada8k_pcie_host_init(struct dw_pcie_rp *pp) > if (!dw_pcie_link_up(pci)) { > /* Disable LTSSM state machine to enable configuration */ > reg = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_CONTROL_REG); > - reg &= ~(PCIE_APP_LTSSM_EN); > + if (pcie->pcie_type == ARMADA8K_PCIE_TYPE_AC5) > + reg &= ~(PCIE_APP_LTSSM_EN_AC5); > + else > + reg &= ~(PCIE_APP_LTSSM_EN); This has nothing to do with MSIs. -Serge(y) > dw_pcie_writel_dbi(pci, PCIE_GLOBAL_CONTROL_REG, reg); > } > > @@ -233,6 +248,9 @@ static int armada8k_pcie_host_init(struct dw_pcie_rp *pp) > dw_pcie_writel_dbi(pci, PCIE_GLOBAL_INT_MASK1_REG, reg); > } > > + if (IS_ENABLED(CONFIG_PCI_MSI) && (pcie->pcie_type == ARMADA8K_PCIE_TYPE_AC5)) > + ac5_pcie_msi_init(pci); > + > return 0; > } > > @@ -249,6 +267,8 @@ static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg) > */ > val = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_INT_CAUSE1_REG); > dw_pcie_writel_dbi(pci, PCIE_GLOBAL_INT_CAUSE1_REG, val); > + if ((PCIE_MSI_MASK_AC5 & val) && (pcie->pcie_type == ARMADA8K_PCIE_TYPE_AC5)) > + dw_handle_msi_irq(&pci->pp); > > return IRQ_HANDLED; > } > -- > 2.17.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel