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 79679C61DA4 for ; Wed, 15 Feb 2023 01:28:09 +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:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y5HqFvr+hp/Sfh3hzUego6yf7ZbV7rXaFaHaATz0ARk=; b=h6FMp+LUds7Gn5 NHN2vk+v//rayywJZHhfxdqHxa7sF4iFflhzOqdtXFmg5UwDXsErYWvo9Qf2YacOncElVnHm9RrTu jYK52R7ndcW29LKD7/YesEcoNqHlwh+fWsG8xhT9I5cNvTl0VQFMK+v6rj/tLQD8QJNqKm7eabftd gkCC819yPr1ovGQhZzz4LidQPHGokbZpGzRiDnmqBgclBr7heSprpM/iEZbPwhuQZubYvTVIwsmaR emQ4qf1dUdvxeLj3ZSqF9q8Tlw90fZI756LSoPaXT/EpC06hR1QaVm2clBtSOUI+2CaeLEs8Go9GJ DKyVjNpsCv64Z06bNAPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS6Zb-004GXi-A8; Wed, 15 Feb 2023 01:27:03 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS6ZX-004GW5-PM for linux-arm-kernel@lists.infradead.org; Wed, 15 Feb 2023 01:27:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1676424419; x=1707960419; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=rvloK5ngdtPCbJug6sOHC6AFBm+SqF5jOZbIHY27apo=; b=rnkhFGfYsI/8iVo+mpHo63Un/EH4K/FMHugCgRx8RfVPpH8JOQeU7kzM mLUFLE1BN0U6TZIVflnjE9xBzZBfbmX21tGwmqN/+k/wFkkpK4KUxieQ6 Sn597HX8EdzMDgIJ3hEdKYSLupgEwSbIRLer0M6aMbV5gp8h/8ch1N4RP eetvBuEVHyJFWfdVq8Q2BKkhS7obBhV2JlLsCwnAuoS9txoUyVR4XZOpl uzAVpmvodrhvj7ut7l9vpt+dAy+liJNgadnbhD7BoWhlJXUCGhTfZEL1X DY9vVW0B9Esyd+2yYBvUphjoZX0Ue5jObcQHBwxMOpqT1wl/9LZ+kvgNd Q==; X-IronPort-AV: E=Sophos;i="5.97,298,1669046400"; d="scan'208";a="228296232" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 15 Feb 2023 09:26:59 +0800 IronPort-SDR: 3vJBCfp9QUMMUmtEIFU6KMTYHVyHTZhiQzIu4Fn4vY4IR/Pd7hyVdMU3hQxgYqJmT2+S3R+Icf mus+qDMo/O3KFXZqXFNqL0Qbqxe8FN9dXCm8jcyk5o51nbsbB2Nm6A78LCgpx7k+qoqP5r+MTT WoqWF5G6eL1h/DoqtObJHUQsfwQ/HPcsVhIwFIWxjRA4gMrsaYppB25epPGD4gTIs/y/5gb9R5 ZkOEi/6BP8ygLYcYIjHzkpUzfsVmUhCBH4vrtl8NjxYhifMe2XgmZhQxwi0o4sK/T/W8DZLWWt ICE= Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 14 Feb 2023 16:44:06 -0800 IronPort-SDR: 4dZQt/CwdsxJs3bmqvwncdLOZZlvpz293c1ROnQdrCWEkCeXvmH0QPrTYojoBzpTuILFsdozNa AVwvXiY6KSOblQUUAvTnnf0Xs0s/XE0QHYKQ7kCKjWwRaCRSANxuGsKZqv7TIn7KNf8cGTZc0I 57Qpb+onFVyYvEmZZzlLUkpjUSCahsk6Xh0pVuVKGcGt6YpRS+0pBIX2zlP9pg7n8ezaQK/gJJ GjGBGsgWBaNHXKCw1G5qbPU69DLDhFEi+bGlL/FweXlsw+VJj8aum4aX8gEkjd8yPF6wBhQ5Gg ccs= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 14 Feb 2023 17:26:58 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4PGgR65Xlrz1RwqL for ; Tue, 14 Feb 2023 17:26:58 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:content-type :in-reply-to:organization:from:references:to:content-language :subject:user-agent:mime-version:date:message-id; s=dkim; t= 1676424417; x=1679016418; bh=rvloK5ngdtPCbJug6sOHC6AFBm+SqF5jOZb IHY27apo=; b=XROi/FN9X2gcoDt8oVw1OMORiTAwQFNEE2nYYXOd0EwCWAdf1Z3 4p1O4qn0lqAlbnmL1rz3FlOi4yfBD8I0ck7c4yn3Wlt+/oTj7EHGSkWW/vOfntyU eNZavmZ9BWy66mJQ7x4sjzozwiqsR9rfMbbrtpAqb+K7uLlM8RI5zk4ESTC0Wj0/ 4kq39GdDjT9YRXEwh/FeajOcOkYuAL9dewJD66hqlXUao7ucyi3RmAdsL8KMtOc9 j8DQUrhWMTPWiFFAmwpMaFxFgrSo1JpDp2yTREjxPKBmFuChSr03MtIlLajaa7fk Kwpt3AAMS+0JKDQONC9gB7HGYpWLLnVcNpQ== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 4xpt6SVY7SgS for ; Tue, 14 Feb 2023 17:26:57 -0800 (PST) Received: from [10.225.163.116] (unknown [10.225.163.116]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4PGgR14p3Jz1RvLy; Tue, 14 Feb 2023 17:26:53 -0800 (PST) Message-ID: <67d08dce-4610-5e34-853a-1d09c5389607@opensource.wdc.com> Date: Wed, 15 Feb 2023 10:26:52 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH v2 7/9] PCI: rockchip: Fix legacy IRQ generation for RK3399 PCIe endpoint core Content-Language: en-US To: Rick Wertenbroek , alberto.dassatti@heig-vd.ch Cc: xxm@rock-chips.com, rick.wertenbroek@heig-vd.ch, stable@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Shawn Lin , Lorenzo Pieralisi , =?UTF-8?Q?Krzysztof_Wilczy=c5=84ski?= , Bjorn Helgaas , Jani Nikula , Mikko Kovanen , Rodrigo Vivi , Greg Kroah-Hartman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org References: <20230214140858.1133292-1-rick.wertenbroek@gmail.com> <20230214140858.1133292-8-rick.wertenbroek@gmail.com> From: Damien Le Moal Organization: Western Digital Research In-Reply-To: <20230214140858.1133292-8-rick.wertenbroek@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230214_172659_901799_E9880B36 X-CRM114-Status: GOOD ( 28.13 ) 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 2/14/23 23:08, Rick Wertenbroek wrote: > Fix legacy IRQ generation for RK3399 PCIe endpoint core according to > the technical reference manual (TRM). Assert and deassert legacy > interrupt (INTx) through the legacy interrupt control register > ("PCIE_CLIENT_LEGACY_INT_CTRL") instead of manually generating a PCIe > message. The generation of the legacy interrupt was tested and validated > with the PCIe endpoint test driver. > > Fixes: cf590b078391 ("PCI: rockchip: Add EP driver for Rockchip PCIe controller") > Cc: stable@vger.kernel.org > Signed-off-by: Rick Wertenbroek Some nits below. But otherwise works fine for me. > --- > drivers/pci/controller/pcie-rockchip-ep.c | 38 +++++------------------ > drivers/pci/controller/pcie-rockchip.h | 6 ++++ > 2 files changed, 14 insertions(+), 30 deletions(-) > > diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c > index cbc281a6a..ca5b363ba 100644 > --- a/drivers/pci/controller/pcie-rockchip-ep.c > +++ b/drivers/pci/controller/pcie-rockchip-ep.c > @@ -328,45 +328,23 @@ static void rockchip_pcie_ep_assert_intx(struct rockchip_pcie_ep *ep, u8 fn, > u8 intx, bool is_asserted) > { > struct rockchip_pcie *rockchip = &ep->rockchip; > - u32 r = ep->max_regions - 1; > - u32 offset; > - u32 status; > - u8 msg_code; > - > - if (unlikely(ep->irq_pci_addr != ROCKCHIP_PCIE_EP_PCI_LEGACY_IRQ_ADDR || > - ep->irq_pci_fn != fn)) { > - rockchip_pcie_prog_ep_ob_atu(rockchip, fn, r, > - AXI_WRAPPER_NOR_MSG, > - ep->irq_phys_addr, 0, 0); > - ep->irq_pci_addr = ROCKCHIP_PCIE_EP_PCI_LEGACY_IRQ_ADDR; > - ep->irq_pci_fn = fn; > - } > > intx &= 3; > if (is_asserted) { > ep->irq_pending |= BIT(intx); > - msg_code = ROCKCHIP_PCIE_MSG_CODE_ASSERT_INTA + intx; > } else { > ep->irq_pending &= ~BIT(intx); > - msg_code = ROCKCHIP_PCIE_MSG_CODE_DEASSERT_INTA + intx; > } > > - status = rockchip_pcie_read(rockchip, > - ROCKCHIP_PCIE_EP_FUNC_BASE(fn) + > - ROCKCHIP_PCIE_EP_CMD_STATUS); > - status &= ROCKCHIP_PCIE_EP_CMD_STATUS_IS; > - > - if ((status != 0) ^ (ep->irq_pending != 0)) { > - status ^= ROCKCHIP_PCIE_EP_CMD_STATUS_IS; > - rockchip_pcie_write(rockchip, status, > - ROCKCHIP_PCIE_EP_FUNC_BASE(fn) + > - ROCKCHIP_PCIE_EP_CMD_STATUS); > + if (is_asserted) { > + rockchip_pcie_write(rockchip, > + PCIE_CLIENT_INT_IN_ASSERT | PCIE_CLIENT_INT_PEND_ST_PEND, > + PCIE_CLIENT_LEGACY_INT_CTRL); > + } else { > + rockchip_pcie_write(rockchip, > + PCIE_CLIENT_INT_IN_DEASSERT | PCIE_CLIENT_INT_PEND_ST_NORMAL, > + PCIE_CLIENT_LEGACY_INT_CTRL); > } With this change, you have now twice "if (is_asserted) {", which is not necessary. You can simplify the code a bit: static void rockchip_pcie_ep_assert_intx(struct rockchip_pcie_ep *ep, u8 fn, u8 intx, bool do_assert) { u8 msg_code; intx &= 3; if (do_assert) { ep->irq_pending |= BIT(intx); msg_code = ROCKCHIP_PCIE_MSG_CODE_ASSERT_INTA + intx; rockchip_pcie_write(&ep->rockchip, PCIE_CLIENT_INT_IN_ASSERT | PCIE_CLIENT_INT_PEND_ST_PEND, PCIE_CLIENT_LEGACY_INT_CTRL); return; } ep->irq_pending &= ~BIT(intx); msg_code = ROCKCHIP_PCIE_MSG_CODE_DEASSERT_INTA + intx; rockchip_pcie_write(&ep->rockchip, PCIE_CLIENT_INT_IN_DEASSERT | PCIE_CLIENT_INT_PEND_ST_NORMAL, PCIE_CLIENT_LEGACY_INT_CTRL); } Note also the renaming of the argument "is_asserted" to "do_assert". The name is_asserted is badly misleading considering the english meaning given that it is true when we *must* do the assert and false when we must deassert. So do_assert as a name better match the use of that argument I think. > - > - offset = > - ROCKCHIP_PCIE_MSG_ROUTING(ROCKCHIP_PCIE_MSG_ROUTING_LOCAL_INTX) | > - ROCKCHIP_PCIE_MSG_CODE(msg_code) | ROCKCHIP_PCIE_MSG_NO_DATA; > - writel(0, ep->irq_cpu_addr + offset); > } > > static int rockchip_pcie_ep_send_legacy_irq(struct rockchip_pcie_ep *ep, u8 fn, > diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h > index 72e427a0f..e90c2a2b8 100644 > --- a/drivers/pci/controller/pcie-rockchip.h > +++ b/drivers/pci/controller/pcie-rockchip.h > @@ -39,6 +39,12 @@ > #define PCIE_CLIENT_GEN_SEL_1 HIWORD_UPDATE(0x0080, 0) > #define PCIE_CLIENT_GEN_SEL_2 HIWORD_UPDATE_BIT(0x0080) > #define PCIE_CLIENT_SIDE_BAND_STATUS (PCIE_CLIENT_BASE + 0x20) > +#define PCIE_CLIENT_LEGACY_INT_CTRL (PCIE_CLIENT_BASE + 0x0c) > +#define PCIE_CLIENT_INT_IN_ASSERT HIWORD_UPDATE_BIT(0x0002) > +#define PCIE_CLIENT_INT_IN_DEASSERT HIWORD_UPDATE(0x0002, 0) > +#define PCIE_CLIENT_INT_PEND_ST_PEND HIWORD_UPDATE_BIT(0x0001) > +#define PCIE_CLIENT_INT_PEND_ST_NORMAL HIWORD_UPDATE(0x0001, 0) > +#define PCIE_CLIENT_SIDE_BAND_STATUS (PCIE_CLIENT_BASE + 0x20) > #define PCIE_CLIENT_PHY_ST BIT(12) > #define PCIE_CLIENT_DEBUG_OUT_0 (PCIE_CLIENT_BASE + 0x3c) > #define PCIE_CLIENT_DEBUG_LTSSM_MASK GENMASK(5, 0) -- Damien Le Moal Western Digital Research _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel