Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa969e3 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "ehea: Use the standard logging functions"



This reverts commit 539995d1.

As reported by Stephen Rothwell, this breaks the build.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40fe7d88
Loading
Loading
Loading
Loading
+13 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,19 @@


/* utility functions */
/* utility functions */


#define ehea_info(fmt, args...) \
	printk(KERN_INFO DRV_NAME ": " fmt "\n", ## args)

#define ehea_error(fmt, args...) \
	printk(KERN_ERR DRV_NAME ": Error in %s: " fmt "\n", __func__, ## args)

#ifdef DEBUG
#define ehea_debug(fmt, args...) \
	printk(KERN_DEBUG DRV_NAME ": " fmt, ## args)
#else
#define ehea_debug(fmt, args...) do {} while (0)
#endif

void ehea_dump(void *adr, int len, char *msg);
void ehea_dump(void *adr, int len, char *msg);


#define EHEA_BMASK(pos, length) (((pos) << 16) + (length))
#define EHEA_BMASK(pos, length) (((pos) << 16) + (length))
+8 −10
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 */


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include "ehea.h"
#include "ehea.h"
#include "ehea_phyp.h"
#include "ehea_phyp.h"


@@ -120,9 +118,9 @@ static int ehea_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
	ret = ehea_set_portspeed(port, sp);
	ret = ehea_set_portspeed(port, sp);


	if (!ret)
	if (!ret)
		netdev_info(dev,
		ehea_info("%s: Port speed successfully set: %dMbps "
			    "Port speed successfully set: %dMbps %s Duplex\n",
			  "%s Duplex",
			    port->port_speed,
			  port->netdev->name, port->port_speed,
			  port->full_duplex == 1 ? "Full" : "Half");
			  port->full_duplex == 1 ? "Full" : "Half");
out:
out:
	return ret;
	return ret;
@@ -136,9 +134,9 @@ static int ehea_nway_reset(struct net_device *dev)
	ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);
	ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);


	if (!ret)
	if (!ret)
		netdev_info(port->netdev,
		ehea_info("%s: Port speed successfully set: %dMbps "
			    "Port speed successfully set: %dMbps %s Duplex\n",
			  "%s Duplex",
			    port->port_speed,
			  port->netdev->name, port->port_speed,
			  port->full_duplex == 1 ? "Full" : "Half");
			  port->full_duplex == 1 ? "Full" : "Half");
	return ret;
	return ret;
}
}
+208 −199

File changed.

Preview size limit exceeded, changes collapsed.

+20 −20
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 */


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include "ehea_phyp.h"
#include "ehea_phyp.h"




@@ -69,11 +67,12 @@ static long ehea_plpar_hcall_norets(unsigned long opcode,
		}
		}


		if (ret < H_SUCCESS)
		if (ret < H_SUCCESS)
			pr_err("opcode=%lx ret=%lx"
			ehea_error("opcode=%lx ret=%lx"
				   " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
				   " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
			       " arg5=%lx arg6=%lx arg7=%lx\n",
				   " arg5=%lx arg6=%lx arg7=%lx ",
				   opcode, ret,
				   opcode, ret,
			       arg1, arg2, arg3, arg4, arg5, arg6, arg7);
				   arg1, arg2, arg3, arg4, arg5,
				   arg6, arg7);


		return ret;
		return ret;
	}
	}
@@ -115,18 +114,19 @@ static long ehea_plpar_hcall9(unsigned long opcode,
		    && (((cb_cat == H_PORT_CB4) && ((arg3 == H_PORT_CB4_JUMBO)
		    && (((cb_cat == H_PORT_CB4) && ((arg3 == H_PORT_CB4_JUMBO)
		    || (arg3 == H_PORT_CB4_SPEED))) || ((cb_cat == H_PORT_CB7)
		    || (arg3 == H_PORT_CB4_SPEED))) || ((cb_cat == H_PORT_CB7)
		    && (arg3 == H_PORT_CB7_DUCQPN)))))
		    && (arg3 == H_PORT_CB7_DUCQPN)))))
			pr_err("opcode=%lx ret=%lx"
			ehea_error("opcode=%lx ret=%lx"
				   " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
				   " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
				   " arg5=%lx arg6=%lx arg7=%lx arg8=%lx"
				   " arg5=%lx arg6=%lx arg7=%lx arg8=%lx"
				   " arg9=%lx"
				   " arg9=%lx"
				   " out1=%lx out2=%lx out3=%lx out4=%lx"
				   " out1=%lx out2=%lx out3=%lx out4=%lx"
				   " out5=%lx out6=%lx out7=%lx out8=%lx"
				   " out5=%lx out6=%lx out7=%lx out8=%lx"
			       " out9=%lx\n",
				   " out9=%lx",
				   opcode, ret,
				   opcode, ret,
				   arg1, arg2, arg3, arg4, arg5,
				   arg1, arg2, arg3, arg4, arg5,
				   arg6, arg7, arg8, arg9,
				   arg6, arg7, arg8, arg9,
			       outs[0], outs[1], outs[2], outs[3], outs[4],
				   outs[0], outs[1], outs[2], outs[3],
			       outs[5], outs[6], outs[7], outs[8]);
				   outs[4], outs[5], outs[6], outs[7],
				   outs[8]);
		return ret;
		return ret;
	}
	}


@@ -515,7 +515,7 @@ u64 ehea_h_register_rpage_mr(const u64 adapter_handle, const u64 mr_handle,
			     const u64 log_pageaddr, const u64 count)
			     const u64 log_pageaddr, const u64 count)
{
{
	if ((count > 1) && (log_pageaddr & ~PAGE_MASK)) {
	if ((count > 1) && (log_pageaddr & ~PAGE_MASK)) {
		pr_err("not on pageboundary\n");
		ehea_error("not on pageboundary");
		return H_PARAMETER;
		return H_PARAMETER;
	}
	}


+44 −45
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 */


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/mm.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/slab.h>
#include "ehea.h"
#include "ehea.h"
@@ -47,7 +45,7 @@ static void *hw_qpageit_get_inc(struct hw_queue *queue)
		queue->current_q_offset -= queue->pagesize;
		queue->current_q_offset -= queue->pagesize;
		retvalue = NULL;
		retvalue = NULL;
	} else if (((u64) retvalue) & (EHEA_PAGESIZE-1)) {
	} else if (((u64) retvalue) & (EHEA_PAGESIZE-1)) {
		pr_err("not on pageboundary\n");
		ehea_error("not on pageboundary");
		retvalue = NULL;
		retvalue = NULL;
	}
	}
	return retvalue;
	return retvalue;
@@ -60,15 +58,15 @@ static int hw_queue_ctor(struct hw_queue *queue, const u32 nr_of_pages,
	int i, k;
	int i, k;


	if ((pagesize > PAGE_SIZE) || (!pages_per_kpage)) {
	if ((pagesize > PAGE_SIZE) || (!pages_per_kpage)) {
		pr_err("pagesize conflict! kernel pagesize=%d, ehea pagesize=%d\n",
		ehea_error("pagesize conflict! kernel pagesize=%d, "
		       (int)PAGE_SIZE, (int)pagesize);
			   "ehea pagesize=%d", (int)PAGE_SIZE, (int)pagesize);
		return -EINVAL;
		return -EINVAL;
	}
	}


	queue->queue_length = nr_of_pages * pagesize;
	queue->queue_length = nr_of_pages * pagesize;
	queue->queue_pages = kmalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);
	queue->queue_pages = kmalloc(nr_of_pages * sizeof(void *), GFP_KERNEL);
	if (!queue->queue_pages) {
	if (!queue->queue_pages) {
		pr_err("no mem for queue_pages\n");
		ehea_error("no mem for queue_pages");
		return -ENOMEM;
		return -ENOMEM;
	}
	}


@@ -132,7 +130,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,


	cq = kzalloc(sizeof(*cq), GFP_KERNEL);
	cq = kzalloc(sizeof(*cq), GFP_KERNEL);
	if (!cq) {
	if (!cq) {
		pr_err("no mem for cq\n");
		ehea_error("no mem for cq");
		goto out_nomem;
		goto out_nomem;
	}
	}


@@ -149,7 +147,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
	hret = ehea_h_alloc_resource_cq(adapter->handle, &cq->attr,
	hret = ehea_h_alloc_resource_cq(adapter->handle, &cq->attr,
					&cq->fw_handle, &cq->epas);
					&cq->fw_handle, &cq->epas);
	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("alloc_resource_cq failed\n");
		ehea_error("alloc_resource_cq failed");
		goto out_freemem;
		goto out_freemem;
	}
	}


@@ -161,7 +159,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
	for (counter = 0; counter < cq->attr.nr_pages; counter++) {
	for (counter = 0; counter < cq->attr.nr_pages; counter++) {
		vpage = hw_qpageit_get_inc(&cq->hw_queue);
		vpage = hw_qpageit_get_inc(&cq->hw_queue);
		if (!vpage) {
		if (!vpage) {
			pr_err("hw_qpageit_get_inc failed\n");
			ehea_error("hw_qpageit_get_inc failed");
			goto out_kill_hwq;
			goto out_kill_hwq;
		}
		}


@@ -170,7 +168,8 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
					     0, EHEA_CQ_REGISTER_ORIG,
					     0, EHEA_CQ_REGISTER_ORIG,
					     cq->fw_handle, rpage, 1);
					     cq->fw_handle, rpage, 1);
		if (hret < H_SUCCESS) {
		if (hret < H_SUCCESS) {
			pr_err("register_rpage_cq failed ehea_cq=%p hret=%llx counter=%i act_pages=%i\n",
			ehea_error("register_rpage_cq failed ehea_cq=%p "
				   "hret=%llx counter=%i act_pages=%i",
				   cq, hret, counter, cq->attr.nr_pages);
				   cq, hret, counter, cq->attr.nr_pages);
			goto out_kill_hwq;
			goto out_kill_hwq;
		}
		}
@@ -179,14 +178,14 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
			vpage = hw_qpageit_get_inc(&cq->hw_queue);
			vpage = hw_qpageit_get_inc(&cq->hw_queue);


			if ((hret != H_SUCCESS) || (vpage)) {
			if ((hret != H_SUCCESS) || (vpage)) {
				pr_err("registration of pages not complete hret=%llx\n",
				ehea_error("registration of pages not "
				       hret);
					   "complete hret=%llx\n", hret);
				goto out_kill_hwq;
				goto out_kill_hwq;
			}
			}
		} else {
		} else {
			if (hret != H_PAGE_REGISTERED) {
			if (hret != H_PAGE_REGISTERED) {
				pr_err("CQ: registration of page failed hret=%llx\n",
				ehea_error("CQ: registration of page failed "
				       hret);
					   "hret=%llx\n", hret);
				goto out_kill_hwq;
				goto out_kill_hwq;
			}
			}
		}
		}
@@ -242,7 +241,7 @@ int ehea_destroy_cq(struct ehea_cq *cq)
	}
	}


	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("destroy CQ failed\n");
		ehea_error("destroy CQ failed");
		return -EIO;
		return -EIO;
	}
	}


@@ -260,7 +259,7 @@ struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter,


	eq = kzalloc(sizeof(*eq), GFP_KERNEL);
	eq = kzalloc(sizeof(*eq), GFP_KERNEL);
	if (!eq) {
	if (!eq) {
		pr_err("no mem for eq\n");
		ehea_error("no mem for eq");
		return NULL;
		return NULL;
	}
	}


@@ -273,21 +272,21 @@ struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter,
	hret = ehea_h_alloc_resource_eq(adapter->handle,
	hret = ehea_h_alloc_resource_eq(adapter->handle,
					&eq->attr, &eq->fw_handle);
					&eq->attr, &eq->fw_handle);
	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("alloc_resource_eq failed\n");
		ehea_error("alloc_resource_eq failed");
		goto out_freemem;
		goto out_freemem;
	}
	}


	ret = hw_queue_ctor(&eq->hw_queue, eq->attr.nr_pages,
	ret = hw_queue_ctor(&eq->hw_queue, eq->attr.nr_pages,
			    EHEA_PAGESIZE, sizeof(struct ehea_eqe));
			    EHEA_PAGESIZE, sizeof(struct ehea_eqe));
	if (ret) {
	if (ret) {
		pr_err("can't allocate eq pages\n");
		ehea_error("can't allocate eq pages");
		goto out_freeres;
		goto out_freeres;
	}
	}


	for (i = 0; i < eq->attr.nr_pages; i++) {
	for (i = 0; i < eq->attr.nr_pages; i++) {
		vpage = hw_qpageit_get_inc(&eq->hw_queue);
		vpage = hw_qpageit_get_inc(&eq->hw_queue);
		if (!vpage) {
		if (!vpage) {
			pr_err("hw_qpageit_get_inc failed\n");
			ehea_error("hw_qpageit_get_inc failed");
			hret = H_RESOURCE;
			hret = H_RESOURCE;
			goto out_kill_hwq;
			goto out_kill_hwq;
		}
		}
@@ -371,7 +370,7 @@ int ehea_destroy_eq(struct ehea_eq *eq)
	}
	}


	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("destroy EQ failed\n");
		ehea_error("destroy EQ failed");
		return -EIO;
		return -EIO;
	}
	}


@@ -396,7 +395,7 @@ int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
	for (cnt = 0; cnt < nr_pages; cnt++) {
	for (cnt = 0; cnt < nr_pages; cnt++) {
		vpage = hw_qpageit_get_inc(hw_queue);
		vpage = hw_qpageit_get_inc(hw_queue);
		if (!vpage) {
		if (!vpage) {
			pr_err("hw_qpageit_get_inc failed\n");
			ehea_error("hw_qpageit_get_inc failed");
			goto out_kill_hwq;
			goto out_kill_hwq;
		}
		}
		rpage = virt_to_abs(vpage);
		rpage = virt_to_abs(vpage);
@@ -404,7 +403,7 @@ int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
					     0, h_call_q_selector,
					     0, h_call_q_selector,
					     qp->fw_handle, rpage, 1);
					     qp->fw_handle, rpage, 1);
		if (hret < H_SUCCESS) {
		if (hret < H_SUCCESS) {
			pr_err("register_rpage_qp failed\n");
			ehea_error("register_rpage_qp failed");
			goto out_kill_hwq;
			goto out_kill_hwq;
		}
		}
	}
	}
@@ -433,7 +432,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,


	qp = kzalloc(sizeof(*qp), GFP_KERNEL);
	qp = kzalloc(sizeof(*qp), GFP_KERNEL);
	if (!qp) {
	if (!qp) {
		pr_err("no mem for qp\n");
		ehea_error("no mem for qp");
		return NULL;
		return NULL;
	}
	}


@@ -442,7 +441,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
	hret = ehea_h_alloc_resource_qp(adapter->handle, init_attr, pd,
	hret = ehea_h_alloc_resource_qp(adapter->handle, init_attr, pd,
					&qp->fw_handle, &qp->epas);
					&qp->fw_handle, &qp->epas);
	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("ehea_h_alloc_resource_qp failed\n");
		ehea_error("ehea_h_alloc_resource_qp failed");
		goto out_freemem;
		goto out_freemem;
	}
	}


@@ -456,7 +455,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
				     init_attr->act_wqe_size_enc_sq, adapter,
				     init_attr->act_wqe_size_enc_sq, adapter,
				     0);
				     0);
	if (ret) {
	if (ret) {
		pr_err("can't register for sq ret=%x\n", ret);
		ehea_error("can't register for sq ret=%x", ret);
		goto out_freeres;
		goto out_freeres;
	}
	}


@@ -466,7 +465,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
				     init_attr->act_wqe_size_enc_rq1,
				     init_attr->act_wqe_size_enc_rq1,
				     adapter, 1);
				     adapter, 1);
	if (ret) {
	if (ret) {
		pr_err("can't register for rq1 ret=%x\n", ret);
		ehea_error("can't register for rq1 ret=%x", ret);
		goto out_kill_hwsq;
		goto out_kill_hwsq;
	}
	}


@@ -477,7 +476,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
					     init_attr->act_wqe_size_enc_rq2,
					     init_attr->act_wqe_size_enc_rq2,
					     adapter, 2);
					     adapter, 2);
		if (ret) {
		if (ret) {
			pr_err("can't register for rq2 ret=%x\n", ret);
			ehea_error("can't register for rq2 ret=%x", ret);
			goto out_kill_hwr1q;
			goto out_kill_hwr1q;
		}
		}
	}
	}
@@ -489,7 +488,7 @@ struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
					     init_attr->act_wqe_size_enc_rq3,
					     init_attr->act_wqe_size_enc_rq3,
					     adapter, 3);
					     adapter, 3);
		if (ret) {
		if (ret) {
			pr_err("can't register for rq3 ret=%x\n", ret);
			ehea_error("can't register for rq3 ret=%x", ret);
			goto out_kill_hwr2q;
			goto out_kill_hwr2q;
		}
		}
	}
	}
@@ -554,7 +553,7 @@ int ehea_destroy_qp(struct ehea_qp *qp)
	}
	}


	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("destroy QP failed\n");
		ehea_error("destroy QP failed");
		return -EIO;
		return -EIO;
	}
	}


@@ -843,7 +842,7 @@ static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
		    (hret != H_PAGE_REGISTERED)) {
		    (hret != H_PAGE_REGISTERED)) {
			ehea_h_free_resource(adapter->handle, mr->handle,
			ehea_h_free_resource(adapter->handle, mr->handle,
					     FORCE_FREE);
					     FORCE_FREE);
			pr_err("register_rpage_mr failed\n");
			ehea_error("register_rpage_mr failed");
			return hret;
			return hret;
		}
		}
	}
	}
@@ -897,7 +896,7 @@ int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)


	pt = (void *)get_zeroed_page(GFP_KERNEL);
	pt = (void *)get_zeroed_page(GFP_KERNEL);
	if (!pt) {
	if (!pt) {
		pr_err("no mem\n");
		ehea_error("no mem");
		ret = -ENOMEM;
		ret = -ENOMEM;
		goto out;
		goto out;
	}
	}
@@ -907,14 +906,14 @@ int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)
					&mr->handle, &mr->lkey);
					&mr->handle, &mr->lkey);


	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("alloc_resource_mr failed\n");
		ehea_error("alloc_resource_mr failed");
		ret = -EIO;
		ret = -EIO;
		goto out;
		goto out;
	}
	}


	if (!ehea_bmap) {
	if (!ehea_bmap) {
		ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
		ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
		pr_err("no busmap available\n");
		ehea_error("no busmap available");
		ret = -EIO;
		ret = -EIO;
		goto out;
		goto out;
	}
	}
@@ -930,7 +929,7 @@ int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)


	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
		ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
		pr_err("registering mr failed\n");
		ehea_error("registering mr failed");
		ret = -EIO;
		ret = -EIO;
		goto out;
		goto out;
	}
	}
@@ -953,7 +952,7 @@ int ehea_rem_mr(struct ehea_mr *mr)
	hret = ehea_h_free_resource(mr->adapter->handle, mr->handle,
	hret = ehea_h_free_resource(mr->adapter->handle, mr->handle,
				    FORCE_FREE);
				    FORCE_FREE);
	if (hret != H_SUCCESS) {
	if (hret != H_SUCCESS) {
		pr_err("destroy MR failed\n");
		ehea_error("destroy MR failed");
		return -EIO;
		return -EIO;
	}
	}


@@ -988,14 +987,14 @@ void print_error_data(u64 *data)
		length = EHEA_PAGESIZE;
		length = EHEA_PAGESIZE;


	if (type == EHEA_AER_RESTYPE_QP)
	if (type == EHEA_AER_RESTYPE_QP)
		pr_err("QP (resource=%llX) state: AER=0x%llX, AERR=0x%llX, port=%llX\n",
		ehea_error("QP (resource=%llX) state: AER=0x%llX, AERR=0x%llX, "
		       resource, data[6], data[12], data[22]);
			   "port=%llX", resource, data[6], data[12], data[22]);
	else if (type == EHEA_AER_RESTYPE_CQ)
	else if (type == EHEA_AER_RESTYPE_CQ)
		pr_err("CQ (resource=%llX) state: AER=0x%llX\n",
		ehea_error("CQ (resource=%llX) state: AER=0x%llX", resource,
		       resource, data[6]);
			   data[6]);
	else if (type == EHEA_AER_RESTYPE_EQ)
	else if (type == EHEA_AER_RESTYPE_EQ)
		pr_err("EQ (resource=%llX) state: AER=0x%llX\n",
		ehea_error("EQ (resource=%llX) state: AER=0x%llX", resource,
		       resource, data[6]);
			   data[6]);


	ehea_dump(data, length, "error data");
	ehea_dump(data, length, "error data");
}
}
@@ -1009,7 +1008,7 @@ u64 ehea_error_data(struct ehea_adapter *adapter, u64 res_handle,


	rblock = (void *)get_zeroed_page(GFP_KERNEL);
	rblock = (void *)get_zeroed_page(GFP_KERNEL);
	if (!rblock) {
	if (!rblock) {
		pr_err("Cannot allocate rblock memory\n");
		ehea_error("Cannot allocate rblock memory.");
		goto out;
		goto out;
	}
	}


@@ -1021,9 +1020,9 @@ u64 ehea_error_data(struct ehea_adapter *adapter, u64 res_handle,
		*aerr = rblock[12];
		*aerr = rblock[12];
		print_error_data(rblock);
		print_error_data(rblock);
	} else if (ret == H_R_STATE) {
	} else if (ret == H_R_STATE) {
		pr_err("No error data available: %llX\n", res_handle);
		ehea_error("No error data available: %llX.", res_handle);
	} else
	} else
		pr_err("Error data could not be fetched: %llX\n", res_handle);
		ehea_error("Error data could not be fetched: %llX", res_handle);


	free_page((unsigned long)rblock);
	free_page((unsigned long)rblock);
out:
out: