linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: ChiaWei Wang <chiawei_wang@aspeedtech.com>
To: Andrew Jeffery <andrew@aj.id.au>,
	"openipmi-developer@lists.sourceforge.net"
	<openipmi-developer@lists.sourceforge.net>,
	"openbmc@lists.ozlabs.org" <openbmc@lists.ozlabs.org>,
	"minyard@acm.org" <minyard@acm.org>
Cc: "joel@jms.id.au" <joel@jms.id.au>,
	Ryan Chen <ryan_chen@aspeedtech.com>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"tmaimon77@gmail.com" <tmaimon77@gmail.com>,
	"linux-aspeed@lists.ozlabs.org" <linux-aspeed@lists.ozlabs.org>,
	"linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
	"avifishman70@gmail.com" <avifishman70@gmail.com>,
	"venture@google.com" <venture@google.com>,
	"linus.walleij@linaro.org" <linus.walleij@linaro.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"tali.perry1@gmail.com" <tali.perry1@gmail.com>,
	"robh+dt@kernel.org" <robh+dt@kernel.org>,
	"lee.jones@linaro.org" <lee.jones@linaro.org>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	"benjaminfair@google.com" <benjaminfair@google.com>
Subject: RE: [PATCH v2 21/21] ipmi: kcs_bmc_aspeed: Optionally apply status address
Date: Tue, 6 Apr 2021 06:09:12 +0000	[thread overview]
Message-ID: <HK0PR06MB3779BE4C5C6E2758DC60FDCA91769@HK0PR06MB3779.apcprd06.prod.outlook.com> (raw)
In-Reply-To: <20210319062752.145730-21-andrew@aj.id.au>

Reviewed-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>

> -----Original Message-----
> From: Andrew Jeffery <andrew@aj.id.au>
> Sent: Friday, March 19, 2021 2:28 PM
> To: openipmi-developer@lists.sourceforge.net; openbmc@lists.ozlabs.org;
> minyard@acm.org
> Subject: [PATCH v2 21/21] ipmi: kcs_bmc_aspeed: Optionally apply status
> address
> 
> Some Aspeed KCS devices can derive the status register address from the
> address of the data register. As such, the address of the status register can be
> implicit in the configuration if desired. On the other hand, sometimes address
> schemes might be requested that are incompatible with the default addressing
> scheme. Allow these requests where possible if the devicetree specifies the
> status register address.
> 
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ---
>  drivers/char/ipmi/kcs_bmc_aspeed.c | 113 +++++++++++++++++++++--------
>  1 file changed, 81 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c
> b/drivers/char/ipmi/kcs_bmc_aspeed.c
> index 7334b1f51dcc..98789b837690 100644
> --- a/drivers/char/ipmi/kcs_bmc_aspeed.c
> +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c
> @@ -83,6 +83,8 @@
>  #define LPC_STR2             0x040
>  #define LPC_STR3             0x044
>  #define LPC_HICRB            0x100
> +#define     LPC_HICRB_EN16LADR2      BIT(5)
> +#define     LPC_HICRB_EN16LADR1      BIT(4)
>  #define     LPC_HICRB_IBFIE4         BIT(1)
>  #define     LPC_HICRB_LPC4E          BIT(0)
>  #define LPC_HICRC            0x104
> @@ -96,6 +98,11 @@
>  #define LPC_IDR4             0x114
>  #define LPC_ODR4             0x118
>  #define LPC_STR4             0x11C
> +#define LPC_LSADR12	     0x120
> +#define     LPC_LSADR12_LSADR2_MASK  GENMASK(31, 16)
> +#define     LPC_LSADR12_LSADR2_SHIFT 16
> +#define     LPC_LSADR12_LSADR1_MASK  GENMASK(15, 0)
> +#define     LPC_LSADR12_LSADR1_SHIFT 0
> 
>  #define OBE_POLL_PERIOD	     (HZ / 2)
> 
> @@ -123,7 +130,7 @@ struct aspeed_kcs_bmc {
> 
>  struct aspeed_kcs_of_ops {
>  	int (*get_channel)(struct platform_device *pdev);
> -	int (*get_io_address)(struct platform_device *pdev);
> +	int (*get_io_address)(struct platform_device *pdev, u32 addrs[2]);
>  };
> 
>  static inline struct aspeed_kcs_bmc *to_aspeed_kcs_bmc(struct
> kcs_bmc_device *kcs_bmc) @@ -217,38 +224,64 @@ static void
> aspeed_kcs_updateb(struct kcs_bmc_device *kcs_bmc, u32 reg, u8 mask,
>   *     C. KCS4
>   *        D / C : CA4h / CA5h
>   */
> -static void aspeed_kcs_set_address(struct kcs_bmc_device *kcs_bmc, u16
> addr)
> +static int aspeed_kcs_set_address(struct kcs_bmc_device *kcs_bmc, u32
> +addrs[2], int nr_addrs)
>  {
>  	struct aspeed_kcs_bmc *priv = to_aspeed_kcs_bmc(kcs_bmc);
> 
> -	switch (kcs_bmc->channel) {
> +	if (WARN_ON(nr_addrs < 1 || nr_addrs > 2))
> +		return -EINVAL;
> +
> +	switch (priv->kcs_bmc.channel) {
>  	case 1:
> -		regmap_update_bits(priv->map, LPC_HICR4,
> -				LPC_HICR4_LADR12AS, 0);
> -		regmap_write(priv->map, LPC_LADR12H, addr >> 8);
> -		regmap_write(priv->map, LPC_LADR12L, addr & 0xFF);
> +		regmap_update_bits(priv->map, LPC_HICR4, LPC_HICR4_LADR12AS,
> 0);
> +		regmap_write(priv->map, LPC_LADR12H, addrs[0] >> 8);
> +		regmap_write(priv->map, LPC_LADR12L, addrs[0] & 0xFF);
> +		if (nr_addrs == 2) {
> +			regmap_update_bits(priv->map, LPC_LSADR12,
> LPC_LSADR12_LSADR1_MASK,
> +					   addrs[1] << LPC_LSADR12_LSADR1_SHIFT);
> +
> +			regmap_update_bits(priv->map, LPC_HICRB,
> LPC_HICRB_EN16LADR1,
> +					   LPC_HICRB_EN16LADR1);
> +		}
>  		break;
> 
>  	case 2:
> -		regmap_update_bits(priv->map, LPC_HICR4,
> -				LPC_HICR4_LADR12AS, LPC_HICR4_LADR12AS);
> -		regmap_write(priv->map, LPC_LADR12H, addr >> 8);
> -		regmap_write(priv->map, LPC_LADR12L, addr & 0xFF);
> +		regmap_update_bits(priv->map, LPC_HICR4, LPC_HICR4_LADR12AS,
> LPC_HICR4_LADR12AS);
> +		regmap_write(priv->map, LPC_LADR12H, addrs[0] >> 8);
> +		regmap_write(priv->map, LPC_LADR12L, addrs[0] & 0xFF);
> +		if (nr_addrs == 2) {
> +			regmap_update_bits(priv->map, LPC_LSADR12,
> LPC_LSADR12_LSADR2_MASK,
> +					   addrs[1] << LPC_LSADR12_LSADR2_SHIFT);
> +
> +			regmap_update_bits(priv->map, LPC_HICRB,
> LPC_HICRB_EN16LADR2,
> +					   LPC_HICRB_EN16LADR2);
> +		}
>  		break;
> 
>  	case 3:
> -		regmap_write(priv->map, LPC_LADR3H, addr >> 8);
> -		regmap_write(priv->map, LPC_LADR3L, addr & 0xFF);
> +		if (nr_addrs == 2) {
> +			dev_err(priv->kcs_bmc.dev,
> +				"Channel 3 only supports inferred status IO address\n");
> +			return -EINVAL;
> +		}
> +
> +		regmap_write(priv->map, LPC_LADR3H, addrs[0] >> 8);
> +		regmap_write(priv->map, LPC_LADR3L, addrs[0] & 0xFF);
>  		break;
> 
>  	case 4:
> -		regmap_write(priv->map, LPC_LADR4, ((addr + 1) << 16) |
> -			addr);
> +		if (nr_addrs == 1)
> +			regmap_write(priv->map, LPC_LADR4, ((addrs[0] + 1) << 16) |
> addrs[0]);
> +		else
> +			regmap_write(priv->map, LPC_LADR4, (addrs[1] << 16) |
> addrs[0]);
> +
>  		break;
> 
>  	default:
> -		break;
> +		return -EINVAL;
>  	}
> +
> +	return 0;
>  }
> 
>  static inline int aspeed_kcs_map_serirq_type(u32 dt_type) @@ -462,18
> +495,18 @@ static int aspeed_kcs_of_v1_get_channel(struct platform_device
> *pdev)
>  	return channel;
>  }
> 
> -static int aspeed_kcs_of_v1_get_io_address(struct platform_device *pdev)
> +static int
> +aspeed_kcs_of_v1_get_io_address(struct platform_device *pdev, u32
> +addrs[2])
>  {
> -	u32 slave;
>  	int rc;
> 
> -	rc = of_property_read_u32(pdev->dev.of_node, "kcs_addr", &slave);
> -	if (rc || slave > 0xffff) {
> +	rc = of_property_read_u32(pdev->dev.of_node, "kcs_addr", addrs);
> +	if (rc || addrs[0] > 0xffff) {
>  		dev_err(&pdev->dev, "no valid 'kcs_addr' configured\n");
>  		return -EINVAL;
>  	}
> 
> -	return slave;
> +	return 1;
>  }
> 
>  static int aspeed_kcs_of_v2_get_channel(struct platform_device *pdev) @@
> -509,16 +542,27 @@ static int aspeed_kcs_of_v2_get_channel(struct
> platform_device *pdev)
>  	return -EINVAL;
>  }
> 
> -static int aspeed_kcs_of_v2_get_io_address(struct platform_device *pdev)
> +static int
> +aspeed_kcs_of_v2_get_io_address(struct platform_device *pdev, u32
> +addrs[2])
>  {
> -	uint32_t slave;
>  	int rc;
> 
> -	rc = of_property_read_u32(pdev->dev.of_node, "aspeed,lpc-io-reg",
> &slave);
> -	if (rc || slave > 0xffff)
> +	rc = of_property_read_variable_u32_array(pdev->dev.of_node,
> +						 "aspeed,lpc-io-reg",
> +						 addrs, 1, 2);
> +	if (rc < 0)
> +		return rc;
> +
> +	if (WARN_ON(rc == 0))
> +		return -EINVAL;
> +
> +	if (addrs[0] > 0xffff)
> +		return -EINVAL;
> +
> +	if (rc == 2 && addrs[1] > 0xffff)
>  		return -EINVAL;
> 
> -	return slave;
> +	return rc;
>  }
> 
>  static int aspeed_kcs_probe(struct platform_device *pdev) @@ -527,9
> +571,11 @@ static int aspeed_kcs_probe(struct platform_device *pdev)
>  	struct kcs_bmc_device *kcs_bmc;
>  	struct aspeed_kcs_bmc *priv;
>  	struct device_node *np;
> -	int rc, channel, addr;
>  	bool have_upstream_irq;
>  	u32 upstream_irq[2];
> +	int rc, channel;
> +	int nr_addrs;
> +	u32 addrs[2];
> 
>  	np = pdev->dev.of_node->parent;
>  	if (!of_device_is_compatible(np, "aspeed,ast2400-lpc-v2") && @@ -547,9
> +593,9 @@ static int aspeed_kcs_probe(struct platform_device *pdev)
>  	if (channel < 0)
>  		return channel;
> 
> -	addr = ops->get_io_address(pdev);
> -	if (addr < 0)
> -		return addr;
> +	nr_addrs = ops->get_io_address(pdev, addrs);
> +	if (nr_addrs < 0)
> +		return nr_addrs;
> 
>  	np = pdev->dev.of_node;
>  	rc = of_property_read_u32_array(np, "aspeed,lpc-interrupts",
> upstream_irq, 2); @@ -578,7 +624,9 @@ static int aspeed_kcs_probe(struct
> platform_device *pdev)
>  	priv->obe.remove = false;
>  	timer_setup(&priv->obe.timer, aspeed_kcs_check_obe, 0);
> 
> -	aspeed_kcs_set_address(kcs_bmc, addr);
> +	rc = aspeed_kcs_set_address(kcs_bmc, addrs, nr_addrs);
> +	if (rc)
> +		return rc;
> 
>  	/* Host to BMC IRQ */
>  	rc = aspeed_kcs_config_downstream_irq(kcs_bmc, pdev); @@ -600,7
> +648,8 @@ static int aspeed_kcs_probe(struct platform_device *pdev)
>  	if (rc < 0)
>  		return rc;
> 
> -	dev_info(&pdev->dev, "Initialised channel %d at 0x%x\n",
> kcs_bmc->channel, addr);
> +	dev_info(&pdev->dev, "Initialised channel %d at 0x%x\n",
> +			kcs_bmc->channel, addrs[0]);
> 
>  	return 0;
>  }
> --
> 2.27.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-04-06  6:11 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-19  6:27 [PATCH v2 01/21] dt-bindings: aspeed-lpc: Remove LPC partitioning Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 02/21] ARM: dts: Remove LPC BMC and Host partitions Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 03/21] ipmi: kcs: aspeed: Adapt to new LPC DTS layout Andrew Jeffery
2021-04-09  3:35   ` Joel Stanley
2021-03-19  6:27 ` [PATCH v2 04/21] pinctrl: aspeed-g5: Adapt to new LPC device tree layout Andrew Jeffery
2021-04-09  3:36   ` Joel Stanley
2021-03-19  6:27 ` [PATCH v2 05/21] soc: aspeed: " Andrew Jeffery
2021-04-09  3:38   ` Joel Stanley
2021-03-19  6:27 ` [PATCH v2 06/21] ipmi: kcs_bmc_aspeed: Use of match data to extract KCS properties Andrew Jeffery
2021-04-06  6:07   ` ChiaWei Wang
2021-04-09  3:24   ` Zev Weiss
2021-03-19  6:27 ` [PATCH v2 07/21] ipmi: kcs_bmc: Make status update atomic Andrew Jeffery
2021-04-09  5:32   ` Zev Weiss
2021-03-19  6:27 ` [PATCH v2 08/21] ipmi: kcs_bmc: Rename {read, write}_{status, data}() functions Andrew Jeffery
2021-04-09  5:33   ` Zev Weiss
2021-03-19  6:27 ` [PATCH v2 09/21] ipmi: kcs_bmc: Split out kcs_bmc_cdev_ipmi Andrew Jeffery
2021-04-09  3:56   ` Zev Weiss
2021-04-09  5:48     ` Andrew Jeffery
2021-04-09 19:21       ` Zev Weiss
2021-03-19  6:27 ` [PATCH v2 10/21] ipmi: kcs_bmc: Turn the driver data-structures inside-out Andrew Jeffery
2021-04-09  3:57   ` Zev Weiss
2021-04-09  5:59     ` Andrew Jeffery
2021-04-09  6:25       ` Zev Weiss
2021-04-09 19:26         ` Zev Weiss
2021-04-11 23:00           ` Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 11/21] ipmi: kcs_bmc: Split headers into device and client Andrew Jeffery
2021-04-09  4:01   ` Zev Weiss
2021-04-09  6:06     ` Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 12/21] ipmi: kcs_bmc: Strip private client data from struct kcs_bmc Andrew Jeffery
2021-04-09  4:07   ` Zev Weiss
2021-04-09  6:15     ` Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 13/21] ipmi: kcs_bmc: Decouple the IPMI chardev from the core Andrew Jeffery
2021-04-06  6:07   ` ChiaWei Wang
2021-04-09  4:35   ` Zev Weiss
2021-04-09  6:24     ` Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 14/21] ipmi: kcs_bmc: Allow clients to control KCS IRQ state Andrew Jeffery
2021-04-09  4:37   ` Zev Weiss
2021-04-09  6:39     ` Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 15/21] ipmi: kcs_bmc: Don't enforce single-open policy in the kernel Andrew Jeffery
2021-04-09  5:07   ` Zev Weiss
2021-03-19  6:27 ` [PATCH v2 16/21] ipmi: kcs_bmc: Add a "raw" character device interface Andrew Jeffery
2021-04-09  5:17   ` Zev Weiss
2021-04-09  6:46     ` Andrew Jeffery
2021-04-09  7:55   ` Arnd Bergmann
2021-04-09  8:51     ` Andrew Jeffery
2021-04-12  1:33     ` Andrew Jeffery
2021-04-12  8:48       ` Arnd Bergmann
2021-04-12 23:45         ` Andrew Jeffery
2021-04-13  8:22           ` Arnd Bergmann
2021-04-14  0:30             ` Andrew Jeffery
2021-03-19  6:27 ` [PATCH v2 17/21] dt-bindings: ipmi: Convert ASPEED KCS binding to schema Andrew Jeffery
2021-03-26  1:48   ` Rob Herring
2021-04-09  5:15   ` Zev Weiss
2021-04-09  5:33     ` Andrew Jeffery
2021-04-09  5:44       ` Zev Weiss
2021-04-09  8:46         ` Zev Weiss
2021-03-19  6:27 ` [PATCH v2 18/21] dt-bindings: ipmi: Add optional SerIRQ property to ASPEED KCS devices Andrew Jeffery
2021-03-26  1:49   ` Rob Herring
2021-03-19  6:27 ` [PATCH v2 19/21] ipmi: kcs_bmc_aspeed: Implement KCS SerIRQ configuration Andrew Jeffery
2021-04-01  9:30   ` [EXTERNAL] " Zev Weiss
2021-03-19  6:27 ` [PATCH v2 20/21] ipmi: kcs_bmc_aspeed: Fix IBFIE typo from datasheet Andrew Jeffery
2021-04-09  5:40   ` Zev Weiss
2021-03-19  6:27 ` [PATCH v2 21/21] ipmi: kcs_bmc_aspeed: Optionally apply status address Andrew Jeffery
2021-04-01 18:18   ` Re " Zev Weiss
2021-04-06  6:09   ` ChiaWei Wang [this message]
2021-04-09  3:18 ` [PATCH v2 01/21] dt-bindings: aspeed-lpc: Remove LPC partitioning Joel Stanley
2021-04-09  5:24   ` Andrew Jeffery

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=HK0PR06MB3779BE4C5C6E2758DC60FDCA91769@HK0PR06MB3779.apcprd06.prod.outlook.com \
    --to=chiawei_wang@aspeedtech.com \
    --cc=andrew@aj.id.au \
    --cc=avifishman70@gmail.com \
    --cc=benjaminfair@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=joel@jms.id.au \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-aspeed@lists.ozlabs.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=minyard@acm.org \
    --cc=openbmc@lists.ozlabs.org \
    --cc=openipmi-developer@lists.sourceforge.net \
    --cc=robh+dt@kernel.org \
    --cc=ryan_chen@aspeedtech.com \
    --cc=tali.perry1@gmail.com \
    --cc=tmaimon77@gmail.com \
    --cc=venture@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).