From nobody Tue Feb 10 07:02:18 2026 Received: from codeconstruct.com.au (pi.codeconstruct.com.au [203.29.241.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B56BE277020 for ; Fri, 11 Apr 2025 01:09:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.29.241.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744333757; cv=none; b=RmpJWCL7Hh7B+hQyaWbB7530qtSEGLYC6XPRGaQJ6extTRPOeLpQmhLarZVOb6h+x2rQFsLAaeJBpiVke1CfEecnu0CynMdatoLHqNL32bwRJ4LLQvxZqA9B0fVT8KRMVCe0KywRBRe5mxf6s4xowFcAGwmzOHs57VpUVcCpH5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744333757; c=relaxed/simple; bh=RbwiXpzOAtdjwl/ofS7lr/ti3pfItezHAD2VaMOkbZc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ab/fz9P1LylGWiOxdMLgCDVSFAMjYn8bJyyymXmxjQi6HSVppzSZn3tkdYhb50lM9YAKkuZGk/BvMZHHu+hcVRuxwx/JXrHrxWpqSh6ejuODifpa662da81oDoqkV4xZRG8Z/DJFZrcm4pHlvLSZ4858NaPup3OpMhs5F9Eyko8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au; spf=pass smtp.mailfrom=codeconstruct.com.au; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b=RxRK3urb; arc=none smtp.client-ip=203.29.241.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b="RxRK3urb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1744333751; bh=5d2qecfXxLFsaK8953Ze2wHaQJoHjLdmHiRZ/zMT2W4=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=RxRK3urbtqHCux2yvKr3Gday1m7MxlHZfjP51M0pU7PtXXAT6nSXsvkkTYg3uMMzL /gkibMwHZ0RtmYUM63NDsXRhzokmXqknjY4/NNbs/0/6cA6SNZ+9icNt9jF1oNGGcj 3fACPSlg+D8I4YoBhHbIoSs0d+4bEEoSEiUdQXcfdxBdLLJsLJToHz7kpZAaO5rmYF WGbYEV5lG01NjsKuKcrqj9K/RjQcBwDTllRIi65WReUgZleU2ZY9p55O2U+bffwH/o /SGlyOXaBms/TwX/EibCD6hT3lMLAhPl0C4p2fU6Z5zZzaR+T3sWPtIxbiK5XEdI4g 0CvxqQkgLB8Rg== Received: from [127.0.1.1] (unknown [180.150.112.225]) by mail.codeconstruct.com.au (Postfix) with ESMTPSA id A59267D715; Fri, 11 Apr 2025 09:09:10 +0800 (AWST) From: Andrew Jeffery Date: Fri, 11 Apr 2025 10:38:35 +0930 Subject: [PATCH 5/7] soc: aspeed: lpc-snoop: Rename 'channel' to 'index' in channel paths Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250411-aspeed-lpc-snoop-fixes-v1-5-64f522e3ad6f@codeconstruct.com.au> References: <20250411-aspeed-lpc-snoop-fixes-v1-0-64f522e3ad6f@codeconstruct.com.au> In-Reply-To: <20250411-aspeed-lpc-snoop-fixes-v1-0-64f522e3ad6f@codeconstruct.com.au> To: linux-aspeed@lists.ozlabs.org Cc: Joel Stanley , Henry Martin , Jean Delvare , Patrick Rudolph , Andrew Geissler , Ninad Palsule , Patrick Venture , Robert Lippert , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Jeffery X-Mailer: b4 0.14.2 We'll introduce another 'channel' variable shortly Signed-off-by: Andrew Jeffery Acked-by: Jean Delvare --- drivers/soc/aspeed/aspeed-lpc-snoop.c | 47 ++++++++++++++++++-------------= ---- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/asp= eed-lpc-snoop.c index 6ab362aeb180c8ad356422d8257717f41a232b3c..f6952f71eda52c95aea5ad1084e= dd218b88f1234 100644 --- a/drivers/soc/aspeed/aspeed-lpc-snoop.c +++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c @@ -185,40 +185,40 @@ static int aspeed_lpc_snoop_config_irq(struct aspeed_= lpc_snoop *lpc_snoop, __attribute__((nonnull)) static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop, struct device *dev, - int channel, u16 lpc_port) + int index, u16 lpc_port) { const struct aspeed_lpc_snoop_model_data *model_data; u32 hicr5_en, snpwadr_mask, snpwadr_shift, hicrb_en; int rc =3D 0; =20 - if (channel < 0 || channel >=3D ARRAY_SIZE(lpc_snoop->chan)) + if (index < 0 || index >=3D ARRAY_SIZE(lpc_snoop->chan)) return -EINVAL; =20 - if (lpc_snoop->chan[channel].enabled) + if (lpc_snoop->chan[index].enabled) return -EBUSY; =20 - init_waitqueue_head(&lpc_snoop->chan[channel].wq); + init_waitqueue_head(&lpc_snoop->chan[index].wq); /* Create FIFO datastructure */ - rc =3D kfifo_alloc(&lpc_snoop->chan[channel].fifo, + rc =3D kfifo_alloc(&lpc_snoop->chan[index].fifo, SNOOP_FIFO_SIZE, GFP_KERNEL); if (rc) return rc; =20 - lpc_snoop->chan[channel].miscdev.minor =3D MISC_DYNAMIC_MINOR; - lpc_snoop->chan[channel].miscdev.name =3D - devm_kasprintf(dev, GFP_KERNEL, "%s%d", DEVICE_NAME, channel); - if (!lpc_snoop->chan[channel].miscdev.name) { + lpc_snoop->chan[index].miscdev.minor =3D MISC_DYNAMIC_MINOR; + lpc_snoop->chan[index].miscdev.name =3D + devm_kasprintf(dev, GFP_KERNEL, "%s%d", DEVICE_NAME, index); + if (!lpc_snoop->chan[index].miscdev.name) { rc =3D -ENOMEM; goto err_free_fifo; } - lpc_snoop->chan[channel].miscdev.fops =3D &snoop_fops; - lpc_snoop->chan[channel].miscdev.parent =3D dev; - rc =3D misc_register(&lpc_snoop->chan[channel].miscdev); + lpc_snoop->chan[index].miscdev.fops =3D &snoop_fops; + lpc_snoop->chan[index].miscdev.parent =3D dev; + rc =3D misc_register(&lpc_snoop->chan[index].miscdev); if (rc) goto err_free_fifo; =20 /* Enable LPC snoop channel at requested port */ - switch (channel) { + switch (index) { case 0: hicr5_en =3D HICR5_EN_SNP0W | HICR5_ENINT_SNP0W; snpwadr_mask =3D SNPWADR_CH0_MASK; @@ -244,28 +244,29 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_= snoop *lpc_snoop, if (model_data && model_data->has_hicrb_ensnp) regmap_update_bits(lpc_snoop->regmap, HICRB, hicrb_en, hicrb_en); =20 - lpc_snoop->chan[channel].enabled =3D true; + lpc_snoop->chan[index].enabled =3D true; =20 return 0; =20 err_misc_deregister: - misc_deregister(&lpc_snoop->chan[channel].miscdev); + misc_deregister(&lpc_snoop->chan[index].miscdev); err_free_fifo: - kfifo_free(&lpc_snoop->chan[channel].fifo); + kfifo_free(&lpc_snoop->chan[index].fifo); return rc; } =20 __attribute__((nonnull)) static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop, - int channel) + int index) { - if (channel < 0 || channel >=3D ARRAY_SIZE(lpc_snoop->chan)) + if (index < 0 || index >=3D ARRAY_SIZE(lpc_snoop->chan)) return; =20 - if (!lpc_snoop->chan[channel].enabled) + if (!lpc_snoop->chan[index].enabled) return; =20 - switch (channel) { + /* Disable interrupts along with the device */ + switch (index) { case 0: regmap_update_bits(lpc_snoop->regmap, HICR5, HICR5_EN_SNP0W | HICR5_ENINT_SNP0W, @@ -280,10 +281,10 @@ static void aspeed_lpc_disable_snoop(struct aspeed_lp= c_snoop *lpc_snoop, return; } =20 - lpc_snoop->chan[channel].enabled =3D false; + lpc_snoop->chan[index].enabled =3D false; /* Consider improving safety wrt concurrent reader(s) */ - misc_deregister(&lpc_snoop->chan[channel].miscdev); - kfifo_free(&lpc_snoop->chan[channel].fifo); + misc_deregister(&lpc_snoop->chan[index].miscdev); + kfifo_free(&lpc_snoop->chan[index].fifo); } =20 static int aspeed_lpc_snoop_probe(struct platform_device *pdev) --=20 2.39.5