Linux-ARM-Kernel Archive on lore.kernel.org
 help / Atom feed
From: Vijay Khemka <vijaykhemka@fb.com>
To: Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>,
	"Patrick Venture" <venture@google.com>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	"linux-aspeed@lists.ozlabs.org" <linux-aspeed@lists.ozlabs.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sai Dasari <sdasari@fb.com>
Subject: Re: [PATCH v2] soc: aspeed: lpc-ctrl: make parameter optional
Date: Fri, 14 Jun 2019 21:41:39 +0000
Message-ID: <C4D5C095-A715-4D39-9DEB-1B7734760666@fb.com> (raw)
In-Reply-To: <6828A39D-8950-4C07-8340-7AE9E2DD3EC0@fb.com>

Hi Andrew,
Any update on this patch or do I need any more rework.

Regards
-Vijay

On 6/6/19, 11:51 AM, "Vijay Khemka" <vijaykhemka@fb.com> wrote:

    Please update on this patch.
    
    On 5/30/19, 1:37 PM, "Vijay Khemka" <vijaykhemka@fb.com> wrote:
    
        Making memory-region and flash as optional parameter in device
        tree if user needs to use these parameter through ioctl then
        need to define in devicetree.
        
        Signed-off-by: Vijay Khemka <vijaykhemka@fb.com>
        Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
        ---
         drivers/soc/aspeed/aspeed-lpc-ctrl.c | 58 +++++++++++++++++-----------
         1 file changed, 36 insertions(+), 22 deletions(-)
        
        diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
        index a024f8042259..aca13779764a 100644
        --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
        +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
        @@ -68,6 +68,7 @@ static long aspeed_lpc_ctrl_ioctl(struct file *file, unsigned int cmd,
         		unsigned long param)
         {
         	struct aspeed_lpc_ctrl *lpc_ctrl = file_aspeed_lpc_ctrl(file);
        +	struct device *dev = file->private_data;
         	void __user *p = (void __user *)param;
         	struct aspeed_lpc_ctrl_mapping map;
         	u32 addr;
        @@ -90,6 +91,12 @@ static long aspeed_lpc_ctrl_ioctl(struct file *file, unsigned int cmd,
         		if (map.window_id != 0)
         			return -EINVAL;
         
        +		/* If memory-region is not described in device tree */
        +		if (!lpc_ctrl->mem_size) {
        +			dev_dbg(dev, "Didn't find reserved memory\n");
        +			return -ENXIO;
        +		}
        +
         		map.size = lpc_ctrl->mem_size;
         
         		return copy_to_user(p, &map, sizeof(map)) ? -EFAULT : 0;
        @@ -126,9 +133,18 @@ static long aspeed_lpc_ctrl_ioctl(struct file *file, unsigned int cmd,
         			return -EINVAL;
         
         		if (map.window_type == ASPEED_LPC_CTRL_WINDOW_FLASH) {
        +			if (!lpc_ctrl->pnor_size) {
        +				dev_dbg(dev, "Didn't find host pnor flash\n");
        +				return -ENXIO;
        +			}
         			addr = lpc_ctrl->pnor_base;
         			size = lpc_ctrl->pnor_size;
         		} else if (map.window_type == ASPEED_LPC_CTRL_WINDOW_MEMORY) {
        +			/* If memory-region is not described in device tree */
        +			if (!lpc_ctrl->mem_size) {
        +				dev_dbg(dev, "Didn't find reserved memory\n");
        +				return -ENXIO;
        +			}
         			addr = lpc_ctrl->mem_base;
         			size = lpc_ctrl->mem_size;
         		} else {
        @@ -196,17 +212,17 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
         	if (!lpc_ctrl)
         		return -ENOMEM;
         
        +	/* If flash is described in device tree then store */
         	node = of_parse_phandle(dev->of_node, "flash", 0);
         	if (!node) {
        -		dev_err(dev, "Didn't find host pnor flash node\n");
        -		return -ENODEV;
        -	}
        -
        -	rc = of_address_to_resource(node, 1, &resm);
        -	of_node_put(node);
        -	if (rc) {
        -		dev_err(dev, "Couldn't address to resource for flash\n");
        -		return rc;
        +		dev_dbg(dev, "Didn't find host pnor flash node\n");
        +	} else {
        +		rc = of_address_to_resource(node, 1, &resm);
        +		of_node_put(node);
        +		if (rc) {
        +			dev_err(dev, "Couldn't address to resource for flash\n");
        +			return rc;
        +		}
         	}
         
         	lpc_ctrl->pnor_size = resource_size(&resm);
        @@ -214,22 +230,22 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
         
         	dev_set_drvdata(&pdev->dev, lpc_ctrl);
         
        +	/* If memory-region is described in device tree then store */
         	node = of_parse_phandle(dev->of_node, "memory-region", 0);
         	if (!node) {
        -		dev_err(dev, "Didn't find reserved memory\n");
        -		return -EINVAL;
        -	}
        +		dev_dbg(dev, "Didn't find reserved memory\n");
        +	} else {
        +		rc = of_address_to_resource(node, 0, &resm);
        +		of_node_put(node);
        +		if (rc) {
        +			dev_err(dev, "Couldn't address to resource for reserved memory\n");
        +			return -ENXIO;
        +		}
         
        -	rc = of_address_to_resource(node, 0, &resm);
        -	of_node_put(node);
        -	if (rc) {
        -		dev_err(dev, "Couldn't address to resource for reserved memory\n");
        -		return -ENOMEM;
        +		lpc_ctrl->mem_size = resource_size(&resm);
        +		lpc_ctrl->mem_base = resm.start;
         	}
         
        -	lpc_ctrl->mem_size = resource_size(&resm);
        -	lpc_ctrl->mem_base = resm.start;
        -
         	lpc_ctrl->regmap = syscon_node_to_regmap(
         			pdev->dev.parent->of_node);
         	if (IS_ERR(lpc_ctrl->regmap)) {
        @@ -258,8 +274,6 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
         		goto err;
         	}
         
        -	dev_info(dev, "Loaded at %pr\n", &resm);
        -
         	return 0;
         
         err:
        -- 
        2.17.1
        
        
    
    

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

  reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-30 20:36 Vijay Khemka
2019-06-06 18:51 ` Vijay Khemka
2019-06-14 21:41   ` Vijay Khemka [this message]
2019-06-17  3:08     ` Andrew Jeffery

Reply instructions:

You may reply publically 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=C4D5C095-A715-4D39-9DEB-1B7734760666@fb.com \
    --to=vijaykhemka@fb.com \
    --cc=andrew@aj.id.au \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=joel@jms.id.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-aspeed@lists.ozlabs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sdasari@fb.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

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org infradead-linux-arm-kernel@archiver.kernel.org
	public-inbox-index linux-arm-kernel


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox